GitBucket
| 2016-11-02 |
removed user_status and user_type from tests
briley
committed
on 2 Nov 2016
|
|---|---|
|
switched User->Language relationship in Model from has_one to belongs_to
briley
committed
on 2 Nov 2016
|
|
|
fixed db migration so that it does not update user records in TEST mode. Added sqlite3 to gemfile for tests. Added languages fixture
briley
committed
on 2 Nov 2016
|
|
|
moved in new fixtures
briley
committed
on 2 Nov 2016
|
|
|
moved in some initial unit tests for user and org models
briley
committed
on 2 Nov 2016
|
|
|
Merge pull request #14 from DMPRoadmap/master
...
Brian Riley
authored
on 2 Nov 2016
GitHub
committed
on 2 Nov 2016
|
|
|
Merge pull request #56 from DigitalCurationCentre/master
...
Brian Riley
authored
on 2 Nov 2016
GitHub
committed
on 2 Nov 2016
|
|
merge postgresql -> master
Ray Carrick
committed
on 2 Nov 2016
|
|
|
Merge pull request #7 from DMPRoadmap/master
...
Ray Carrick
authored
on 2 Nov 2016
GitHub
committed
on 2 Nov 2016
|
|
|
Merge pull request #49 from CDLUC3/master
...
Ray Carrick
authored
on 2 Nov 2016
GitHub
committed
on 2 Nov 2016
|
|
| 2016-11-01 |
updated application controller so that a user is redirected to the main landing page when then try to access a secure page when not logged in. Added the corresponding locale messages that will be displayed when this happens
briley
committed
on 1 Nov 2016
|
|
updated passwords controller to redirect user to the main landing page after initiating a password reset. Removed reference to invalid spinner css from main layout file
briley
committed
on 1 Nov 2016
|
|
|
updated gitignore to include initializers that should be server specfic. removed reference to missing spinner.css
briley
committed
on 1 Nov 2016
|
|
translation no longer breaks on header link to create plan
xsrust
committed
on 1 Nov 2016
|
|
|
fixed display bug on plan creation confirmation pop up
xsrust
committed
on 1 Nov 2016
|
|
|
updated user permissions conversion to migrate org_admin details properly
xsrust
committed
on 1 Nov 2016
|
|
| 2016-10-28 |
removed user_org_roles from active admin
xsrust
committed
on 28 Oct 2016
|
|
updated user organisation in active-admin
xsrust
committed
on 28 Oct 2016
|
|
|
added rake task to seed database with key values, additionally added rake task to perform all migration tasks
xsrust
committed
on 28 Oct 2016
|
|
| 2016-10-26 |
ran db migrations
briley
committed
on 26 Oct 2016
|
|
resolving merge conflicts
briley
committed
on 26 Oct 2016
|
|
|
Merge pull request #52 from DigitalCurationCentre/master
...
Brian Riley
authored
on 26 Oct 2016
GitHub
committed
on 26 Oct 2016
|
|
Added both DB gems for dev/merging compatibility
Jimmy Angelakos
committed
on 26 Oct 2016
|
|
| 2016-10-25 |
moved migrating user permissions to a rake task migrate:permissions
xsrust
committed
on 25 Oct 2016
|
|
fixed issue where users needed an unconfirmed_email field due to faulty devise setting
xsrust
committed
on 25 Oct 2016
|
|
|
Merge branch 'postgresql' of https://github.com/DigitalCurationCentre/roadmap into postgresql
Jimmy Angelakos
committed
on 25 Oct 2016
|
|
|
renamed example files which get loaded by rails and cause configuration problems.
Jimmy Angelakos
committed
on 25 Oct 2016
|
|
|
removed comparison from boolean value to an integer in organisation model
xsrust
committed
on 25 Oct 2016
|
|
|
modifying relationship between users and organisations \n -users now belong_to organisation \n -organisations now have_many users \n -removed the depricated user_org_roles structure with migration \n -moved data out of that structure into the existing organisation_id field of users to complete relationship \n -re-evaluated functions to do with organisation_id field, as it was used as a placeholder before
xsrust
committed
on 25 Oct 2016
|
|
| 2016-10-20 |
fixed issue with 'make small changes' selection on template version edit modal
briley
committed
on 20 Oct 2016
|