GitBucket
| 2016-09-01 |
Merge pull request #8 from DMPRoadmap/master
...
Brian Riley
authored
on 1 Sep 2016
GitHub
committed
on 1 Sep 2016
|
|---|---|
|
Fixed bug in logo branding view
briley
committed
on 1 Sep 2016
|
|
|
fixed merge conflicts
briley
committed
on 1 Sep 2016
|
|
|
Merged branding changes from the development branch into the master branch that now contains DCC's changes to permissions/roles, internationalization and bug fixes
briley
committed
on 1 Sep 2016
|
|
|
merged DCC changes into master
briley
committed
on 1 Sep 2016
|
|
more merge conflicts
xsrust
committed
on 1 Sep 2016
|
|
|
added ability to grant permissions to other users
xsrust
committed
on 1 Sep 2016
|
|
|
fixed a bug where users' api_tokens would display if they had none
xsrust
committed
on 1 Sep 2016
|
|
|
overhaul of performance of users admin-index
xsrust
committed
on 1 Sep 2016
|
|
|
implimenting auth changes in the views
xsrust
committed
on 1 Sep 2016
|
|
|
fixed merge conflicts
xsrust
committed
on 1 Sep 2016
|
|
|
added ability to grant permissions to other users
xsrust
committed
on 1 Sep 2016
|
|
|
fixed a bug where users' api_tokens would display if they had none
xsrust
committed
on 1 Sep 2016
|
|
|
overhaul of performance of users admin-index
xsrust
committed
on 1 Sep 2016
|
|
|
implimenting auth changes in the views
xsrust
committed
on 1 Sep 2016
|
|
| 2016-08-31 |
fix various issues to do with display of formatting in questions
Ray Carrick
committed
on 31 Aug 2016
|
| 2016-08-22 |
|
|
Removed description field from organisation. Add contact email to the organisation. Change the way the logo is displayed on the organisation screen.
briley
committed
on 22 Aug 2016
|
|
|
changed logo size to a height of 100 and moved logo so that it appears alongside the DMPRoadmap logo per the current specifications
briley
committed
on 22 Aug 2016
|
|
|
implimenting auth changes in the views
xsrust
committed
on 22 Aug 2016
|
|
| 2016-08-18 |
Merge pull request #4 from raycarrick-ed/master
...
raycarrick-ed
authored
on 18 Aug 2016
GitHub
committed
on 18 Aug 2016
|
|
explicit bullet style for questions and raw questoin test in form
Ray Carrick
committed
on 18 Aug 2016
|
|
|
removed depricated controller
xsrust
committed
on 18 Aug 2016
|
|
| 2016-08-17 |
updated organisation edit page's error messages so that errors are placed in the alert text section. Updated wording in locale files to reflect the 160x160 file size.
briley
committed
on 17 Aug 2016
|
|
Merging current stable development branch into master (#23)
...
Brian Riley
authored
on 17 Aug 2016
GitHub
committed
on 17 Aug 2016
|
|
| 2016-08-16 |
fixed merge conflicts in Gemfile and Schema.rb
briley
committed
on 16 Aug 2016
|
|
fixed merge conflicts with fr and de locale files
briley
committed
on 16 Aug 2016
|
|
|
Fixed issue with link to the terms page in the 'I accept the terms and conditions' link in the sign up section. The link is a part of the locale file, so created a variable called current_locale
briley
committed
on 16 Aug 2016
|
|
| 2016-08-15 |
change how questions are displayed in plans to honour formatting
Ray Carrick
committed
on 15 Aug 2016
|
| 2016-08-12 |
fixed merge conflict in schema.rb
Brian Riley
committed
on 12 Aug 2016
|