GitBucket
Toggle navigation
Snippets
Sign in
Files
Branches
1
Releases
Issues
2
Pull requests
Labels
Priorities
Milestones
Wiki
Commit Graphs
Kanban
Build
Network
Mirrors
Gantt Chart
Fork
: 0
opidor
/
dmpopidor
Download ZIP
468 commits
Transfer to URL with SHA
tree:
d159e1fd57
Branches
Tags
×
dev
dmpopidor
/
app
/
latest commit
d159e1fd57
briley
authored
on 6 Sep 2016
..
admin
Resolved merge conflicts
9 years ago
assets
Merged branding changes from the development branch into the master branch that now contains DCC's changes to permissions/roles, internationalization and bug fixes
9 years ago
controllers
Merged branding changes from the development branch into the master branch that now contains DCC's changes to permissions/roles, internationalization and bug fixes
9 years ago
helpers
Merging master (#20)
9 years ago
mailers
Merging master (#20)
9 years ago
models
Commented out other deprecated user<-->organisation methods so that they use the user.organisation_id field instead of the user.organisations structure. This needs to be cleaned up and overhauled in the user and organisation models so that user belongs to an organisation and organisations have many users, and any references to the old code need to be updated.
9 years ago
policies
added ability to grant permissions to other users
9 years ago
validators
Removed description field from organisation. Add contact email to the organisation. Change the way the logo is displayed on the organisation screen.
9 years ago
views
commented out legacy user.organisation_id method in user model. Each user now belongs to one organisation
9 years ago