rgarcia
0a6e86ea83
increase delayed job max run time to 30 minutes
2016-12-28 11:41:41 +01:00
rgarcia
c9f62bf2b9
fixes conflicts
2016-12-28 11:41:32 +01:00
Alberto Miedes Garcés
90ff84b6ef
Update API fields for Comment
2016-12-27 18:18:22 +01:00
Alberto Miedes Garcés
0e501e2edd
Update API fields for Debate, User and Geozone
2016-12-27 18:18:00 +01:00
Alberto Miedes Garcés
506696df0a
Call <ApiModel>::public_for_api if available
2016-12-27 18:17:02 +01:00
kikito
9d97421b0e
Merge branch 'master' into budgets
2016-12-27 14:02:12 +01:00
Alberto Miedes Garcés
2741dcf03c
Temporary remove organizations from API
2016-12-26 20:45:46 +01:00
Alberto Miedes Garcés
5daf59e813
Update Proposal fields exposed in API
2016-12-26 13:42:45 +01:00
Alberto Miedes Garcés
d4b049175c
Merge branch 'master' into api-dev-0.18.11
2016-12-26 12:55:17 +01:00
Juanjo Bazán
d057c9457d
Merge branch 'master' into signature-sheets
2016-12-23 20:23:56 +01:00
Fernando Blat
85ce7d7227
Devise won't read mail from Settings in test environment
2016-12-23 15:45:20 +01:00
Fernando Blat
a07fbc5b41
Extract mailer from name and address to a setting
2016-12-23 11:28:53 +01:00
rgarcia
3c682b8a9b
adds signature sheets
2016-12-20 12:21:05 +01:00
Alberto Miedes Garcés
402b07d959
Expose Proposal public_author using scopes instead of modules
2016-12-13 14:04:53 +01:00
Alberto Miedes Garcés
82954c922a
Expose public_author for proposals
2016-12-11 15:42:17 +01:00
Alberto Miedes Garcés
aef20aadf7
Refactor specs for TypeCreator and ConsulSchema
2016-11-30 13:44:31 +01:00
Alberto Miedes Garcés
d1e1ee9d41
Moved api_types into TypeCreator
2016-11-30 13:43:10 +01:00
kikito
2a2179d0f3
Merge branch 'master' into budget
2016-11-28 11:41:49 +01:00
Alberto Miedes Garcés
8b30aaa6d4
Merge branch 'master' into api-dev
2016-11-18 16:40:33 +01:00
Alberto Miedes Garcés
700fcaab16
Expose proposal/debate comments in the API so I can test :has_many associations
2016-11-18 16:24:41 +01:00
Alberto Miedes Garcés
fc61d63aff
Fixed bug for the Comment element inside the API_TYPE_DEFINITIONS
2016-11-17 17:25:27 +01:00
rgarcia
bb3c4c6399
adds consistency to ruby code style
...
Keep a blank line before and after private
Keep a blank line before and after protected
Remove extra empty line at class body end
Remove extra blank line
Add final newline
Use 2 (not 3) spaces for indentation
Use 2 (not 4) spaces for indentation
Remove space before comma
Add space after comma
Remove trailing whitespaces
Remove unnecessary spacing
Use snake_case for variable names
Do not use then for multi-line if
Remove unused block argument - i
Use the new Ruby 1.9 hash syntax
Remove unused assignment to variable
Indent when as deep as case
Align attributes
Align end with def
2016-11-15 11:18:43 +01:00
Alberto Miedes Garcés
b10b701319
Started GraphQL::TypeCreator testing
2016-11-14 16:08:56 +01:00
Alberto Miedes Garcés
0a23533a02
Refactor creation of the QueryRoot
...
Also incremented the max_depth for nested queries since the use of
pagination increases the needed depth to retrieve useful data (edges,
nodes, etc.)
2016-11-11 12:51:45 +01:00
Alberto Miedes Garcés
c42bfbc9a0
Merge branch 'master' into api-coding-madrid
2016-11-10 22:33:27 +01:00
Alberto Miedes Garcés
59a355df1b
First working version of new GraphQL::TypeCreator after major refactoring
2016-11-10 20:53:15 +01:00
Marcia
680c0636ed
expired password last
2016-10-06 14:19:48 +02:00
Marcia
1f72c5cc74
improves expired password view
2016-09-30 10:10:20 +02:00
Marcia
4269f3810b
Merge remote-tracking branch 'upstream/master' into admin_password_expired
2016-09-27 13:26:08 +02:00
Marcia
78c6a30424
optimize code
2016-09-27 13:07:06 +02:00
Marcia
8d883b1e17
mejoras de codigo
2016-09-15 11:45:03 +02:00
Juanjo Bazán
8890380804
adds investment editing to admin
2016-09-07 14:13:40 +02:00
rgarcia
c2c7cdb18d
Merge branch 'budget' into budget-public-controllers
2016-09-02 13:15:40 +02:00
kikito
7ad4a21229
Tries to make ckeditor work correctly with the asset pipeline
...
Reference: https://github.com/galetahub/ckeditor/issues/519
2016-08-30 12:05:46 +02:00
kikito
345e34d422
adds ckeditor config
2016-08-29 16:49:52 +02:00
rgarcia
3c55d66591
fixes conflicts with budget
2016-07-27 11:41:46 +02:00
rgarcia
a23666683f
fixes conflicts with master
2016-07-19 15:50:22 +02:00
Alberto Garcia Cabeza
42722080fc
Changes references to Madrid
2016-07-05 13:47:14 +02:00
Alberto Garcia Cabeza
0972f5284a
Creates new scss file for IE styles
2016-06-23 13:56:57 +02:00
kikito
5f5e7b7c07
Adds vote extensions to handle budget_investments
2016-06-07 11:12:11 +02:00
Andrés Pereira
a4dbd768ce
Custom folder structure: initial documentation, code and structure folders
2016-05-31 19:57:29 +02:00
kikito
eedf02a186
Starts using invisible_captcha in the source code. Pending: tests, proper invisible_captcha gem in Gemfile
2016-04-27 16:07:48 +02:00
kikito
dea1a28a69
purges simple_captcha
2016-04-27 16:07:47 +02:00
rgarcia
ed1ec1c553
adds votes to spending proposals
2016-03-29 14:53:46 +02:00
kikito
2ac12ef4a9
makes admin/spending_proposal/edit visually pleasant
2016-03-08 15:26:13 +01:00
rgarcia
cd8cbef389
adds filtering of tags for spending proposals
2016-03-08 13:57:58 +01:00
rgarcia
de8b7cdb70
uses a more efficient way of getting category names
2016-02-19 18:45:45 +01:00
rgarcia
a4ff3c6a6d
displays categories and districts correctly capitalized
2016-02-19 18:21:45 +01:00
rgarcia
5837c3ac94
uses standard search to create proposal summaries
2016-02-18 17:11:48 +01:00
rgarcia
9409190db1
uses tag ids instead of tag names
2016-02-17 20:53:25 +01:00
