-
Notifications
You must be signed in to change notification settings - Fork 2
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
Temp/0.23 stable #45
base: release/0.23-stable
Are you sure you want to change the base?
Temp/0.23 stable #45
Commits on Dec 10, 2020
-
Archive Debates (decidim#6940)
* Archive and unarchive debates * Add empty message * Fix erb, rb and i18norm offenses * Archive debate from debate close form * Put back accidentally removed create_debates migration * Add spec for Archive command * Add spec for archived? method in debate * Add system spec for archiving debates * Enable unarchiving from close form * Add seeds for archived debates * Change icon class when debate is closed / archived * Allow admin to archive non-official debates * Allow open debates to be archived too
Configuration menu - View commit details
-
Copy full SHA for 3dc0783 - Browse repository at this point
Copy the full SHA 3dc0783View commit details
Commits on Dec 14, 2020
-
Export debate comments (decidim#6962)
* Export debate comments from admin * Add specs for exporting comments * Add specs for exporting comments * Fix spec
Configuration menu - View commit details
-
Copy full SHA for 16507f5 - Browse repository at this point
Copy the full SHA 16507f5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2650bb8 - Browse repository at this point
Copy the full SHA 2650bb8View commit details
Commits on Dec 17, 2020
-
Configuration menu - View commit details
-
Copy full SHA for 7a700d7 - Browse repository at this point
Copy the full SHA 7a700d7View commit details -
Configuration menu - View commit details
-
Copy full SHA for 416d9dd - Browse repository at this point
Copy the full SHA 416d9ddView commit details -
Configuration menu - View commit details
-
Copy full SHA for ff2a447 - Browse repository at this point
Copy the full SHA ff2a447View commit details -
Merge branch 'feature/cherry-picks' of github.com:platoniq/decidim in…
…to feature/cherry-picks
Configuration menu - View commit details
-
Copy full SHA for 5a9b02a - Browse repository at this point
Copy the full SHA 5a9b02aView commit details -
Merge pull request #47 from Platoniq/feature/cherry-picks
Backport decidim#6948 and decidim#7016 to temp/0.23-stable
Vera Rojman committedDec 17, 2020 Configuration menu - View commit details
-
Copy full SHA for bf285d5 - Browse repository at this point
Copy the full SHA bf285d5View commit details -
Debates with no start and end time (decidim#6959) (#48)
Vera Rojman committedDec 17, 2020 Configuration menu - View commit details
-
Copy full SHA for 1ce358f - Browse repository at this point
Copy the full SHA 1ce358fView commit details
Commits on Dec 18, 2020
-
Configuration menu - View commit details
-
Copy full SHA for d39daf3 - Browse repository at this point
Copy the full SHA d39daf3View commit details
Commits on Dec 22, 2020
-
Notify users when their comments are voted (decidim#7055) (#53)
Vera Rojman committedDec 22, 2020 Configuration menu - View commit details
-
Copy full SHA for d789225 - Browse repository at this point
Copy the full SHA d789225View commit details
Commits on Dec 23, 2020
-
Vera Rojman committed
Dec 23, 2020 Configuration menu - View commit details
-
Copy full SHA for b12306b - Browse repository at this point
Copy the full SHA b12306bView commit details -
Fix compatibility with Faker 1.9 in debates seeds (#56)
Vera Rojman committedDec 23, 2020 Configuration menu - View commit details
-
Copy full SHA for c5be4e3 - Browse repository at this point
Copy the full SHA c5be4e3View commit details
Commits on Jan 8, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 2bfe844 - Browse repository at this point
Copy the full SHA 2bfe844View commit details
Commits on Jan 11, 2021
-
Backport/comment permissions (#63)
* Comment permissions (#38) * refactor comments permissions for react * add fix for delay publish comments * update react bundles * Disable comments permissions in consultation questions * fix merge error * fix lint * fix ts lint * link markdown * allow resouce_locator to detect budget projects paths * fix resources without parent * revert gemfilelock
Configuration menu - View commit details
-
Copy full SHA for 3530d59 - Browse repository at this point
Copy the full SHA 3530d59View commit details
Commits on Jan 12, 2021
-
Add jitsi embeded + others (decidim#6572) (#66)
* Add online meetings (decidim#6572) * Add config to allow online meetings * Add online_meeting_url fields to DB * Add fields to forms and commands * Use `data-` attributes instead of specific field names * Remove unused locales * Fix JS * Fix locale * Fix forms specs * Fix specs * Hide meeting type and online url fields if online meetings are not allowed * Show online meeting URL * Ensure fields are hidden * Fix meeting form * Fix tests * Add `type_of`meeting` column to meetings It stores whether the meeting is in-person or online * Filter meetings by type * Add missing i18n string * Validate URLs * Address feedback * Fix i18n * Remove config option * test: select the type of meeting before filling in location * Move URL details to cell * Fix form * Fix icon * Fix edit form Co-authored-by: Marc Riera Casals <[email protected]> Co-authored-by: David Morcillo <[email protected]> # Conflicts: # decidim-meetings/app/commands/decidim/meetings/create_meeting.rb * Add registration system (decidim#6662) * Add config to allow online meetings * Add online_meeting_url fields to DB * Add fields to forms and commands * Use `data-` attributes instead of specific field names * Remove unused locales * Fix JS * Fix locale * Fix forms specs * Fix specs * Hide meeting type and online url fields if online meetings are not allowed * Show online meeting URL * Ensure fields are hidden * Fix meeting form * Fix tests * Add `type_of`meeting` column to meetings It stores whether the meeting is in-person or online * Filter meetings by type * Add missing i18n string * Validate URLs * WIP added registration options to meetings form * fixing specs and merging branch * Fix en.yml file * Add config to allow online meetings * Add online_meeting_url fields to DB * Add fields to forms and commands * Use `data-` attributes instead of specific field names * Remove unused locales * Fix JS * Fix locale * Fix forms specs * Fix specs * Hide meeting type and online url fields if online meetings are not allowed * Show online meeting URL * Ensure fields are hidden * Fix meeting form * Fix tests * Add `type_of`meeting` column to meetings It stores whether the meeting is in-person or online * Filter meetings by type * Add missing i18n string * Validate URLs * Address feedback * Fix i18n * Remove config option * fix failing specs * test: select the type of meeting before filling in location * remove extra stuff from conflicts * fix example length lint error * Resolving comments * removing duplicate code * remove trailing white space * Changing migration file * Remove component setting to allow external registration * adding functionality to the registration button * Add join meeting button for external registration for users * Join meeting button fix * fix failing specs * fix the default error on form * remove unwanted stuff * Fix locale fail * fix specs * Merging develop and resolving conflicts * Fix specs and lints * refactor: use constants from model * fix: only show default locale for registration terms in meeting form Co-authored-by: Marc Riera Casals <[email protected]> Co-authored-by: David Morcillo <[email protected]> Co-authored-by: Andrea Orler <[email protected]> # Conflicts: # decidim-forms/app/views/decidim/forms/admin/questionnaires/edit.html.erb # decidim-meetings/app/presenters/decidim/meetings/meeting_presenter.rb * feat: automatically enalble registrations when meeting on this platform (decidim#6874) * Allow creation of hybrid meetings (decidim#6891) * Add Hybrid meeting events * Normalize translations * Run Linters * Fixing I18n Key error * Fixing Failing test * Running linters * Running linters * Add Geocoder setup for hybrid meetings * Fix issue with filter defaults # Conflicts: # decidim-meetings/app/models/decidim/meetings/meeting.rb # decidim-meetings/app/services/decidim/meetings/meeting_search.rb * Feature/15596 embed jitsi meeting (#65) * Stub embedded jitsi videoconference * Add embedded jitsi videoconference component * Improve toolbar items control * Remove iframe when videoconference over * Use user role for videoconference * Don't show videoconference if visitors not allowed * Fix erb * Fix rubocop offenses * Add button to start meeting * Log meetings attendance * Remove whitespace * Add videoconference setttings templates and docs * Display "Embedded videoconference" in meeting card * Set jitsi domain and api_url in config * Fix offenses * Log attendance * Make rubocop happy * Show attendance logs in admin * Add missing value in secrets template * Remove whitespace * Normalize locale * Don't require custom jitsi variables * Add spec for permissions * Make embedded videoconference an additional option for meetings * Refactor permissions for embedded_videoconference as boolean * Update commands and form * Fix initializer defining empty videoconferences hash * Update meetings form * Improve meeting public page * Rename js component for videoconference * Improve class comment for attendance log command * Simplify cell * Improve index for logs * Simplify videoconference cell * Add spec for videoconference cell * Fix rubocop offenses * Change parent class for VideoconferenceAttendanceLogsController * Fix rubocop offenses * Normalize locales * Fix missing and unused locale errors * Add spec for create videoconference attendance log command * Add spec for create videoconference attendance logs command * Update meeting form spec * Update meeting model spec * Add spec for videoconference attendance log model * Update spec for admin manage meetings * Lint js * Add spec for viewing attendance logs * Normalize locale * Add system spec for videoconference * Add consent message to videoconference explanation * Add missing translations * Fix create meeting spec * Fix update meeting command spec * Prevent authenticity token error * Fix toggle for embed videoconference checkbox * Fix embed checkbox toggle * Add seeds for embedded videoconference meetings * Fix variable name Co-authored-by: Vera Rojman <[email protected]> # Conflicts: # decidim-meetings/app/views/decidim/meetings/admin/meetings/index.html.erb # decidim-meetings/config/locales/en.yml # decidim-meetings/lib/decidim/meetings/component.rb # decidim-meetings/spec/models/meeting_spec.rb # docs/services/videoconferences.md * Add a config flag to disable the registration code (decidim#6698) * Ref. DIFE-148 - add registration_code_enabled as an admin flag on meetings settings page - remove registration code from email and notification - do not display registration code on the interface after joining to a meeting * Ref. DIFE-148 - hide "Validate registration code" from Admin - Components - Meeting section * Ref. DIFE-148 - fix rspec error * Ref. DIFE-148 - fix bad reference * Ref. DIFE-148 - fix tests for join_meeting_spec.rb * Ref. DIFE-148 - fix tests for meeting_registrations_spec.rb * Ref. DIFE-148 - fix tests for registration_mailer_spec.rb * Ref. DIFE-148 - fix tests for admin_manages_meetings_spec.rb * Ref. DIFE-148 - fix tests for validate_registration_code_spec.rb * Ref. DIFE-148 - fix linter errors * Add functionality to enable/disable registration code. * Add unit tests and fix the old ones. * Add PR number to Change Log * Updating the i18n tasks * Fixing i18n specs * Running linters on Changelog.md * run linters * Fixing Linking issues * Remove changes done in CHANGELOG.md * Ref. DIFE-148 - add registration_code_enabled as an admin flag on meetings settings page - remove registration code from email and notification - do not display registration code on the interface after joining to a meeting * Ref. DIFE-148 - hide "Validate registration code" from Admin - Components - Meeting section * Ref. DIFE-148 - fix bad reference * Ref. DIFE-148 - fix tests for join_meeting_spec.rb * Ref. DIFE-148 - fix tests for meeting_registrations_spec.rb * Ref. DIFE-148 - fix tests for registration_mailer_spec.rb * Ref. DIFE-148 - fix tests for admin_manages_meetings_spec.rb * Ref. DIFE-148 - fix tests for validate_registration_code_spec.rb * Add functionality to enable/disable registration code. * Add PR number to Change Log * Running linters on Changelog.md * run linters * Fixing Linking issues * Remove changes done in CHANGELOG.md * Remove changes done in CHANGELOG.md * Set flag's default value to TRUE and remove duplicate entries * Fix tests after changing the default value of flag Co-authored-by: Alexandru Emil Lupu <[email protected]> Co-authored-by: Cristian Georgescu <[email protected]> * fix merge error * fix merge errors * fix more merge errors Co-authored-by: anagha vl <[email protected]> Co-authored-by: Andrea Orler <[email protected]> Co-authored-by: Alexandru Emil Lupu <[email protected]> Co-authored-by: roxanaopr <[email protected]> Co-authored-by: Cristian Georgescu <[email protected]>
Configuration menu - View commit details
-
Copy full SHA for 6629399 - Browse repository at this point
Copy the full SHA 6629399View commit details
Commits on Jan 13, 2021
-
Add videoconference.js to meetings js manifest (#67)
Vera Rojman committedJan 13, 2021 Configuration menu - View commit details
-
Copy full SHA for 7cb76be - Browse repository at this point
Copy the full SHA 7cb76beView commit details
Commits on Jan 14, 2021
-
Filter assemblies by type (decidim#7153) (#71)
* Add assemblies_type filter to assemblies in admin * Add spec for filtering assemblies by type
Vera Rojman committedJan 14, 2021 Configuration menu - View commit details
-
Copy full SHA for aedbc36 - Browse repository at this point
Copy the full SHA aedbc36View commit details
Commits on Jan 15, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 7ee4ef0 - Browse repository at this point
Copy the full SHA 7ee4ef0View commit details -
Remove non-alphanumeric characters when generating room name (#72) 18…
Vera Rojman committedJan 15, 2021 Configuration menu - View commit details
-
Copy full SHA for bc74cbf - Browse repository at this point
Copy the full SHA bc74cbfView commit details
Commits on Jan 29, 2021
-
Configuration menu - View commit details
-
Copy full SHA for e10b69e - Browse repository at this point
Copy the full SHA e10b69eView commit details
Commits on Feb 5, 2021
-
Merge branch 'release/0.23-stable' into temp/0.23-stable
# Conflicts: # decidim-meetings/spec/shared/manage_meetings_examples.rb
Configuration menu - View commit details
-
Copy full SHA for fed7db9 - Browse repository at this point
Copy the full SHA fed7db9View commit details -
Create file uploads question type (decidim#7192)
Co-authored-by: Oriol Gual <[email protected]>
Configuration menu - View commit details
-
Copy full SHA for 8a55a32 - Browse repository at this point
Copy the full SHA 8a55a32View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5fb7cbb - Browse repository at this point
Copy the full SHA 5fb7cbbView commit details
Commits on Feb 10, 2021
-
Merge branch 'release/0.23-stable' into temp/0.23-stable
# Conflicts: # decidim-comments/app/assets/javascripts/decidim/comments/bundle.js
Configuration menu - View commit details
-
Copy full SHA for 4812827 - Browse repository at this point
Copy the full SHA 4812827View commit details -
Configuration menu - View commit details
-
Copy full SHA for 42a73d1 - Browse repository at this point
Copy the full SHA 42a73d1View commit details
Commits on Feb 15, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 11b40b4 - Browse repository at this point
Copy the full SHA 11b40b4View commit details -
Configuration menu - View commit details
-
Copy full SHA for 025a306 - Browse repository at this point
Copy the full SHA 025a306View commit details
Commits on Feb 17, 2021
-
Configuration menu - View commit details
-
Copy full SHA for dffe0a2 - Browse repository at this point
Copy the full SHA dffe0a2View commit details
Commits on Feb 22, 2021
-
Configuration menu - View commit details
-
Copy full SHA for f65b943 - Browse repository at this point
Copy the full SHA f65b943View commit details -
Fix datepicker tests to not match upcoming month's days (decidim#7256)
# Conflicts: # decidim-elections/spec/system/admin_manages_votings_spec.rb
Configuration menu - View commit details
-
Copy full SHA for a4c3a31 - Browse repository at this point
Copy the full SHA a4c3a31View commit details
Commits on Feb 23, 2021
-
Fix debates with multiple days (#79)
* Date cell for debates * Lint scss * Add cell spec
Vera Rojman committedFeb 23, 2021 Configuration menu - View commit details
-
Copy full SHA for 52fc5f0 - Browse repository at this point
Copy the full SHA 52fc5f0View commit details -
Max characters for questionnaire answers (decidim#7314) (#77)
* Max characters for questionnaire answers (decidim#7314) * Fix rubocop offenses Co-authored-by: Ivan Vergés <[email protected]>
Configuration menu - View commit details
-
Copy full SHA for 8e5e589 - Browse repository at this point
Copy the full SHA 8e5e589View commit details -
Update jitsi meetings (prevent error with online_meeting_url) (#78)
Vera Rojman committedFeb 23, 2021 Configuration menu - View commit details
-
Copy full SHA for f752be3 - Browse repository at this point
Copy the full SHA f752be3View commit details
Commits on Feb 24, 2021
-
Configuration menu - View commit details
-
Copy full SHA for a1dec57 - Browse repository at this point
Copy the full SHA a1dec57View commit details
Commits on Mar 2, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 3f75070 - Browse repository at this point
Copy the full SHA 3f75070View commit details -
Configuration menu - View commit details
-
Copy full SHA for 9fd8c83 - Browse repository at this point
Copy the full SHA 9fd8c83View commit details
Commits on Mar 3, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 1679ef5 - Browse repository at this point
Copy the full SHA 1679ef5View commit details
Commits on Mar 4, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 47870be - Browse repository at this point
Copy the full SHA 47870beView commit details
Commits on Mar 5, 2021
-
Add css selectors to emails to improve design customization (decidim#…
Vera Rojman committedMar 5, 2021 Configuration menu - View commit details
-
Copy full SHA for 52978a8 - Browse repository at this point
Copy the full SHA 52978a8View commit details
Commits on Mar 16, 2021
-
Merge branch 'release/0.23-stable' into temp/0.23-stable
# Conflicts: # decidim-comments/app/assets/javascripts/decidim/comments/bundle.js # package-lock.json
Configuration menu - View commit details
-
Copy full SHA for 677b952 - Browse repository at this point
Copy the full SHA 677b952View commit details
Commits on Apr 27, 2021
-
Merge branch 'release/0.23-stable' into temp/0.23-stable
# Conflicts: # decidim-comments/app/assets/javascripts/decidim/comments/bundle.js # package-lock.json
Configuration menu - View commit details
-
Copy full SHA for 87af39f - Browse repository at this point
Copy the full SHA 87af39fView commit details