Commit Graph

6841 Commits

Author SHA1 Message Date
Bertocq
12658e33a9 Use %w string array syntax to comply with the 140 char line limit 2017-09-20 16:07:19 +02:00
BertoCQ
33c687ffec Merge pull request #1878 from deivid-rodriguez/chore/improve_dev_seeds
Minor improvements in dev seeds
2017-09-20 13:27:55 +02:00
Raimond Garcia
b416d2846e Merge pull request #1883 from xarlybovi/switch-flags-ajax
Switch flag/unflag buttons on use via ajax
2017-09-20 12:21:56 +02:00
BertoCQ
69b7608c74 Merge pull request #1890 from consul/comment-reply-link
Comment reply link
2017-09-19 23:41:54 +02:00
BertoCQ
9b0732b8d9 Merge pull request #1863 from wairbut-m2c/aperez-fix-for-issue-1848
Add base controller for Admin:Poll controller
2017-09-19 22:54:14 +02:00
BertoCQ
d0528acb85 Merge branch 'master' into aperez-fix-for-issue-1848 2017-09-19 22:54:06 +02:00
David Rodríguez
69aaa7de12 Fixes unintended new line 2017-09-19 22:01:47 +02:00
David Rodríguez
e2c311a624 Adds an unverified user to dev seeds
Useful if you want to test the verification process.
2017-09-19 22:01:47 +02:00
decabeza
73b61e8596 adds and removes spaces :neckbeard: 2017-09-19 20:38:08 +02:00
decabeza
1f58dd7545 removes hash comment id on comment replies link 2017-09-19 20:36:57 +02:00
Carlos Ruiz
61c9536697 Add flagging/unflagging rspec 2017-09-19 20:11:23 +02:00
Carlos Ruiz
cf2dff1013 Small class names and html refactor 2017-09-19 20:11:06 +02:00
BertoCQ
033df1192f Merge pull request #1889 from consul/dev_seeds
Fixes dev seeds
2017-09-19 19:46:47 +02:00
rgarcia
37be890fbe Fixes dev seeds
Poll::Questions now have a validation for a `poll_id`
2017-09-19 19:39:47 +02:00
BertoCQ
f99612d619 Merge pull request #1869 from wairbut-m2c/iagirre-display-datepicker-arrows
Iagirre display datepicker arrows
2017-09-19 18:55:10 +02:00
BertoCQ
8cbdc5a6fd Merge pull request #1874 from wairbut-m2c/iagirre-admin-menu-wrongful-active-items
When "Profiles" submenus are selected, the "Site custom" menu doesn't…
2017-09-19 18:52:44 +02:00
BertoCQ
5d6c4f0bbc Merge pull request #1868 from wairbut-m2c/aperez-validate-poll-question-is-selected
Validate presence 'poll_id' attribute on Poll::Question model
2017-09-19 18:15:32 +02:00
BertoCQ
e4abe0d75a Merge pull request #1849 from rockandror/documentable-fix
Documentable fix
2017-09-19 17:07:25 +02:00
BertoCQ
5cf862064d Merge pull request #1888 from consul/flaky-specs
Fixes some flaky specs
2017-09-19 16:43:41 +02:00
rgarcia
33ba7821d5 precompile assets in test environment
Usually the first spec that visits a page fails with a timeout.
Hopefully it was due to having to compile assets at runtime and this helps to fix it
2017-09-19 15:14:55 +02:00
rgarcia
3b76c7428b fixes flaky spec
Adds random number to the proposal’s title, to avoid js popup
displaying similar proposals
2017-09-19 15:14:29 +02:00
rgarcia
0de87c19c6 fixes flaky spec
Maybe using `build` instead of `create` was confusing the spec
2017-09-19 15:14:29 +02:00
rgarcia
eb89d92320 fixes flaky spec
Visits directly the page to avoid flakiness
2017-09-19 15:14:29 +02:00
rgarcia
8e0f709cf0 removes unused expectation 2017-09-19 15:14:28 +02:00
rgarcia
20ca60732b fixes flaky spec
Using correct resource in path
2017-09-19 15:14:28 +02:00
rgarcia
b101b1f778 removes obsolete legislations specs
Obsolete and flaky!
2017-09-19 15:14:28 +02:00
rgarcia
a7ce8d5c70 fixes flaky spec
Reactivates feature setting after spec
2017-09-19 15:14:28 +02:00
Angel Perez
15ccef8c97 Poll::Question model spec refactor to improve DRYness
On branch aperez-validate-poll-question-is-selected
  Changes to be committed:
    modified:   spec/models/poll/question_spec.rb
2017-09-19 07:08:18 -04:00
BertoCQ
8c943c5c68 Merge pull request #1876 from consul/chore/rubocop_fixes
Manual 🤖  rubocop fixes
2017-09-19 11:22:18 +02:00
BertoCQ
9a2bfe90dd Merge pull request #1882 from consul/proposal-show
Proposal show
2017-09-19 01:24:54 +02:00
Bertocq
ba198726f2 Remove Netbeans folder from .gitignore
Why:

* IDE/Text editor specific files and folders to be ignored should be on each developer's personal .gitignore_global file

How:

* If you're affected by this change, check https://help.github.com/articles/ignoring-files/#create-a-global-gitignore
2017-09-19 00:34:41 +02:00
Carlos Ruiz
12d34a3ea1 Switch flag/unflag buttons on use via ajax 2017-09-18 19:07:45 +02:00
decabeza
4ce06fac4e avoids use class variables on helper 2017-09-18 17:52:36 +02:00
decabeza
1c6a873b6d refactors proposal helper and use correctly on proposal show view 2017-09-18 17:31:37 +02:00
decabeza
cacd99648e fixes margin of tags on proposal show 2017-09-18 14:22:02 +02:00
decabeza
2b3cbac5bc moves author actions to sidebar on proposal show 2017-09-18 14:21:38 +02:00
BertoCQ
8cae97d98d Merge pull request #1853 from wairbut-m2c/mlucena-admin-menu
20170912 - Disabled user questions for polls into budgets view.
2017-09-18 10:11:31 +02:00
iagirre
b889d23fe6 Fixed width property, changed to top. 2017-09-18 08:19:47 +02:00
Bertocq
97fe464232 Use datetime always with zone 2017-09-15 14:06:29 +02:00
Bertocq
485b94eab9 Correct end at file ending 2017-09-15 14:06:26 +02:00
Bertocq
20aca263d7 Use correct Predicate name on function 2017-09-15 14:06:20 +02:00
Bertocq
a3428ee589 Use snake_case for method names 2017-09-15 14:06:17 +02:00
BertoCQ
87eeefff41 Merge pull request #1867 from consul/chore/rubocop_autocorrections
🤖 Rubocop autocorrections
2017-09-15 14:04:01 +02:00
Bertocq
8bf0d6f749 Correct i18n tasks config to check for any file under custom language folder 2017-09-15 13:51:04 +02:00
iagirre
4bcb9ba81b Extra indentation spaces erased. 2017-09-15 13:19:58 +02:00
Bertocq
7be1f0315e Update Officing Polls final condition up to 2 weeks after poll ending 2017-09-15 12:37:42 +02:00
iagirre
d629aef3b9 When "Profiles" submenus are selected, the "Site custom" menu doesn't open. Moreover, when "Site custom" submenus are selected, the menu remains opened. 2017-09-15 12:33:31 +02:00
Manuel Lucena
e93ac4e570 20170915 - fixed additional spacing and implemented suggested change of controller conditions 2017-09-15 11:10:48 +02:00
Manuel Lucena
823031af31 20170915 - Fixed behavior for sub menus under legislation section
On branch mlucena-admin-menu
 Changes to be committed:
	modified:   app/views/admin/_menu.html.erb
2017-09-15 10:59:58 +02:00
iagirre
5ca4a6052f Merge branch 'iagirre-display-datepicker-arrows' of github.com:wairbut-m2c/consul into iagirre-display-datepicker-arrows 2017-09-15 10:04:12 +02:00