consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,947 Commits 1 Branch 0 Tags
d1e1ee9d4159d43c00cd8a4e5a5383d95427230a
Commit Graph

1032 Commits

Author SHA1 Message Date
Alberto Miedes Garcés
d1e1ee9d41 Moved api_types into TypeCreator 2016-11-30 13:43:10 +01:00
Alberto Miedes Garcés
0eae2fada6 Refactor GraphQL controller specs 2016-11-27 13:50:01 +01:00
Alberto Miedes Garcés
2271f6d634 Renamed GraphQL route, added support for GET requests 2016-11-22 15:22:27 +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
Raimond Garcia
14af1a1961 Merge pull request #1259 from consul/accessibility 
Accessibility
 2016-11-15 11:39:40 +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 Garcia Cabeza
2249fdbdfa improves outline and structure headings 2016-11-14 17:45:20 +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
Alberto Miedes Garcés
277c784234 First simple API version with autogenerated GraphQL types 2016-11-08 17:40:13 +01:00
Alberto Garcia Cabeza
7594981964 changes text 2% of census to 1% 2016-11-02 14:22:37 +01:00
rgarcia
028cc4362d Makes i18n-tasks only aware of english and spanish locales 2016-10-31 11:54:44 +01:00
rgarcia
d540be333a Makes tolk aware of french and portuguese translations 2016-10-31 11:54:26 +01:00
rgarcia
aeec264b8b makes fallback locale spanish 2016-10-31 11:50:16 +01:00
rgarcia
04ca5f7ae8 adds french and brazilian portuguese locales 2016-10-31 11:50:07 +01:00
Juanjo Bazán
fb8669292e adds missing i18n keys to settings 2016-10-13 11:25:29 +02:00
Raimond Garcia
593e77147c Merge pull request #1232 from usabi/custom_locales_load_fix 
Fixes custom locales inclusion.
 2016-10-06 16:47:31 +02: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
Alberto Miedes Garcés
022340b1cf Created GraphQL Schema and query root 2016-09-28 12:48:24 +02:00
Alberto Miedes Garcés
ab333d6627 Created controller and route to answer GraphQL queries 2016-09-28 12:47:07 +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
Ignacio Aliende García
e4e2706af6 Fixes custom locales inclusion. 2016-09-20 17:34:26 +01:00
Alberto Garcia Cabeza
910b24936d Merge branch 'master' into voting-proposals 
Conflicts:
	app/models/proposal.rb
	app/views/proposals/_proposal.html.erb
	app/views/proposals/index.html.erb
	app/views/proposals/show.html.erb
	spec/support/common_actions.rb
 2016-09-15 13:58:53 +02:00
Alberto Garcia Cabeza
7abd31e4bf Renames variable, updates text 2016-09-15 13:47:53 +02:00
Marcia
8d883b1e17 mejoras de codigo 2016-09-15 11:45:03 +02:00
Alberto Garcia Cabeza
db6f82fa4c Moves banner to a partial and includes it on debates index 2016-09-14 11:09:36 +02:00
Alberto Garcia Cabeza
076e237320 Improves proposal ballot banner, deletes unused partial 2016-09-14 10:40:16 +02:00
Alberto Garcia Cabeza
3bbc2862d2 Adds admin setting 'months to archive proposals' 2016-09-09 18:02:02 +02:00
Alberto Garcia Cabeza
e8b70a48fa Adds tab in index & removes support button in index/show 2016-09-09 17:32:03 +02:00
Juanjo Bazán
e330b704c0 removes half-baked feature 
archived proposals is a separate issue now
 2016-09-08 17:06:16 +02:00
Alberto Garcia Cabeza
cff1f43a90 Adds banner, styles, and updates icons font 2016-09-07 16:42:57 +02:00
Alberto Garcia Cabeza
22487592cf Adds scope for archived proposals 2016-09-07 12:57:53 +02:00
Alberto Garcia Cabeza
b107790039 Adds links, texts and i18n 2016-09-07 12:46:29 +02:00
Alberto Garcia Cabeza
a527de4f92 Adds proposal ballots controller and views 2016-09-07 12:43:12 +02:00
Jaime Iniesta
2e6328d502 fixes a few typos 2016-09-06 18:21:15 +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
Juanjo Bazán
fb810c1b90 Merge pull request #1188 from consul/custom-folders 
Custom folders
 2016-07-21 13:19:52 +02:00
Juanjo Bazán
6d2f28b13d removes unused i18n entries 2016-07-20 13:16:59 +02:00
rgarcia
a23666683f fixes conflicts with master 2016-07-19 15:50:22 +02:00
Alberto Garcia Cabeza
c3d70f6e95 Adds text for show comment children 2016-07-14 18:02:27 +02:00
Alberto Garcia Cabeza
f3e0626709 Adds text to notifications icons on header 2016-07-12 13:24:49 +02:00
Juanjo Bazán
f91385873a updates ruby version in deploy.rb to 2.3.1 2016-07-12 11:21:15 +02:00
Juanjo Bazán
575d9a1998 updates capistrano 2016-07-11 14:21:54 +02:00