consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,208 Commits 1 Branch 0 Tags
154cdac33233b7bdfe09b51b43e08d4a1e4ad9ef
Commit Graph

287 Commits

Author SHA1 Message Date
Bertocq
154cdac332 Add calculate_winners on Admin Budget controller, route and ability for admins 2017-06-25 15:47:04 +02:00
rgarcia
3a50cc3a99 Enables GraphQL UI in production 2017-06-15 12:12:41 +02:00
Juanjo Bazán
9ab0f9cf8b Merge branch 'master' into amiedes-api-dev-PRs-2 2017-06-14 12:46:58 +02:00
Bertocq
e55328caf4 Rename legislation process final_version_publication phase name to more descriptive result_publication 2017-06-13 22:04:36 +02:00
kikito
1701111bf5 Merge branch 'api-dev-PRs' of https://github.com/amiedes/consul into amiedes-api-dev-PRs-2 2017-06-13 12:07:28 +02:00
Eduardo Martinez Echevarria
afad69fb71 Add suggest to investments in routes 2017-06-11 13:39:07 +02:00
Amaia Castro
b616210607 View and search users from admin panel 2017-06-09 17:30:06 +02:00
Amaia Castro
29d994dd4a Rename users to hidden users in admin 2017-06-09 17:19:01 +02:00
decabeza
c846107cd8 removes more info pages belongs to madrid's fork 2017-06-07 18:28:12 +02:00
Juanjo Bazán
16edbf15a2 Merge pull request #1620 from consul/medialab-legislation 
Adds Collaborative Legislation
 2017-06-07 18:06:15 +02:00
Bertocq
b2c79174aa Add new Proposal share endpoint, plus ability for ereryone to use it 2017-05-31 10:59:30 +02:00
rgarcia
1a46b4d4cb fixes conflicts with master 2017-05-31 10:36:38 +02:00
Juanjo Bazán
1ae55a59f6 Merge pull request #1560 from bertocq/feature/admin_administrators_management 
Administrators management in admin area
 2017-05-30 10:44:50 +02:00
Bertocq
9506855a44 Add Admin Administrator route, controller and manage ability for admin users 2017-05-23 22:49:44 +02:00
rgarcia
2a7ff2270e sends zip file with test data 2017-05-23 16:45:34 +02:00
decabeza
5e0d5fc8c3 Merge branch 'legislation-module-stable' of https://github.com/medialab-prado/consul into medialab-legislation 2017-05-22 18:43:49 +02:00
rgarcia
ed5a1cecbb adds budget results 2017-05-19 14:04:46 +02:00
Alberto Miedes Garcés
5d9054d284 Merge branch 'master' into api-dev-PRs 
Conflicts:
	Gemfile.lock
	config/routes.rb
	db/dev_seeds.rb
	db/schema.rb
 2017-05-11 21:59:42 +02:00
Raimond Garcia
1770630470 Merge pull request #1484 from PopulateTools/site-customization 
Site customization
 2017-04-11 13:48:17 +02:00
Alberto Garcia Cabeza
910d615017 removes details page info of proposals and budgets 2017-04-07 18:33:26 +02:00
Amaia Castro
9e5324cc1b Merge branch 'master' into site-customization 2017-04-07 17:29:33 +02:00
Amaia Castro
b0b39d9f8a Remove sandbox 
Revert "Implement Sandbox"

This reverts commit e806a39820c2920d18b80dc560d05db36ecb6ede.
 2017-04-06 17:00:05 +02:00
Amaia Castro
c1de2dced4 Custom content blocks for top_links and footer 2017-04-06 17:00:05 +02:00
Amaia Castro
8143fe1037 Site customization: images uploads 2017-04-06 17:00:04 +02:00
Amaia Castro
54fab919e5 Show custom pages in public site 2017-04-06 16:59:58 +02:00
Amaia Castro
255b57cc85 Admin for custom pages 2017-04-06 16:25:07 +02:00
Martín González
b35683f75e Implement Sandbox 2017-04-06 15:04:23 +02:00
Alberto
6bbcc71ecb Merge branch 'master' into polls 2017-04-06 14:16:49 +02:00
Alberto Garcia Cabeza
533a7492a1 changes more information to more info 2017-04-04 18:01:30 +02:00
Alberto Garcia Cabeza
37f4d0daa5 adds friendly urls 2017-03-29 18:02:55 +02:00
Amaia Castro
d95f902fdf Merge branch 'master' into legislation-module-stable 2017-03-07 23:19:26 +01:00
kikito
3dbdc8f455 Adds delete link to budget investment list in user activities 2017-03-06 19:24:10 +01:00
Juanjo Bazán
47745f5e6d removes unused route 2017-02-14 15:10:51 +01:00
Juanjo Bazán
0bd87c7e43 extracts results from admin's poll/show 2017-02-14 14:26:46 +01:00
Juanjo Bazán
bedb9f29e7 extracts recounting from admin's poll/show 2017-02-14 14:07:22 +01:00
Juanjo Bazán
19ec7f93b3 extracts officer_assignments from admin's poll/show 2017-02-14 13:47:33 +01:00
Juanjo Bazán
20e31133a8 extracts booth_assignment from admin's poll/show 2017-02-14 13:00:19 +01:00
Amaia Castro
5d37997a69 Redirect to allegations phase if open 2017-02-09 16:59:02 +01:00
Juanjo Bazán
ec8d45f3cd adds index view for poll results in officing 2017-02-02 16:10:40 +01:00
Juanjo Bazán
594ad3df7b adds basic new view for officing results 2017-02-02 11:53:57 +01:00
Juanjo Bazán
72ac75abeb adds final recounting to poll officers' zone 2017-01-30 17:44:39 +01:00
rgarcia
6c34599e1e adds officer residence check and user voting 2017-01-29 00:36:20 +01:00
Alberto Miedes Garcés
5b7cbccd19 Merge branch 'master' into api-dev 2017-01-26 12:39:59 +01:00
Juanjo Bazán
113f9b32d7 Merge branch 'master' into polls 2017-01-19 16:51:19 +01:00
Amaia Castro
1af047089f Add form to publish a new first level comment from the comments box 2017-01-19 15:42:50 +01:00
Amaia Castro
a2a61341fe Merge branch 'master' into legislation-module-stable 2017-01-11 22:54:41 +01:00
Amaia Castro
4f539b374f View comments for draft text 2017-01-10 17:25:02 +01:00
Juanjo Bazán
70b86170a2 adds booth_assignment show with officers and recounts info 2017-01-04 21:00:36 +01:00
Alberto Miedes Garcés
6445fffc0d Merge branch 'master' into api-dev-0.18.11 2017-01-04 16:21:32 +01:00
Amaia Castro
ee9fa3db15 Base Legislation Annotations 2017-01-04 12:56:58 +01:00