| 2017-08-16 |
Resolve merge conflicts. DMPRoadmap/roadmap#553
Jose Lloret
committed
on 16 Aug 2017
|
| 2017-08-15 |
removed non-relevant modal at phases/edit.html.erb. DMPRoadmap/roadmap#566
...
Doing some housekeeping for non-relevant modals. DMPRoadmap/roadmap#566
modals according to bootstrap. DMPRoadmap/roadmap#554
modal partial as layout to be re-used across the site. DMPRoadmap/roadmap#554
Jose Lloret
committed
on 15 Aug 2017
|
| 2017-08-11 |
wrapped each page's h1 header in a row + col-md-12 DMPRoadmap/roadmap#553
Brian Riley
committed
on 11 Aug 2017
|
| 2017-06-09 |
removed all occurrences of 'sign up' and replaced with 'create account' DMPRoadmap/roadmap#112
Brian Riley
committed
on 9 Jun 2017
|
| 2017-05-08 |
Merge local branch into feature/sso - fixes #39, #276, #287, #290.
...
Unified omniauth cases & updated tests.
Deleted Project Controller & tests (no longer needed).
Please db:migrate after this commit.
Jimmy Angelakos
committed
on 8 May 2017
|
| 2017-05-02 |
Get rid of custom Shib code & revert to generic Omniauth for everything. Modify identifier_schemes table to add scheme specific urls.
Jimmy Angelakos
committed
on 2 May 2017
|
| 2016-08-12 |

Merging master (#20)
...
* added data structures for testing
* renamed token_permission_type to plural to follow convention of fixtures
* added gem to allow testing of controllers
* began implimenting testing for projects controller
* fixed auth to reject empty string
* added data structures for testing
* added data structures for testing
* removed old unnecissary data structures from fixtures
* added forgotten view for org-admins giving user's api permissions
* updated .gitignore
* added gem to allow testing of controllers
* began implimenting testing for projects controller
* fixed auth to reject empty string
* added data structures for testing
* added data structures for testing
* removed old unnecissary data structures from fixtures
* added forgotten view for org-admins giving user's api permissions
* updated .gitignore
* fixed leftover merge conflict in .gitignore
* updated org-admin view of users for rails 4.2 compatability
* fiexed a bug where user's api token permissions wouldnt display
* fixed syntax error
* changed guidance_group to guidance_groups for consistancy with api spec
* fix roadmap route
* bugfixing auth for api
* removed token_permission as it was accidentially re-added by a merge
* added gem to allow testing of controllers
* began implimenting testing for projects controller
* fixed auth to reject empty string
* added data structures for testing
* added data structures for testing
* removed old unnecissary data structures from fixtures
* added forgotten view for org-admins giving user's api permissions
* updated .gitignore
* removed old unnecissary data structures from fixtures
* updated .gitignore
* updated org-admin view of users for rails 4.2 compatability
* fiexed a bug where user's api token permissions wouldnt display
* fixed syntax error
* changed guidance_group to guidance_groups for consistancy with api spec
* bugfixing auth for api
* modified schema
* removed admin interface to token_permission, another forgotten side-effect
* removed admin interface to token_permission, another forgotten side-effect
* modified return structure of guidance_groups API to reflect current spec
* removed guidances api endpoint as no longer necissary
* added templates api endpoint
* commit
* commit
* initial commit of untested statistics API
* updated Statistics API and added bugfixes
* added aditional seeds for api token_permission_types
* added docs for stats api, also passing tests
* added fucntionality to give org_admin priveleges through the org_admin interface
* corrected statistics API to handle null dates and filter projects correctly
* addedrestriction that users must be confirmed to be counted by stats api
* added documentation to dmptemplates api controller
* added org_id field to plans metadata as a returned plan can belong to somebody else's organisation
* initial passover of removing magic strings
* added comment to I18n_constant and fixed missing magic string
* fixed the magic strings function
* removed duplicate gem from gemfile
* migrations and routes tests
* changed gem dependancies and fixed syntax bug
* fixed bug where show plans view only displayed first letter of columns
* aliased
* added documentation to organisation, phase, and part of plans
* added documentation to organisation, phase, and part of plans
* added documentation to model for plan
* added documentation to project model
* added documentation to project_group model
* added documentation to remaining models
* fixed admin logout bug
* removed hard-coded references to DCC
* fixed bug in dmptemplate with magicstrings
* dropdown and org language setting
* test
* commit
* migrations and routes tests
* aliased
* dropdown and org language setting
* test
* remove typo
* fixed parentheses bug in api/projects_controller
* fix
* merging
* remove git merge conflicts artifacts
* added gemfile, environments, and an initaliser to allow merge
* fix locales picking
* super_admin area for languages, changes to langauge initializer to fix migrations issue and org language priority in user language picking
* add association between organisation and language
Damodar Sojka
authored
on 12 Aug 2016
Brian Riley
committed
on 12 Aug 2016
|
| 2016-06-03 |
DMPonline4 - RAILS 4.0 (#4)
...
Merging the initial DMPOnline4 codebase into Roadmap
DMPonline4, this code was designed and implemented by the Digital
Curation Centre (DCC)
DMPonline runs in Ruby 2.1 and Rails 4.0, there is a mysql database.
Marta Ribeiro
authored
on 3 Jun 2016
Brian Riley
committed
on 3 Jun 2016
|