| 2016-12-02 |
Merge pull request #16 from DMPRoadmap/development
...
Brian Riley
authored
on 2 Dec 2016
GitHub
committed
on 2 Dec 2016
|
|---|---|
|
fixed typo in fr.yml locale file that was introduced while resolving merge conflicts
Brian Riley
committed
on 2 Dec 2016
|
|
| 2016-11-29 |
added a initialization helper to assist with omniauth provider registration. Added a remove.png image for disconnecting providers from user accounts
briley
committed
on 29 Nov 2016
|
| 2016-11-08 |
Merge branch 'master' into add-orcid-functionality
briley
committed
on 8 Nov 2016
|
| 2016-11-07 |
moved assets from app/assets to lib/assets. The files in lib/assets will be used by Rails unless override by an equivalent file in app/assets. Added logic to applicationController so that it will look first for a template in app/views/[:branded folder name] before using the default in app/views
Brian Riley
committed
on 7 Nov 2016
|
| 2016-11-03 |
Merge branch 'master' into add-orcid-functionality
briley
committed
on 3 Nov 2016
|
| 2016-06-03 |
DMPonline4 - RAILS 4.0 (#4)
...
Marta Ribeiro
authored
on 3 Jun 2016
Brian Riley
committed
on 3 Jun 2016
|