| 2016-07-26 |
began implimenting testing for projects controller
xsrust
committed
on 26 Jul 2016
|
|---|---|
|
added gem to allow testing of controllers
xsrust
committed
on 26 Jul 2016
|
|
|
removed token_permission as it was accidentially re-added by a merge
xsrust
committed
on 26 Jul 2016
|
|
| 2016-07-25 |
fix roadmap route
DamodarSojka
committed
on 25 Jul 2016
|
|
fixed leftover merge conflict in .gitignore
xsrust
committed
on 25 Jul 2016
|
|
|
merged code from DMPRoadmap/Roadmap with rails 4.2 code
xsrust
committed
on 25 Jul 2016
|
|
|
Merge branch 'master' of https://github.com/DigitalCurationCentre/roadmap
xsrust
committed
on 25 Jul 2016
|
|
| 2016-07-22 |
|
|
prepping for final merge
Brian Riley
committed
on 22 Jul 2016
|
|
|
fixed merge conflicts in app/admin/user.rb
Brian Riley
committed
on 22 Jul 2016
|
|
|
Merge branch 'DigitalCurationCentre/master' into development
Brian Riley
committed
on 22 Jul 2016
|
|
|
Merged conflicts
Brian Riley
committed
on 22 Jul 2016
|
|
|
merge
DamodarSojka
committed
on 22 Jul 2016
|
|
|
localization based on url
DamodarSojka
committed
on 22 Jul 2016
|
|
| 2016-07-21 |
renamed token_permission_type to plural to follow convention of fixtures
xsrust
committed
on 21 Jul 2016
|
|
added data structures for testing
xsrust
committed
on 21 Jul 2016
|
|
| 2016-07-20 |
Merge branch 'adding_api_and_localisation_work'
xsrust
committed
on 20 Jul 2016
|
|
final commit before merging into master
xsrust
committed
on 20 Jul 2016
|
|
|
ensured that users recieve emails about their new tokens upon token being granted
xsrust
committed
on 20 Jul 2016
|
|
| 2016-07-19 |
language table, dropdown, additional locales
DamodarSojka
committed
on 19 Jul 2016
|
|
added link to viewing api information from user's edit profile page
xsrust
committed
on 19 Jul 2016
|
|
|
added code for sending email to users when granted api tokens
xsrust
committed
on 19 Jul 2016
|
|
|
added view for token_permission_types
xsrust
committed
on 19 Jul 2016
|
|
|
added a page for users to view api endpoint information
xsrust
committed
on 19 Jul 2016
|
|
|
removed depricated api strucures from the models
xsrust
committed
on 19 Jul 2016
|
|
|
fixed methods for removing and generating user tokens
xsrust
committed
on 19 Jul 2016
|
|
|
updated path to api_update to allow admin nav
xsrust
committed
on 19 Jul 2016
|
|
|
pointed form to the new controller action
xsrust
committed
on 19 Jul 2016
|
|
|
added form to admin nav
xsrust
committed
on 19 Jul 2016
|
|
|
updated logic for token removal/generation
xsrust
committed
on 19 Jul 2016
|