Update from original#3

Merged

niksj merged 56 commits intoniksj:masterfrom

sigmah-dev:master

Aug 18, 2016

Commits on Feb 10, 2016

Merge pull request #1 from sigmah-dev/master
osarrat
committed

Commits on Mar 15, 2016

Revised version to match v2.* schema
osarrat
committed

Commits on Jun 27, 2016

Adding docker-compose.yml file for postgreSQL dev
ftavin
committed
Adding .docker to .gitignore
ftavin
committed
Add a mailhog docker image for managing emails

aponcon-atolcd
authored and
ftavin
committed
Add a tab for displaying project team members

aponcon-atolcd
authored and
ftavin
committed
Add a button for removing a team member and a button for saving it

aponcon-atolcd
authored and
ftavin
committed
Add a "Add team member" button to Project team member page

aponcon-atolcd
authored and
ftavin
committed
Add a "Add team members by profile" button to Project team member page

aponcon-atolcd
authored and
ftavin
committed
Add default team member profiles form in project model administration

aponcon-atolcd
authored and
ftavin
committed
Separate VIEW_PROJECT and EDIT_PROJECT into *_ALL_PROJECTS and *_MY_PROJECTS

aponcon-atolcd
authored and
ftavin
committed
Introduce permissions in team members view

aponcon-atolcd
authored and
ftavin
committed
Fix NPE when running the app with an old version of Sigmah

aponcon-atolcd
authored and
ftavin
committed
Fix a NPE when trying to update a user profile

aponcon-atolcd
authored and
ftavin
committed
Offline management for team members
ftavin
committed
Fix error when creating a new project with default team member profiles

aponcon-atolcd
authored and
ftavin
committed
Fix user retrieval by org unit when in Offline Mode

aponcon-atolcd
authored and
ftavin
committed
Fix save action in TeamMember page when in Offline Mode

aponcon-atolcd
authored and
ftavin
committed
Disable an old activityinfo hibernate filter for team members queries

aponcon-atolcd
authored and
ftavin
committed
Add a helper for getting the OrgUnit of a project

aponcon-atolcd
authored and
ftavin
committed
Introduce secondary user units in the data model
ftavin
committed
Introduce the UI for adding secondary UserUnits

aponcon-atolcd
authored and
ftavin
committed
Add Offline feature for user units
ftavin
committed
Add a switch in the dashboard for hiding projects related to secondary org units
ftavin
committed
Introduce "framework" entities for ProjectModels
ftavin
committed
Verify framework fulfillment for project model related to a framework

aponcon-atolcd
authored and
ftavin
committed
Remove save button in project team members page

aponcon-atolcd
authored and
ftavin
committed
Add offline mode for "Add user profile to team" button in project team members page
ftavin
committed
Replace team member removal button by a clickable icon

aponcon-atolcd
authored and
ftavin
committed
Fix of permission hierarchy and of permission goals
ftavin
committed
Removal of unuseful permutations during maven compilation with sigmah-dev profile

aponcon-atolcd
authored and
ftavin
committed
Fix offline mode for team member page

aponcon-atolcd
authored and
ftavin
committed
Fix retrieval of org units in admin view
ftavin
committed
Fix visibility verification of projects
ftavin
committed
Fix conflicts during load of projects in dashboard

aponcon-atolcd
authored and
ftavin
committed
Fix of not complete user list in team member page in offline mode

aponcon-atolcd
authored and
ftavin
committed
Fix JSNI error with Profiler

aponcon-atolcd
authored and
ftavin
committed
Fix MonitoredPoints and Reminders handlers

aponcon-atolcd
authored and
ftavin
committed
Add Licence in file header

aponcon-atolcd
authored and
ftavin
committed
Fix secondary org units management

aponcon-atolcd
authored and
ftavin
committed
Fix of team member permissions in the project page

aponcon-atolcd
authored and
ftavin
committed
Fix NPE while trying to update an orgUnit

aponcon-atolcd
authored and
ftavin
committed
Fix countries cache warming while running dev mode

aponcon-atolcd
authored and
ftavin
committed
Prepare the ListComboBox to use it in contact details tab

aponcon-atolcd
authored and
ftavin
committed
Fix the tooltip in ListComboBox when there isn't any available value

aponcon-atolcd
authored and
ftavin
committed
Fix : updating classes list in test/.../persistence.xml
ftavin
committed
Fix NPE during update project process

aponcon-atolcd
authored and
ftavin
committed
Initialize lists in Framework and TeamMember related entities

aponcon-atolcd
authored and
ftavin
committed
Fix bad condition during verification of user rights for an OrgUnit

aponcon-atolcd
authored and
ftavin
committed
Fix AutomatedImporterUnlockTest

aponcon-atolcd
authored and
ftavin
committed
Fix AutomatedImportUnlockTest cleanup process

aponcon-atolcd
authored and
ftavin
committed

Commits on Jul 28, 2016

Fixed NPE when the "multiple" parameter of a Choice is null (fixes issue 857).
Raphcal
committed

Commits on Aug 1, 2016

SQL bypass solution for #878
osarrat
authored

Commits on Aug 4, 2016

Merge pull request #18 from osarrat/master
Brendan Le Ny
authored
Merge pull request #23 from atolcd/tranche1-atol
Brendan Le Ny
authored
Merge pull request #31 from Raphcal/iss857
Brendan Le Ny
authored