Permalink
Commits on Nov 18, 2018
  1. Merge pull request #150 from geofot96/bug-fix-date-format

    geofot96 committed Nov 18, 2018
    Bug fix date format
Commits on Nov 17, 2018
  1. Fixed tests

    geofot96 committed Nov 17, 2018
  2. Updated a failing test

    geofot96 committed Nov 17, 2018
  3. Fixed the date bug

    geofot96 committed Nov 17, 2018
Commits on Nov 16, 2018
  1. Merge pull request #148 from geofot96/fix-leave2

    gessfred committed Nov 16, 2018
    [BUG] fix the app crash on group deletion
  2. Attempt to fix jacoco test report error

    gessfred committed Nov 16, 2018
Commits on Nov 15, 2018
  1. Refactoring and fixed app crashes when deleting group

    gessfred committed Nov 15, 2018
Commits on Nov 14, 2018
  1. Merge pull request #145 from geofot96/BUGFIX-admin

    geofot96 committed Nov 14, 2018
    Fixed the bug for admin privileges
  2. Fixed the bug for admin privileges

    geofot96 committed Nov 14, 2018
Commits on Nov 13, 2018
  1. Merge pull request #140 from geofot96/fb-UI

    gessfred committed Nov 13, 2018
    New UI integration
  2. No more fragment tests

    geofot96 committed Nov 13, 2018
  3. Deleted merged calendar

    geofot96 committed Nov 13, 2018
  4. Added more tests and changed the merged calendar fragment

    geofot96 committed Nov 13, 2018
  5. Added tests for navigation tab

    geofot96 committed Nov 13, 2018
  6. Removed a CalendarActivity import although commented out because trav…

    geofot96 committed Nov 13, 2018
    …is complained
  7. Merge branch 'master' into fb-UI

    geofot96 committed Nov 13, 2018
    # Conflicts:
    #	app/src/androidTest/java/ch/epfl/sweng/studdybuddy/CalendarActivityTest.java
    #	app/src/main/AndroidManifest.xml
    #	app/src/main/java/ch/epfl/sweng/studdybuddy/activities/GroupInfoActivity.java
    #	app/src/main/java/ch/epfl/sweng/studdybuddy/activities/GroupsActivity.java
    #	app/src/main/java/ch/epfl/sweng/studdybuddy/activities/MainActivity.java
    #	app/src/main/java/ch/epfl/sweng/studdybuddy/activities/MergedCalendarActivity.java
    #	app/src/main/java/ch/epfl/sweng/studdybuddy/util/GroupsRecyclerAdapter.java
    #	app/src/main/res/layout/activity_calendar.xml
    #	app/src/main/res/layout/activity_main.xml
    #	app/src/main/res/values/strings.xml
  8. Merge branch 'master' into fb-UI

    geofot96 committed Nov 13, 2018
    # Conflicts:
    #	app/src/androidTest/java/ch/epfl/sweng/studdybuddy/CalendarActivityTest.java
    #	app/src/main/AndroidManifest.xml
    #	app/src/main/java/ch/epfl/sweng/studdybuddy/activities/GroupInfoActivity.java
    #	app/src/main/java/ch/epfl/sweng/studdybuddy/activities/GroupsActivity.java
    #	app/src/main/java/ch/epfl/sweng/studdybuddy/activities/MainActivity.java
    #	app/src/main/java/ch/epfl/sweng/studdybuddy/activities/MergedCalendarActivity.java
    #	app/src/main/java/ch/epfl/sweng/studdybuddy/util/GroupsRecyclerAdapter.java
    #	app/src/main/res/layout/activity_calendar.xml
    #	app/src/main/res/layout/activity_main.xml
    #	app/src/main/res/values/strings.xml
  9. Merge pull request #141 from geofot96/fb-calendar

    gessfred committed Nov 13, 2018
    Fb calendar
  10. correcting ConnectedAvailability class to use ReferenceWrapper instea…

    YBouquet committed Nov 13, 2018
    …d of FirebaseReference
  11. Merge branch 'master' into fb-calendar

    gessfred committed Nov 13, 2018
  12. fixed problem with codeclimat about duplicate code in ConnectedCalend…

    underwoodkats committed Nov 13, 2018
    …arActivityTest and GroupActivityTest in order to make an intent
  13. adding tests for GroupActivity and Messages class

    YBouquet committed Nov 13, 2018
    removing unused class
  14. Merged and solved some conflicts to make the app work as it should

    geofot96 committed Nov 13, 2018
  15. attempt to reduce cognitive complexity setButton method of GroupRecyc…

    YBouquet committed Nov 13, 2018
    …lerActivity
  16. corrected behavior of MoreInfo button in GroupsActivity, add parent t…

    YBouquet committed Nov 13, 2018
    …o GroupActivity
  17. Merged with master WARNING: FeedFragment

    gessfred committed Nov 13, 2018
  18. Attempting to add a new behaviour to the buttons of the groupRecycler…

    YBouquet committed Nov 13, 2018
    …View
  19. Merge pull request #142 from geofot96/fix-ciao

    gessfred committed Nov 13, 2018
    Fixed group rotation
  20. Refactoring and tests for removeFromGroup

    gessfred committed Nov 13, 2018