Commit Graph

3994 Commits

Author SHA1 Message Date
Enrique García
824ad5515e Merge pull request #932 from consul/valuators
Valuators and dossier info in spending proposals for Admin
2016-02-25 12:54:51 +01:00
Juanjo Bazán
bc0a8542c2 removes admin.js manifest and favors forms.js 2016-02-25 12:38:48 +01:00
Juanjo Bazán
310217d65f adds valuator and assignments to dev_seeds 2016-02-24 19:53:48 +01:00
Juanjo Bazán
2cddad22d6 redux admin for spending proposals
adds dossier info
adds assignments to admin and valuators
2016-02-24 19:39:02 +01:00
Juanjo Bazán
91cedd78ab adds new js manifest for admin 2016-02-24 18:54:17 +01:00
Juanjo Bazán
34239d8478 creates new fields and assignments for spending_ps 2016-02-24 18:52:15 +01:00
Juanjo Bazán
00eec532a6 removes resolution status from spending proposals 2016-02-24 18:50:39 +01:00
kikito
f5989915fc replaces css selectors by text selectors in advanced_search feature specs to make them less flacky 2016-02-24 12:46:56 +01:00
Juanjo Bazán
c5f994d250 Merge pull request #929 from consul/flacky-tests
Flacky tests
2016-02-24 12:08:40 +01:00
kikito
eda47effc4 Configures tests to minimize flackyness
Reference: https://bibwild.wordpress.com/2016/02/18/struggling-towards-reliable-capybara-javascript-testing/

The only thing I did not do was removing the random order in the tests.
2016-02-24 11:37:07 +01:00
morenohe
567420ae35 phone_erase 2016-02-24 10:33:51 +00:00
kikito
171c4dde13 forces capybara to wait after pushing a button by adding an extra expectation 2016-02-24 11:25:37 +01:00
Enrique García
d194707ff2 Merge pull request #928 from consul/valuators
adds id to valuators admin zone
2016-02-23 15:17:56 +01:00
Juanjo Bazán
b938115f92 adds id to valuators admin zone 2016-02-23 13:04:19 +01:00
Enrique García
502b19ec6a Merge pull request #927 from consul/geozone-rake
catches and logs census api exceptions
2016-02-22 23:16:10 +01:00
rgarcia
dc4c8788f9 catches and logs census api exceptions 2016-02-22 23:15:41 +01:00
Enrique García
eab9976796 Merge pull request #925 from consul/removes-hot-fix
removes unused code
2016-02-22 21:49:11 +01:00
rgarcia
ad3bf7f573 removes unused code 2016-02-22 21:33:08 +01:00
Alberto García Cabeza
0232f52508 Merge pull request #924 from consul/user_redeemable_code
adds a redeemable code to users. It can be filled up when signing up from /cuentasegura
2016-02-22 17:58:15 +01:00
kikito
49dec60615 adds a redeemable code to users. It can be filled up when signing up from /cuentasegura 2016-02-22 17:41:08 +01:00
Alberto García Cabeza
65fc69ffc7 Merge pull request #920 from consul/cuentasegura
Implements /cuentasegura
2016-02-22 17:07:00 +01:00
Alberto Garcia Cabeza
eebeefaff1 Changes styles for /cuentasegura 2016-02-22 16:29:58 +01:00
kikito
81b5ae7089 Implements /cuentasegura 2016-02-22 13:40:49 +01:00
Enrique García
c13c84b7df Merge pull request #917 from consul/district-code-hot-fix
adds hot fix for census api failed attempt storage
2016-02-22 11:53:43 +01:00
Alberto García Cabeza
01653d8396 Merge pull request #916 from consul/welcome-link
changes welcome screen to stress verification and demote view proposals
2016-02-22 11:45:13 +01:00
rgarcia
0e33382912 adds hot fix for census api failed attempt storage 2016-02-22 11:36:48 +01:00
Alberto Garcia Cabeza
7db6785845 Makes button bigger 2016-02-22 11:10:01 +01:00
kikito
cc17986745 changes welcome screen to stress verification and demote view proposals 2016-02-22 11:03:56 +01:00
Raimond Garcia
a93a3ed0e5 Merge pull request #915 from consul/my-activity
does not display spending proposals when filtering my activity
2016-02-21 21:44:21 +01:00
rgarcia
6221c70027 does not display spending proposals when filtering my activity 2016-02-21 21:35:10 +01:00
Raimond Garcia
b6e519c6ab Merge pull request #914 from consul/participatory-budget-urls
Participatory budget urls
2016-02-21 21:16:58 +01:00
rgarcia
b41729b129 uses investment_projects urls 2016-02-21 20:58:42 +01:00
rgarcia
a95fb75103 adds participatory_budget scope 2016-02-21 20:57:24 +01:00
Juanjo Bazán
51a974d97f Merge pull request #913 from consul/investment-proposal-show
Allows users to view their own spending proposals
2016-02-21 18:21:05 +00:00
rgarcia
6f1830b4d1 fixes specs 2016-02-21 18:58:12 +01:00
rgarcia
17d6b55fb3 adds notice with html after spending proposal creation 2016-02-21 18:04:11 +01:00
rgarcia
7699b99655 allows authors and admins to view their spending proposals in my activity 2016-02-21 18:02:55 +01:00
rgarcia
2291caa3fd users can view their own spending proposals 2016-02-21 14:28:48 +01:00
Juanjo Bazán
575b0e105f Merge pull request #911 from consul/association-name
Adds an association name to spending proposals
2016-02-20 19:59:18 +00:00
rgarcia
f1cf93f7cf fixes specs 2016-02-20 20:50:13 +01:00
rgarcia
e924736932 updates form label for association name 2016-02-20 20:20:38 +01:00
rgarcia
5067af3899 displays spending proposal association name 2016-02-20 20:16:13 +01:00
rgarcia
d68ed5228c adds association name to spending proposals 2016-02-20 19:21:30 +01:00
Alberto García Cabeza
93042b7d3e Merge pull request #909 from consul/remove-debate-links
reverts debate links
2016-02-19 19:51:16 +01:00
rgarcia
d4cb89689d removes duplicate foreign_key 2016-02-19 19:20:58 +01:00
rgarcia
f82a590e1e reverts debate links 2016-02-19 19:08:35 +01:00
Enrique García
8841949dd9 Merge pull request #910 from consul/district-summary
District summary
2016-02-19 19:06:33 +01:00
Raimond Garcia
9565920035 Merge pull request #908 from consul/user_geozone
User geozone
2016-02-19 19:04:19 +01:00
rgarcia
de8b7cdb70 uses a more efficient way of getting category names 2016-02-19 18:45:45 +01:00
rgarcia
e836a3c665 uses a more efficient way of getting geozone names 2016-02-19 18:44:00 +01:00