GitBucket
| 2017-06-15 |
replaced instances of 'let' with 'var' in js files. rails' asset pipeline cannot handle 'let' at this version
Brian Riley
committed
on 15 Jun 2017
|
|---|---|
|
Merge branch 'CDL-MVP' of https://github.com/CDLUC3/roadmap into CDL-MVP
Brian Riley
committed
on 15 Jun 2017
|
|
|
fixed merge conflicts
Brian Riley
committed
on 15 Jun 2017
|
|
fixing the tab issue on Edit profile page;add/update notification preferences
bhavi
committed
on 15 Jun 2017
|
|
| 2017-06-14 |
add custom div to profile page
bhavi
committed
on 14 Jun 2017
|
|
move user profile to partials, and add prefrences tab
bhavi
committed
on 14 Jun 2017
|
|
| 2017-06-12 |
Merge branch 'CDL-MVP' of https://github.com/CDLUC3/roadmap into CDL-MVP
bhavi
committed
on 12 Jun 2017
|
fixed bug in edit profile page
briley
committed
on 12 Jun 2017
|
|
updated edit profile page to display api with same formatting as the rest of the page
xsrust
committed
on 12 Jun 2017
|
|
| 2017-06-09 |
Add Notification Preferences to User's profile page
bhavi
committed
on 9 Jun 2017
|
|
removed all occurrences of 'sign up' and replaced with 'create account' DMPRoadmap/roadmap#112
Brian Riley
committed
on 9 Jun 2017
|
|
|
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
|