History for dmpopidor / app / controllers
2017-05-16
@xsrust
updated tests to work after annotations changes
xsrust committed on 16 May 2017
@xsrust
updated super admin to use annotations and model files accordingly
xsrust committed on 16 May 2017
@xsrust
Merge remote-tracking branch 'upstream/development' into annotations
xsrust committed on 16 May 2017
@xsrust
merged development into annotations
xsrust committed on 16 May 2017
2017-05-15
@Jimmy Angelakos
Upgraded Administrate (0.7.0), closes #266.
Jimmy Angelakos committed on 15 May 2017
2017-05-12
@Brian Riley
fixed merge conflicts after rebase
Brian Riley committed on 12 May 2017
@Jimmy Angelakos
Fixes #307 - Single invitation email issue
Jimmy Angelakos committed on 12 May 2017
@xsrust
updated org-admin interface to use annotations for template editing
xsrust committed on 12 May 2017
2017-05-11
@Jimmy Angelakos
New display for Guidance choices in Plan Details page. Fixes #288
Jimmy Angelakos committed on 11 May 2017
@Jimmy Angelakos
Fixes #289 - when sharing plan with invalid email
Jimmy Angelakos committed on 11 May 2017
@Jimmy Angelakos
Bugfixes for invitations/ password change. Fixes #268, #271.
Jimmy Angelakos committed on 11 May 2017
@xsrust
began updating org-admin display of suggested_answers
xsrust committed on 11 May 2017
2017-05-10
@briley
simplification of create plan js and html presence of plan_template_id triggers submit button disabled
briley committed on 10 May 2017
2017-05-09
@briley
made adjustments based on feedback DMPRoadmap/roadmap#150
briley committed on 9 May 2017
@briley
fixed merge conflicts
briley committed on 9 May 2017
@briley
fixed merge conflicts
briley committed on 9 May 2017
@Jimmy Angelakos
Merge pull request #298 from CDLUC3/template-bug-fix ...
Jimmy Angelakos authored on 9 May 2017 GitHub committed on 9 May 2017
@xsrust
renamed suggested_answer files to annotations
xsrust committed on 9 May 2017
2017-05-08
@briley
Merge branch 'fix-share-change-email' into template-bug-fix
briley committed on 8 May 2017
@Jimmy Angelakos
Fixed failing functional & translation tests
Jimmy Angelakos committed on 8 May 2017
@Jimmy Angelakos
Merge local branch into feature/sso - fixes #39, #276, #287, #290. ...
Jimmy Angelakos committed on 8 May 2017
@briley
updated plan creation messaging to match suggestions on DMPRoadmap/roadmap#207
briley committed on 8 May 2017
2017-05-05
@Brian Riley
fixed layout of edit profile page DMPRoadmap/roadmap#230 DMPRoadmap/roadmap#125 DMPRoadmap/roadmap#293
Brian Riley committed on 5 May 2017
@Brian Riley
minor css tweaks and added template title to default 'My Plan (title)'
Brian Riley committed on 5 May 2017
@Brian Riley
finalized initial create plan js
Brian Riley committed on 5 May 2017
2017-05-04
@briley
added new create plan page
briley committed on 4 May 2017
2017-05-03
@Jimmy Angelakos
Merge branch 'development' into development
Jimmy Angelakos authored on 3 May 2017 GitHub committed on 3 May 2017
2017-05-02
@briley
Fixes to view templates and the way templates are collected DMPRoadmap/roadmap#251
briley committed on 2 May 2017
@briley
updated create plan to call ajax action to get available templates
briley committed on 2 May 2017
@Jose Lloret
Fixed nil user variable when generating HTML code for sharing notification. DMPRoadmap/roadmap#286 ...
Jose Lloret committed on 2 May 2017