Commit Graph

463 Commits

Author SHA1 Message Date
kikito
d194bf0adc takes the user to the same page he was in after logout 2015-12-22 11:19:06 +01:00
kikito
df7bb4ac95 Merge branch 'master' into devise-location 2015-12-22 10:54:52 +01:00
kikito
866e04f776 makes devise remember the last visited page before login in 2015-12-21 16:44:30 +01:00
Juanjo Bazán
0dcc176098 removes before_filter
(deprecated in favor of before_action)
2015-12-19 10:21:53 +01:00
kikito
900f11fd49 ActiveRecord.find already throws a 404 if not existing; there is no find! 2015-12-16 18:44:55 +01:00
kikito
c98360fa87 Return a permissions hash with all the annotations 2015-12-16 18:10:02 +01:00
kikito
3245aa9dd2 Do not accept user_id as parameter when creating annotations 2015-12-16 18:09:10 +01:00
kikito
6335732ce6 Ensure that 404 errors are thrown for inexistent annotations 2015-12-16 18:07:03 +01:00
kikito
22ec287b16 Removes the user param from the client and forces it to be current_user in the controller 2015-12-16 18:06:25 +01:00
kikito
7996f5f816 makes cancan return a json error when asked for json and permissions fail 2015-12-16 14:02:03 +01:00
rgarcia
60d6f1c41b annotates legislations instead of proposals 2015-12-16 11:45:47 +01:00
rgarcia
996e87cb13 adds legislations 2015-12-16 11:45:46 +01:00
Abigail Sosa
bb5da1af7f Se agrega usuario autor a cada anotacion 2015-12-16 11:45:46 +01:00
Abigail Sosa
e2f6950dc4 Carga anotaciones de la propuesta 2015-12-16 11:45:46 +01:00
Abigail Sosa
cf8a952b0b Se pueden eliminar anotaciones 2015-12-16 11:45:46 +01:00
Abigail Sosa
5743068780 Se pueden editar - actualizar anotaciones 2015-12-16 11:45:46 +01:00
Abigail Sosa
189a6426b1 Se agregan anotaciones a propuestas existentes 2015-12-16 11:45:46 +01:00
Josep Jaume Rey Peroy
80104d100f Normalize page paths
Normalize page paths so they can be accessed by `page_path(:id)`.

The benefit of this is that we can add any arbitrary amount of pages
without affecting the routing layer.
2015-12-12 10:22:27 +01:00
Juanjo Bazán
349288b992 removes provisional transparency page 2015-12-03 12:51:51 +01:00
Jakub
e4b31cfe29 Move automatic official_level assignment to the controller. 2015-12-01 23:18:23 +01:00
rgarcia
40ea3fcc58 displays relevance order in searches 2015-11-23 13:39:32 +01:00
Juanjo Bazán
19212a6b46 fixes 'My activity' comments count for admins/mods 2015-11-17 19:40:18 +01:00
Juanjo Bazán
1ca7ca6e05 hides comments posted as mod/admin from user page 2015-11-12 12:22:21 +01:00
Juanjo Bazán
f57eef4929 makes public activity toggleable 2015-11-04 13:51:31 +01:00
Juanjo Bazán
7f1fe034a3 adds user's public show page 2015-11-03 19:29:35 +01:00
kikito
cf31e89204 Fixes issues in moderation spex related with comment sort 2015-11-02 15:54:15 +01:00
kikito
73c306a673 Adds 3 orders for comments: most_voted, newest, oldest 2015-11-02 14:01:55 +01:00
kikito
2fab210ac8 merges with master and fixes conflicts 2015-10-31 17:09:52 +01:00
kikito
60b3c65b05 Refactor comment tree calculation using a PORO 2015-10-30 17:00:32 +01:00
Juanjo Bazán
d3423b72b8 hides featured proposal from tag page 2015-10-30 12:14:18 +01:00
Juanjo Bazán
1e0ac137bb removes beta testers functionality 2015-10-29 13:19:00 +01:00
kikito
50fdd005a4 Implements comment sorting in proposals and debates 2015-10-28 18:40:32 +01:00
kikito
d6396b38b6 Adds missing comments order in management controller 2015-10-28 17:34:51 +01:00
kikito
da19d4d773 replace most_voted by confidence_score in comment views 2015-10-28 16:02:40 +01:00
kikito
e4bfc72649 Refactors design of comments order selector into a partial with i18n 2015-10-28 15:48:48 +01:00
Raimond Garcia
3ef5562f1a Merge pull request #641 from AyuntamientoMadrid/management-polishing
Management polishing
2015-10-24 15:02:58 +02:00
Juanjo Bazán
510d85cf97 unifies session key 2015-10-23 14:05:23 +02:00
Juanjo Bazán
f1bc7af462 makes manager logout to remove session user data 2015-10-23 13:37:19 +02:00
Juanjo Bazán
854499b135 adds localization to management 2015-10-23 13:36:43 +02:00
kikito
ac1507e85e Fixes error when signing up new users. Fixes #624 2015-10-23 12:09:45 +02:00
Juanjo Bazán
3802bc78b5 removes comments
This controller is no longer used in /management
2015-10-23 11:22:23 +02:00
rgarcia
c71bf4c876 tracks visits from different email templates 2015-10-22 12:23:15 +02:00
Juanjo Bazán
1136c5546a adds featured proposals
via new action featured_vote
Featured proposals are never duplicated in the filtered lists
Featured are not calculated/shown in searches.
2015-10-22 11:54:17 +02:00
Juanjo Bazán
65ed1f45ab define method for extra customization 2015-10-22 11:53:19 +02:00
kikito
f596beaaf5 removes unnecessary conditions from before_actions in verification/letter_controller 2015-10-20 17:33:16 +02:00
kikito
18db6482f9 makes sure verifications only happen for signed in users when doing a letter verification 2015-10-20 17:18:28 +02:00
kikito
3ab579999e merges with master and fixes conflicts 2015-10-20 16:28:22 +02:00
kikito
0d0806c9ae improvements in the letter verification error messages 2015-10-20 16:19:17 +02:00
Juanjo Bazán
0ff9429b52 adds for_render to preload tags 2015-10-20 15:02:41 +02:00
rgarcia
8acd119b19 displays only the first 5 proposals to print 2015-10-20 14:45:59 +02:00