Commit Graph

7870 Commits

Author SHA1 Message Date
decabeza
dea820f3e8 removes follow button on proposal show 2017-10-26 17:58:15 +02:00
decabeza
a36d8fece3 Merge branch '1856-legislation_processes_proposals_phase' of https://github.com/consul/consul into 1856-legislation_processes_proposals_phase 2017-10-26 17:51:21 +02:00
decabeza
00309aa157 changes message for not verified users 2017-10-26 17:51:10 +02:00
María Checa
658d115c91 Removed share view for Legislation Proposals 2017-10-26 17:13:04 +02:00
decabeza
73d6a09242 removes duplicated label on legislation proposal form 2017-10-26 17:09:57 +02:00
María Checa
f15ef5b66b Removed Legislation Proposals suggestions in form 2017-10-26 16:56:30 +02:00
Alberto García
6b55518f4c Merge pull request #2089 from consul/admin-profiles
Admin profiles
2017-10-25 19:48:50 +02:00
decabeza
f0c119f7a6 removes unused i18n keys 2017-10-25 19:27:44 +02:00
decabeza
2542b2c695 improves admin valuators search form 2017-10-25 19:02:04 +02:00
decabeza
c531818435 add missing class for buttons 2017-10-25 18:52:35 +02:00
decabeza
4b7a0358e5 improves admin managers views 2017-10-25 18:50:30 +02:00
decabeza
2131c651f6 improves admin valuators views 2017-10-25 18:47:26 +02:00
decabeza
0f4c03e407 improves admin moderators views 2017-10-25 18:43:19 +02:00
decabeza
1e49265288 improves admin administrators views 2017-10-25 18:40:17 +02:00
decabeza
9ba96becd2 Merge branch 'master' into admin-profiles 2017-10-25 18:29:01 +02:00
Alberto García
ac957c53a3 Merge pull request #2105 from wairbut-m2c/aperez-admin-search
Enable search by name/email on several Admin sections
2017-10-25 18:06:33 +02:00
María Checa
2d95069a7b Missing translations 2017-10-25 17:55:55 +02:00
María Checa
b556617a80 Changed permissions to vote Legislation Proposals and Answers 2017-10-25 16:43:25 +02:00
María Checa
1b4756e073 Front improvements and new translations 2017-10-25 16:43:16 +02:00
María Checa
276baedcfa Added votes to Legislation Proposals 2017-10-25 16:42:55 +02:00
María Checa
b5f2f9aa21 Added cached_votes_total and cached_votes_down to Legislation Proposals 2017-10-25 16:42:24 +02:00
Angel Perez
cd8cf42294 'Add to valuators' option added to Valuators search view 2017-10-25 10:38:54 -04:00
Angel Perez
91aa6e3302 Enable search by name/email for Managers 2017-10-25 10:16:21 -04:00
Angel Perez
59c97b4db7 Enable search by name/email for Valuators 2017-10-25 10:16:21 -04:00
Angel Perez
41f1f4e695 Enable search by name/email for Moderators 2017-10-25 10:16:21 -04:00
Angel Perez
8ef4afb07d Enable search by name/email for Administrators 2017-10-25 10:16:21 -04:00
BertoCQ
322ffdb91b Merge pull request #2086 from wairbut-m2c/iagirre-improve-dev-seeds
Iagirre improve dev seeds
2017-10-25 15:05:18 +02:00
María Checa
231a14c428 Fixed broken tests 2017-10-25 12:52:59 +02:00
decabeza
f0cfe50de4 Merge branch 'master' into 1856-legislation_processes_proposals_phase 2017-10-25 11:52:31 +02:00
Alberto García
06fc10e048 Merge pull request #2090 from ortegacmanuel/comments-on-proposals-topic
Added reference to event on the .on method('ajax:success',...)
2017-10-25 11:08:31 +02:00
Alberto García
5aaeba5fed Merge pull request #2094 from consul/topic-notifications
Topic notifications
2017-10-25 11:08:00 +02:00
iagirre
15db2a150d Merge remote-tracking branch 'consul/master' into iagirre-admin-poll-stats 2017-10-24 10:37:47 +02:00
BertoCQ
f2b1b310e5 Merge pull request #2101 from consul/poll_results_and_stats_tests
Poll results and stats views
2017-10-24 02:15:02 +02:00
Bertocq
f548f0a1db Fix voting_polls variable typo on shift creation 2017-10-23 22:25:55 +02:00
Bertocq
13e0c6cc3a Fix voting_polls variable typo on shift creation 2017-10-23 22:25:36 +02:00
rgarcia
1259d473c6 fixes spec 2017-10-23 22:13:53 +02:00
rgarcia
b8dd93748f removes unnecessary code 2017-10-23 21:40:04 +02:00
rgarcia
21c7ff15fe fixes routes for poll's results and stats 2017-10-23 21:39:59 +02:00
rgarcia
ca63e4998f adds permissions for poll's results and stats 2017-10-23 21:34:13 +02:00
Bertocq
608ca48b32 Add Recounting and Expired with stats&results polls to dev seeds 2017-10-23 21:02:23 +02:00
Bertocq
39a0d81427 Fix current_user access when not anonymous user visits 2017-10-23 20:44:27 +02:00
Bertocq
debf6ece31 Merge branch 'master' into poll_results_and_stats_tests 2017-10-23 20:19:38 +02:00
Bertocq
3adfbcb830 Fix Shift date ranges when poll is on recounting phase 2017-10-23 20:17:42 +02:00
decabeza
1ea8727668 Merge branch 'master' into poll_results_and_stats_tests 2017-10-23 20:15:33 +02:00
decabeza
2081114628 adds missing i18n 2017-10-23 20:14:21 +02:00
decabeza
aa7dbaa9c4 replace eq200 to text content on specs 2017-10-23 20:13:11 +02:00
decabeza
81e4978747 removes blank space 2017-10-23 19:56:49 +02:00
decabeza
e11957a91c adds specs for poll title link 2017-10-23 19:56:39 +02:00
decabeza
da00ac947e replaces link on poll title if results or stats are enabled 2017-10-23 19:56:26 +02:00
Bertocq
f9458b9ef0 Show booth associated to current/recounting/incoming polls on shift management admin panel 2017-10-23 19:09:57 +02:00