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
Alberto García Cabeza
33cbc88ee8
Merge pull request #749 from Ana06/master
...
how to use moved to locale files and translated
2015-12-06 22:40:40 +01:00
Ana
5e7cfa68d5
how to use translated
2015-12-06 22:29:39 +01:00
Ana
23cbe7ee9f
how to use moved to locale files
2015-12-06 22:13:39 +01:00
Raimond Garcia
5f70552f1b
Merge pull request #746 from Ana06/master
...
More info moved to locate files and translated
2015-12-06 09:59:01 -08:00
Ana
0abe9a7fd9
Eliminated explanation comments about redcarpet options
2015-12-06 18:06:01 +01:00
Ana
697fa748a3
More information moved to locale files and translated
2015-12-05 18:20:36 +01:00
Ana
ec25d5f6fa
how it works page moved tolocale files using markdown
2015-12-05 16:10:19 +01:00
Juanjo Bazán
6ceafd2a54
Merge pull request #745 from consul/improve_styles
...
Improve styles
2015-12-03 21:02:17 +01:00
Alberto Garcia Cabeza
9ad798d26d
Fixes conflicts
2015-12-03 20:50:21 +01:00
Alberto Garcia Cabeza
7beff47af6
Removes unused keys
2015-12-03 20:46:36 +01:00
Alberto Garcia Cabeza
1bbd36fd11
Improves header and footer styles
2015-12-03 20:46:36 +01:00
Juanjo Bazán
c47f5e84b6
removes provisional transparency page
2015-12-03 20:46:19 +01:00
Alberto Garcia Cabeza
d5c898867b
Removes unused keys
2015-12-03 20:38:51 +01:00
Alberto Garcia Cabeza
b59d61af93
Improves styles for proposals and buttons
2015-12-03 20:25:14 +01:00
Alberto Garcia Cabeza
9ef0c3efbc
Improves styles for auth pages
2015-12-03 20:06:38 +01:00
Alberto Garcia Cabeza
42487ca703
Unifies styles with transparency portal
2015-12-03 19:47:56 +01:00
Alberto Garcia Cabeza
bf5aac32c0
Improves header and footer styles
2015-12-03 19:30:01 +01:00
Alberto Garcia Cabeza
da25779ec7
Replaces open sans font to source sans and merriweather
2015-12-03 19:29:15 +01:00
Raimond Garcia
85e6f16da7
Merge pull request #744 from consul/removes-tmp-transparency-page
...
removes provisional transparency page
2015-12-03 04:04:38 -08:00
Juanjo Bazán
349288b992
removes provisional transparency page
2015-12-03 12:51:51 +01:00
Alberto García Cabeza
d5fad7cf44
Update README.md
2015-12-02 16:35:10 +01:00
Alberto García Cabeza
99036e09fd
Update README_ES.md
2015-12-02 16:34:43 +01:00
Alberto Garcia Cabeza
4614ab45f0
Updates consul logo
2015-12-02 16:32:26 +01:00
Alberto Garcia Cabeza
c21834a9e7
Updates README with consul logo
2015-12-02 16:31:10 +01:00
Alberto Garcia Cabeza
c2f00ee97d
Adds consul logo
2015-12-02 16:28:00 +01:00
pardoam
b2686cc6d1
five_last_week
2015-12-02 14:48:41 +00:00
Raimond Garcia
c8c88b6fd6
Merge pull request #740 from xJakub/master
...
Auto-assign official level to users with official emails
2015-12-01 14:53:00 -08:00
Raimond Garcia
08ee31567c
Merge pull request #739 from Ana06/master
...
Transparency and open data translations
2015-12-01 14:36:04 -08:00
Jakub
e4b31cfe29
Move automatic official_level assignment to the controller.
2015-12-01 23:18:23 +01:00
Ana
c9136807ff
conflicts fixed 2
2015-12-01 23:11:18 +01:00
Ana
2371467b6d
conflicts fixed
2015-12-01 23:09:03 +01:00
Jakub
ea9a2b3be6
Better names for the official email methods
2015-11-30 21:52:48 +01:00
Ana
9c8401008e
Transparency and open data translations
2015-11-30 21:38:48 +01:00
Jakub
ae25c4bed0
Merge remote-tracking branch 'upstream/master'
2015-11-30 20:49:17 +01:00
Jakub
da490a4661
Officials level 1 is auto-assigned on email confirmation. Settings option is now optional. Also working on subdomains
2015-11-30 20:48:12 +01:00
Ana
80420cdb89
Readme updated
2015-11-30 20:48:01 +01:00
Juanjo Bazán
9f984879f1
updates foundation_rails_helper
2015-11-29 21:27:24 +01:00
Juanjo Bazán
fcbffc8396
updates repo name in README
2015-11-29 21:24:13 +01:00
Juanjo Bazán
0c1d397af3
Merge pull request #738 from Ana06/patch-2
...
Update README.md
2015-11-29 21:23:18 +01:00
Jakub
a1e4c1526b
Spec: test email_domain_for_officials
2015-11-29 14:23:50 +01:00
Jakub
b4be4259b7
Level 1 officials are now auto-assigned. Rake user:check_email_domains created.
2015-11-29 00:55:15 +01:00
Ana
058e349e86
Update README.md
2015-11-29 00:11:24 +01:00
