GitBucket
| 2017-06-09 |
resolved cherry-pick conflicts
bhavi
authored
on 7 Jun 2017
Brian Riley
committed
on 9 Jun 2017
|
|---|---|
cleanup of tabs and objects that are no longer in use DMPRoadmap/roadmap#305
...
Brian Riley
committed
on 9 Jun 2017
|
|
|
resolved cherry-pick conflicts
Brian Riley
committed
on 9 Jun 2017
|
|
resolved cherry-pick conflicts
briley
authored
on 1 Jun 2017
Brian Riley
committed
on 9 Jun 2017
|
|
| 2017-05-26 |
Text changes for #345.
Jimmy Angelakos
committed
on 26 May 2017
|
| 2017-05-23 |
Fixes for #311, #345.
Jimmy Angelakos
committed
on 23 May 2017
|
| 2017-05-12 |
removed old shib handler from edit profile page
Brian Riley
committed
on 12 May 2017
|
|
fixed merge conflicts after rebase
Brian Riley
committed
on 12 May 2017
|
|
|
updated forms on create/edit plans, contact_us, profile pages to match consolidated css
Brian Riley
committed
on 12 May 2017
|
|
|
Fixes #307 - Single invitation email issue
Jimmy Angelakos
committed
on 12 May 2017
|
|
| 2017-05-11 |
converted all <form><table> and <form><ol> to <fieldset> on non-org-admin pages DMPRoadmap/roadmap#125
briley
committed
on 11 May 2017
|
|
Bugfixes for invitations/ password change. Fixes #268, #271.
Jimmy Angelakos
committed
on 11 May 2017
|
|
| 2017-05-09 |
fixed merge conflicts
briley
committed
on 9 May 2017
|
| 2017-05-08 |
updated new css and swapped out use of table with fieldset on plan details edit DMPRoadmap/roadmap#125
briley
committed
on 8 May 2017
|
|
Merge local branch into feature/sso - fixes #39, #276, #287, #290.
...
Jimmy Angelakos
committed
on 8 May 2017
|
|
| 2017-05-05 |
fixed layout of edit profile page DMPRoadmap/roadmap#230 DMPRoadmap/roadmap#125 DMPRoadmap/roadmap#293
Brian Riley
committed
on 5 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
|
| 2017-04-24 |
Updated email content and added new welcome message DMPRoadmap/roadmap#239
Brian Riley
committed
on 24 Apr 2017
|
| 2017-04-17 |
fix to one of the mailer's localisation
Brian Riley
committed
on 17 Apr 2017
|
| 2017-04-14 |
updated remaining mailers to use fastgettext default locale and fixed spacing issues. DMPRoadmap/roadmap#239
Brian Riley
committed
on 14 Apr 2017
|
|
Updated main user_mailer to use FastGettext.default_locale instead of I18n and setup email confirmation to use branding. DMPRoadmap/roadmap#238
Brian Riley
committed
on 14 Apr 2017
|
|
| 2017-04-11 |
hide language dropdown on profile page if there is only one language available DMPRoadmap/roadmap#237
briley
committed
on 11 Apr 2017
|
| 2017-03-07 |
I18n replaced from controllers. DMPRoadmap/roadmap#98
Jose Lloret
committed
on 7 Mar 2017
|
| 2017-02-15 |
URLs without locale param
Jose Lloret
committed
on 15 Feb 2017
|
| 2017-01-26 |
resolved merge conflicts
briley
committed
on 26 Jan 2017
|
| 2017-01-10 |
pulled data access out of devise/registrations/edit
xsrust
committed
on 10 Jan 2017
|
|
code style/revisions for devise registrations edit view
xsrust
committed
on 10 Jan 2017
|
|
| 2016-12-12 |
updates so that a user can log into the site \n updated application_controller, user model, registrations edit view, and layouts branding
xsrust
committed
on 12 Dec 2016
|
|
replaces Organisation. with Org. in all files
xsrust
committed
on 12 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
|