GitBucket
| 2016-07-22 |
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-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
|
|
|
fixed methods for removing and generating user tokens
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
|
|
| 2016-07-18 |
view now depricated
xsrust
committed
on 18 Jul 2016
|
|
controller now depricated
xsrust
committed
on 18 Jul 2016
|
|
|
modified admin layout
xsrust
committed
on 18 Jul 2016
|
|
|
added functions for removing and generating api tokens from the user model
xsrust
committed
on 18 Jul 2016
|
|
|
added way to define users api-tokens through users controller
xsrust
committed
on 18 Jul 2016
|
|
|
moved old org-admin users index view to new controller, added logic for updating api privleges
xsrust
committed
on 18 Jul 2016
|
|
| 2016-07-15 |
localization further work, including dropdown initial work
DamodarSojka
committed
on 15 Jul 2016
|
|
added marta's changes to export.pdf.erb and _edit_question.html.erb
xsrust
committed
on 15 Jul 2016
|
|
|
added api priveleges column to org-admin's view of users
xsrust
committed
on 15 Jul 2016
|
|
|
show api_token in user's profile view
xsrust
committed
on 15 Jul 2016
|
|
|
deleteing user's api tokens if they switch organisations
xsrust
committed
on 15 Jul 2016
|
|
|
added yard documentation, bugfixed method, fixed bug where relationship with users was broken
xsrust
committed
on 15 Jul 2016
|
|
|
updated yard commits
xsrust
committed
on 15 Jul 2016
|
|
|
added yard comments and bugfixed methods
xsrust
committed
on 15 Jul 2016
|
|
|
comment for clarity
xsrust
committed
on 15 Jul 2016
|