opidor/dmpopidor

Fork: 0

opidor / dmpopidor

History for dmpopidor / app / controllers

2018-12-17	1344908 Browse files » Merge branch 'master' into development briri committed on 17 Dec 2018
2018-12-11	Unverified f0a453b Browse files » Merge pull request #2015 from DMPRoadmap/issue/2014 ... issue/2014: Issues Preventing Shiboleth account creation or linking from the homescreen Brian Riley authored on 11 Dec 2018 GitHub committed on 11 Dec 2018
	08ee419 Browse files » updated ref (#2010) Brian Riley authored on 11 Dec 2018 Sam Rust committed on 11 Dec 2018
	1e43862 Browse files » fixed query (#2008) Brian Riley authored on 11 Dec 2018 Sam Rust committed on 11 Dec 2018
	6cd5088 Browse files » updated sessions controller to no longer set shibboleth_id field on user account, changed devise registrations/new so the js could find the create-account-form. Sam Rust committed on 11 Dec 2018
2018-12-04	bf20262 Browse files » Patch issue with share plans on development ... Devise circumvents running validations on the user models when invite! is called. I updated this call to adhere to validations, and I've updated the form to request the name,org of the user when a plan is shared with them. This should fix the issue for both newly created share-plan users, and those with previous, bad data in the system. You may want to consider re-running your validations(or fixup) scripts for users as you can have some invalid ones that you'll need to set a default name/org Sam Rust committed on 4 Dec 2018
2018-12-03	872bbd2 Browse files » made recommended adjustments briri committed on 3 Dec 2018
2018-11-30	aacc8e1 Browse files » removed debug statements briri committed on 30 Nov 2018
	ad393ed Browse files » finished up changes to controllers briri committed on 30 Nov 2018
	6a20aa4 Browse files » Merge branch 'development' into issue1663 briri committed on 30 Nov 2018
2018-11-29	a5dc80b Browse files » updated Role, Plan logic and fixed tests briri committed on 29 Nov 2018
2018-11-29	00067c0 Browse files » Updated api stats controller to use Org model's method (#1995) ... * updated api stats controller to use Org model's method * updated org.plans to check role.active flag * updated other api stats endpoints to use org.plans Brian Riley authored on 29 Nov 2018 Sam Rust committed on 29 Nov 2018
2018-11-28	82a4ec8 Browse files » refactor plan/role functionality to use flagshihtzu properly briri committed on 28 Nov 2018
2018-11-27	6741fb4 Browse files » moved deactivate logic to Role model and added specs briri committed on 27 Nov 2018
2018-11-22	ad9048b Browse files » Issue #1931 - Share plan emails updated. ... - The inviter name is added to the devise file app/views/devise/mailer/invitation_instructions.html.erb - The name of person invited the plan is shared with is added to the greeting if it exists for both the devise and non-devise emails (repectively app/views/devise/mailer/invitation_instructions.html.erb and app/views/user_mailer/sharing_notification.html.erb). Otherwise, the invited person's email is displayed in the greetings. Fix for #1931 John Pinto committed on 22 Nov 2018
2018-11-18	24c399d Browse files » 1. stat_created_plan.to_csv with option for details by template. ... 2. details attribute for stats table #1679 3. create_created_plan_service extended with details by template 4. create_last_month_created_plan_service extended with details by template. 5. create_or_update strategy for generating stats 6. StatCreatedPlanByTemplateController#index for graphs usage 7. month_start_date and month_end_date for OrgDateRangeable class [RD-1679] Usage view including date input for plans by template [#1679] monthly_range query updated [#1679] client-side chart for plans by template [#1679] Time picker for plans by template chart [#1679] Download plans by template action. deleted spec merge conflicts fixed [#1679] Removed JS linter warnings [#1679] Rubocop conforming code. Drying out stat services Jose Lloret committed on 18 Nov 2018
2018-10-23	f0d0659 Browse files » fixed issue with args in translatable:find (#1963) ... fixed issue with translatable text having a newline between the closing quote and the closing paren fixed issues with translatable text in planscsv export and sharing notification fixed issue with translatable on templates controller fixed issue with multiline strings in translatable:find fixed issue with multiline strings in translatable:find cleaned up en-US translations Brian Riley authored on 23 Oct 2018 Sam Rust committed on 23 Oct 2018
2018-10-23	Unverified ad811b0 Browse files » updated auth logic on public plans (#1966) ... * updated auth logic on public plans * added skip_authorization statement as 'authorize' is no longer used Sam Rust authored on 23 Oct 2018 GitHub committed on 23 Oct 2018
2018-10-18	4d1d3f4 Browse files » Fix bug when editing question ... Partial was missing a variable Bodacious authored on 18 Oct 2018 Sam Rust committed on 18 Oct 2018
2018-10-18	Unverified 7443d2a Browse files » Fix bug when editing question ... Partial was missing a variable Bodacious committed on 18 Oct 2018
2018-10-17	68c14b1 Browse files » removed template_id argument from phases update [this changes if template gets versioned] xsrust committed on 17 Oct 2018
2018-10-16	Unverified eb0499e Browse files » Merge pull request #1951 from DMPRoadmap/issue-1949 ... Fix bug choosing locale with region suffix Brian Riley authored on 16 Oct 2018 GitHub committed on 16 Oct 2018
	Unverified e32bb6c Browse files » Fix bug choosing locale with region suffix Bodacious committed on 16 Oct 2018
	Unverified f5d56bb Browse files » Merge pull request #1948 from DMPRoadmap/issue-1936 ... Update CSV downloads with consistent date format Brian Riley authored on 16 Oct 2018 GitHub committed on 16 Oct 2018
	Unverified 3a6da97 Browse files » Merge pull request #1946 from DMPRoadmap/issue-1938 ... Change column titles in usage CSV download Brian Riley authored on 16 Oct 2018 GitHub committed on 16 Oct 2018
	Unverified 29265ae Browse files » Update CSV downloads with consistent date format ... Fixes #1936 Added I18n formats date.formats.csv to allow for regional customisation Bodacious committed on 16 Oct 2018
	Unverified 2ab1d74 Browse files » Change column titles in usage CSV download ... Fixes #1938 Bodacious committed on 16 Oct 2018
	1848e51 Browse files » added hidden field to plan_export_form, updated controller auth logic to allow public plan owners to choose options xsrust committed on 16 Oct 2018
2018-10-10	0c33ab8 Browse files » Fix bug in upgrade customization when new section ... Adding a new section to the customized template was conflicting with the number value on the corresponding funder template section. Bodacious authored on 9 Oct 2018 Sam Rust committed on 10 Oct 2018
2018-10-10	48360fb Browse files » Simplify logic around Template customization Bodacious authored on 8 Oct 2018 Sam Rust committed on 10 Oct 2018