Commit Graph

20144 Commits

Author SHA1 Message Date
kikito
e6755fa804 Fixes typo in annotable.js.coffee 2015-12-16 18:05:52 +01:00
kikito
fc8a1fc84b allows not-logged-in users to read existing annotations 2015-12-16 16:26:59 +01:00
kikito
9ebcebb2ab makes more tests green 2015-12-16 16:21:40 +01:00
Julian Herrero
e7314ac380 add option to subscribe/unsubscribe to website newsletter 2015-12-16 16:14:35 +01:00
Julian Herrero
81bc3d7267 add link in emails to manage notification settings (unsubscribe) 2015-12-16 16:13:25 +01:00
kikito
f43248b174 renames & refactors annotations.js into annotable.js 2015-12-16 16:07:23 +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
Raimond Garcia
ee473c124e Merge pull request #770 from consul/refactor_styles
Refactor styles
2015-12-16 13:51:38 +01:00
Alberto Garcia Cabeza
5e5d790e8d Merge branch 'master' into refactor_styles 2015-12-16 13:37:46 +01:00
Alberto Garcia Cabeza
2bb9b2ff8d Unifies layout SCSS 2015-12-16 13:23:00 +01:00
Alberto Garcia Cabeza
a54828ae6b Refactors SCSS 2015-12-16 13:03:49 +01:00
Alberto Garcia Cabeza
52e5cda45e Improves footer and account page 2015-12-16 13:03:23 +01:00
Enrique García
5607f0f86a Merge pull request #769 from consul/annotator
Annotator
2015-12-16 12:06:00 +01:00
Alberto Garcia Cabeza
114808745d Adds mixins SCSS 2015-12-16 11:58:57 +01:00
Alberto Garcia Cabeza
66acbdbb66 Removes unused classes 2015-12-16 11:58:36 +01:00
rgarcia
b5c945f1f5 cleans up specs 2015-12-16 11:45:47 +01:00
kikito
f0440f3208 adds annotation destroy spec 2015-12-16 11:45:47 +01:00
rgarcia
1512e944df adds update annotation spec 2015-12-16 11:45:47 +01:00
kikito
2ced669821 legislation annotation spec cleanup 2015-12-16 11:45:47 +01:00
rgarcia
1702426414 adds search and create specs 2015-12-16 11:45:47 +01:00
rgarcia
60d6f1c41b annotates legislations instead of proposals 2015-12-16 11:45:47 +01:00
rgarcia
f2c14968f3 adds legislation seed 2015-12-16 11:45:47 +01:00
rgarcia
9c3fda076d adds legislation permissions 2015-12-16 11:45:47 +01:00
rgarcia
996e87cb13 adds legislations 2015-12-16 11:45:46 +01:00
Rod Wilhelmy
dea9110a69 Fix nil error for non-logged users in proposals#show 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
Juanjo Bazán
0d8a233c22 updates dependencies 2015-12-16 11:36:43 +01:00
Juanjo Bazán
a643c7c300 removes unused page 2015-12-16 11:28:37 +01:00
Alberto Garcia Cabeza
e40f411ecc Removes unused header css method 2015-12-15 17:04:03 +01:00
Alberto Garcia Cabeza
a48574e99a Removes Merriweather font 2015-12-15 16:54:26 +01:00
Alberto Garcia Cabeza
ca18eb99de Cleans and improves styles for header and homepage 2015-12-15 16:35:55 +01:00
Juanjo Bazán
a45288a48f Merge pull request #768 from consul/unused_page
Removes unused static page
2015-12-14 18:51:35 +01:00
Alberto Garcia Cabeza
eb47f3de44 Removes unused static page 2015-12-14 18:20:51 +01:00
Alberto García Cabeza
724b438127 Merge pull request #767 from codegram/page_path_fixes
Fix footer links
2015-12-14 16:33:08 +01:00
Josep Jaume Rey Peroy
a430c3e631 Fix footer links 2015-12-14 16:13:30 +01:00
Juanjo Bazán
328bd767ca adds js file for IE eyes only 2015-12-14 12:56:50 +01:00
Juanjo Bazán
393ff6ddd9 removes IE specific js files from application.js 2015-12-14 12:56:13 +01:00
Juanjo Bazán
927ebf9442 Merge pull request #766 from codegram/normalize_pages
Normalize page paths
2015-12-14 12:08:58 +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
Daniel Baena
f8e1fc70a1 #670 2015-12-11 21:06:27 +01:00
Juanjo Bazán
085a52ea00 updates dependencies 2015-12-11 13:57:46 +01:00
Alberto Garcia Cabeza
5174d84ca0 Updates readme english version 2015-12-10 13:47:25 +01:00
Alberto García Cabeza
d1a579d8dc Merge pull request #757 from codegram/libsass
Use libsass for a faster stylesheet compilation
2015-12-10 12:02:55 +01:00
Josep Jaume Rey Peroy
3b57a586a9 Use libsass for a faster stylesheet compilation 2015-12-09 20:44:58 +01:00
Raimond Garcia
0ebf3977ba Merge pull request #750 from codegram/add_spring_for_rspec
Add Spring binstubs for RSpec
2015-12-07 01:33:58 -08:00
Josep Jaume Rey Peroy
9914e4f331 Add Spring binstubs for RSpec 2015-12-07 09:33:32 +01:00