Commit Graph

3046 Commits

Author SHA1 Message Date
Juanjo Bazán
23c6a04179 removes highlights 2016-03-04 18:46:27 +01:00
Juanjo Bazán
29eda7f14c Merge pull request #966 from consul/update-devise
Updates devise gem
2016-03-04 16:40:37 +01:00
kikito
3e36efffb6 Updates devise gem 2016-03-04 16:24:09 +01:00
Enrique García
23d7ea1f02 Merge pull request #965 from consul/execute-js-rspec
adds helper to disable js fx in specs
2016-03-04 12:46:41 +01:00
Juanjo Bazán
4a888e95c2 disables js fx in specs via poltergeist config 2016-03-04 12:26:47 +01:00
Enrique García
0019f5496c Merge pull request #964 from consul/admin-valuators-filters
adds new filters to admin valuations
2016-03-04 10:24:14 +01:00
Juanjo Bazán
fb5e2beb54 adds new filters to admin valuations 2016-03-03 19:02:13 +01:00
Juanjo Bazán
98650480ad Merge pull request #963 from palomahnhp/changes_commemts_max_length_to_settings
adds the maximum length of the comments to settings #961
2016-03-03 18:39:42 +01:00
palomahnhp
d786f9edea adds the maximum length of the comments to settings 2016-03-03 15:20:29 +01:00
Raimond Garcia
2a4adc2e60 Merge pull request #817 from microweb10/friendly_urls
Friendly urls
2016-03-02 17:51:00 +01:00
Julian Herrero
c2d05d4555 add feature test for proposals friendly urls 2016-03-02 16:02:42 +01:00
Julian Herrero
c44745e0b4 add feature test for management proposals friendly urls 2016-03-02 16:01:57 +01:00
Julian Herrero
80edc4f613 add feature test for debates friendly urls 2016-03-02 16:01:34 +01:00
Julian Herrero
adbf2f40e4 remove controller test for management proposals friendly urls 2016-03-02 16:01:07 +01:00
Julian Herrero
c4a14dfd07 remove controller test for proposals friendly urls 2016-03-02 16:00:44 +01:00
Julian Herrero
50b76a6894 remove controller test for debates friendly urls 2016-03-02 16:00:03 +01:00
Raimond Garcia
9aa716ddc1 Merge pull request #930 from morenohe/phone_erase#837
phone_erase#837
2016-03-02 13:55:44 +01:00
Juanjo Bazán
be188660f8 Merge pull request #960 from consul/spending-proposal-admin
Improves styles for admin section
2016-03-02 12:49:27 +01:00
Alberto Garcia Cabeza
0c798ff9ed Improves styles for admin section 2016-03-02 12:41:27 +01:00
Juanjo Bazán
a640f8d5dc Merge pull request #959 from consul/admin-valuators
Admin valuators
2016-03-02 11:30:48 +01:00
rgarcia
6281f4195b cleans up 2016-03-02 01:04:24 +01:00
rgarcia
ec25b388c7 adds filtering of spending proposals by admin 2016-03-01 20:10:57 +01:00
rgarcia
b38558f2f3 adds index and create of valuators 2016-03-01 20:10:52 +01:00
Juanjo Bazán
69325132ce Merge pull request #884 from consul/foundation_6
Includes Foundation 6 🎉
2016-03-01 18:57:36 +01:00
kikito
64fbb8a9df disables slidetoggle when running tests 2016-03-01 18:28:02 +01:00
Juanjo Bazán
3de43f36f0 Merge pull request #958 from consul/admin-spending-proposal
Shows valuators on two columns
2016-03-01 15:33:16 +01:00
Juanjo Bazán
5b72bbe8db truncates valuator name in admin's checkboxes list 2016-03-01 15:22:12 +01:00
Alberto Garcia Cabeza
d72ba98b4f Changes to three columns 2016-03-01 15:08:53 +01:00
Alberto Garcia Cabeza
3d2f83061d Shows valuators on two columns 2016-03-01 14:58:01 +01:00
Juanjo Bazán
38dcdf1917 updates Rails version (security release) 2016-02-29 23:36:15 +01:00
Alberto Garcia Cabeza
5615f19ba9 Fixes some classes for foundation 6 2016-02-29 13:52:31 +01:00
Juanjo Bazán
cbbd43cd9c updates dependencies 2016-02-29 11:47:42 +01:00
Alberto Garcia Cabeza
3752f3a53b Adds foundation 6 🎉 2016-02-26 19:33:33 +01:00
Raimond Garcia
319fe27150 Merge pull request #938 from consul/blank-codes
[bugfix] no blank redeemable codes
2016-02-26 18:06:41 +01:00
Juanjo Bazán
87662b3873 makes sure no blank redeemable codes are db stored 2016-02-26 17:55:34 +01:00
Alberto Garcia Cabeza
84fd8bbd64 Fixes form on spending proposal admin 2016-02-26 12:52:51 +01:00
Raimond Garcia
812f35968d Merge pull request #937 from consul/valuation
Valuation status
2016-02-26 12:32:44 +01:00
Juanjo Bazán
56bec6f54c simplifies spec 2016-02-26 12:06:10 +01:00
Juanjo Bazán
9eea8fd4a9 adds valuation status filtering to admin 2016-02-26 11:45:29 +01:00
Raimond Garcia
deee2b6275 Merge pull request #936 from consul/admin-valuations
Adds filters for [admin] spending_proposals
2016-02-26 11:31:16 +01:00
Juanjo Bazán
fa33859c58 fights a flaky test 2016-02-26 11:18:31 +01:00
Juanjo Bazán
0d48d4295c adds spec for geozone filtering 2016-02-25 19:17:41 +01:00
Juanjo Bazán
43635f41b0 adds without_validators filter 2016-02-25 18:43:35 +01:00
Juanjo Bazán
96e5be60a3 adds counter cache for assignments 2016-02-25 18:23:17 +01:00
Juanjo Bazán
0e1e0ce371 adds filters: by geozone and without_admin 2016-02-25 18:18:40 +01:00
Juanjo Bazán
e1aff00e5b favors join vs * 😭
we are already using join everywhere
2016-02-25 16:06:26 +01:00
Enrique García
4ecc836139 Merge pull request #935 from consul/valuation-admin
Assignments info in [admin] spending proposals index
2016-02-25 15:58:38 +01:00
Juanjo Bazán
c3ffb0cacc changes index title 2016-02-25 14:45:30 +01:00
Juanjo Bazán
77ee316ed8 adds assignment info to admin's valuations index 2016-02-25 14:44:11 +01:00
Juanjo Bazán
96757bba5b adds message if no valuators are created yet 2016-02-25 14:03:35 +01:00