Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Development #76

Merged
merged 80 commits into from
Aug 22, 2018
Merged

Conversation

xsrust
Copy link

@xsrust xsrust commented Aug 22, 2018

sync with roadmap

Quentin Sonrel and others added 30 commits August 3, 2018 14:58
Add functional specs for Template copying
This is not needed since we have the DataCleanup suite now. There's also the danger that this task might cause some prepended sections to go missing from their Phases, so safer to remove altogether.
Decided it would be a better idea for moving forward if we just constrained these at the DB level.
The IDs are different on each DB.
These changes use the YARD gem, but in the lighter Tomdoc format.

You can read more about Tomdoc here: https://tomdoc.org
…ge".

Issue #1730

Also included is a fix for rendering if saving a new plan or editing a plan that results in
errors.
Bodacious and others added 29 commits August 15, 2018 17:27
If all of the sections are modifiable, we don't need the second part of the tooltip that reads: "You may place them before or after the main template sections."

Only show this if some of the Sections are unmodifiable
Fix bug preventing orgs loading on register page
Fix  duplicates in guidance group options
Change tooltip on container page if all modifiable
- Refactored how user model defines callbacks
- Add specs
When a user updates an existing annotation to set its text to blank, this
should destroy that annotation record on the DB—since they can't be valid without
text.
- Remove redundant routes (Fixes #1699, Fixes#1570)
- Remove redundant actions
- Remove redundant policy methods
- Fix invalid actions (public methods defined on controllers)
- Set concern methods as private
- Extract session locale method from ApplicationController into its own controller
- Explicitly define actions in statics controller for better readability
Fix bug when editing question on Template
Reset other_organisation when User org changes
Refactor routes for better maintainability
* Add tests for locale setting

- Adds Faker::Language module for testing languages with real-ish data
- Refactors global constants into Language model (See Issue#1696)
- Add specs to test locale change works

* Clean up language files to remove long names

* Add DB check in FastGettext initializer

* Set Memory cache for temporary caching solution

* Fix bug in Plan Rule
* Disable caching in test environment

* Fix locales specs
removed index from schema.rb

fixed schema version number
… JS (#1805)

updates to JS for org selection cahnges in PR#1778
* Fix TinyMCE JS on forms loaded with DOM

Fixes #1777

* Fix broken specs

* Fix Rubocop style violations

Ignored LineLength violations when string is part of FastGettext

* Updated rubocop style gem
* added configuration options to branding.yml for plan access, updated links to be dependant on access

* updated spec to expect multiple calls to branding
…#1829)

* updated guidance on only display once per question.  Added break between individual guidances

* updated with suggested refactors
* # This is a combination of 2 commits.
# The first commit's message is:

updated logic on number of non-customized templates

# This is the 2nd commit message:

noticed other stats affected by customizations_vs_funder mismatched, so fixed those

* Updated logic on number of non-customized templates, published, unpublished
@xsrust xsrust merged commit 701c3a1 into DigitalCurationCentre:development Aug 22, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants