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 |
|
BertoCQ
|
cdff74189b
|
Merge pull request #2103 from consul/polls-results-polish
Polls results polish
|
2017-10-23 17:30:33 +02:00 |
|
decabeza
|
358449c874
|
adds missing i18n
|
2017-10-23 17:26:34 +02:00 |
|
decabeza
|
568303c3ff
|
adds data equalizer for results and stats sidebar
|
2017-10-23 17:26:17 +02:00 |
|
iagirre
|
3815e20506
|
Specs for admins polls stats added
|
2017-10-23 16:48:50 +02:00 |
|
iagirre
|
7c02e2914b
|
Fixed a translation in english (it was in spanish)
|
2017-10-23 16:22:27 +02:00 |
|
iagirre
|
a7d474910c
|
Added missing i18n keys and css to make the cursor change when hover th in head
|
2017-10-23 16:17:25 +02:00 |
|
María Checa
|
f7dce94a45
|
Added tests for Poll results and stats views
|
2017-10-23 15:50:53 +02:00 |
|
Raimond Garcia
|
799b136ca6
|
Merge pull request #2082 from consul/1786-poll_results
Poll results
|
2017-10-23 15:18:52 +02:00 |
|
rgarcia
|
9ce7045717
|
fixes specs
|
2017-10-23 15:17:35 +02:00 |
|
María Checa
|
84f67db26d
|
Added restrictions to access Poll results and stats
|
2017-10-23 14:17:25 +02:00 |
|
María Checa
|
5a9ee4642e
|
Merge branch 'master' into 1786-poll_results
|
2017-10-23 13:43:58 +02:00 |
|
Raimond Garcia
|
8ca4d0fb7f
|
Merge pull request #2095 from consul/2052-admin_results_and_stats
Admin results and stats
|
2017-10-23 13:42:40 +02:00 |
|
iagirre
|
5a3e701e8d
|
Polls' stats migrated from Madrid's fork and sortable functions added for tables
|
2017-10-23 13:19:22 +02:00 |
|
decabeza
|
f38f333fe5
|
undo changes on poll title links
|
2017-10-23 13:02:37 +02:00 |
|
María Checa
|
b1e91cdc03
|
Tests improvements
|
2017-10-23 12:57:52 +02:00 |
|
María Checa
|
fad5841d8f
|
Improvements
|
2017-10-23 12:57:41 +02:00 |
|
María Checa
|
6b5c29f23e
|
Added tests
|
2017-10-23 12:25:51 +02:00 |
|
David Rodríguez
|
97331cb1c9
|
Fix direct_messages_max_per_day set to nil
When set to nil, it should mean not zero, but "infinite".
|
2017-10-23 12:15:31 +02:00 |
|
Raimond Garcia
|
e6384bd5df
|
Merge pull request #2098 from consul/admin-officer-menu
Admin officer menu
|
2017-10-23 10:28:07 +02:00 |
|
Raimond Garcia
|
e46a1eff7e
|
Merge pull request #2099 from consul/admin-menu-order
Admin menu order
|
2017-10-23 10:27:56 +02:00 |
|
Manuel Ortega
|
928186045a
|
Moved 'del usuario' text form view to locale files
|
2017-10-22 14:25:15 +02:00 |
|
decabeza
|
96f588566a
|
changes id name to specs
|
2017-10-22 01:06:03 +02:00 |
|
decabeza
|
3f2189b124
|
removes unnecessary blank space 😅
|
2017-10-21 20:07:13 +02:00 |
|
decabeza
|
f8e5f791b3
|
adds missing p close tag
|
2017-10-21 18:25:58 +02:00 |
|
decabeza
|
70713e08c3
|
adds missing space
|
2017-10-21 18:25:30 +02:00 |
|
decabeza
|
e0a1a73e0b
|
fixes active class on polls admin menu
|
2017-10-21 18:20:26 +02:00 |
|