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

1382 Commits

Author SHA1 Message Date
Alberto Miedes Garcés
93e79228a7 Ability to delete geozones from admin dashboard 2016-12-08 13:16:42 +01:00
Alberto Miedes Garcés
fea2009396 Ability to edit geozones from admin dashboard 2016-12-07 22:08:22 +01:00
Alberto Miedes Garcés
6175990533 Admin geozones: index, create 
Modified Geozone factory and seeds to be more complete
 2016-12-04 21:19:36 +01:00
kikito
f0b8cfd4a2 Time.now -> Time.current 2016-11-23 19:19:19 +01:00
Alberto Garcia Cabeza
a66800afb1 fixes styles for spending proposals list and show 2016-11-14 17:46:01 +01:00
Alberto Garcia Cabeza
2249fdbdfa improves outline and structure headings 2016-11-14 17:45:20 +01:00
Alberto Garcia Cabeza
e778c49e64 removes orange blocks and improves contrast on proposals 2016-11-02 16:31:38 +01:00
Alberto Garcia Cabeza
2c4b5315c8 removes blue blocks and improves contrast on debates 2016-11-02 13:07:26 +01:00
Alberto Garcia Cabeza
f8649ad6c2 improves styles on comments votes 2016-11-02 12:17:15 +01:00
Alberto Garcia Cabeza
e9b5a8980e removes redundant link on header 2016-10-31 18:39:57 +01:00
Juanjo Bazán
87ec74b49f Merge pull request #1253 from consul/refactor-styles 
Refactor styles
 2016-10-31 17:27:52 +01:00
Alberto Garcia Cabeza
6fd5e6a67a unifies styles for participation not allowed 2016-10-31 16:50:13 +01:00
Alberto Garcia Cabeza
7d4f92f10a unifies styles of page forms 2016-10-31 13:11:23 +01:00
rgarcia
c0f400a4d9 Adds custom locale name for Português 2016-10-31 11:50:24 +01:00
Alberto Garcia Cabeza
5c1e1f96ea deletes unused wrap class 2016-10-25 16:23:45 +02:00
Juanjo Bazán
179cb3d611 Merge pull request #1247 from consul/direct-messages-format 
fixes text format on direct messages
 2016-10-19 11:26:30 +02:00
Alberto Garcia Cabeza
c835d9b1d1 improves styles for flash notices 2016-10-19 10:54:48 +02:00
Alberto Garcia Cabeza
e8312ff86a fixes text format on direct messages 2016-10-18 16:40:59 +02:00
Marcia
1e87810593 improves expired password view 2016-09-29 14:34:37 +02:00
Marcia
4269f3810b Merge remote-tracking branch 'upstream/master' into admin_password_expired 2016-09-27 13:26:08 +02:00
rgarcia
72e173b8ea closes missing div 2016-09-16 20:25:12 +02: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
Juanjo Bazán
e0c3f7c029 Merge pull request #1213 from consul/archived-proposals 
Archived proposals
 2016-09-15 13:22:05 +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
6fac3c67ff Merge branch 'voting-proposals' of github.com:consul/consul into voting-proposals 2016-09-12 18:07:22 +02:00
Alberto Garcia Cabeza
77077b28b8 Removes question and supports on successfull proposals 2016-09-12 18:06:43 +02:00
Alberto Garcia Cabeza
d5af06da5d Adds proposal's total votes in index/show views 2016-09-12 17:56:15 +02:00
Alberto Garcia Cabeza
fa3b503c47 Adds specs 2016-09-09 17:32:21 +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
974c4d6d70 adds specs for proposal ballots 2016-09-08 12:43:06 +02:00
Alberto Garcia Cabeza
cff1f43a90 Adds banner, styles, and updates icons font 2016-09-07 16:42:57 +02:00
Jaime Iniesta
9c48a46f0a adjusts style for badge in featured proposals 2016-09-07 13:22:52 +02:00
Jaime Iniesta
8af944ce56 Fixes failing spec for badges. 
spec/features/official_positions_spec.rb:56 was failing because the expected
badge was not being shown in featured proposals.
 2016-09-07 13:13:06 +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
Juanjo Bazán
fb810c1b90 Merge pull request #1188 from consul/custom-folders 
Custom folders
 2016-07-21 13:19:52 +02:00
rgarcia
a23666683f fixes conflicts with master 2016-07-19 15:50:22 +02:00
Alberto Garcia Cabeza
a30d9218d4 Deletes alt text for decorative images 2016-07-14 18:07:45 +02:00
Alberto Garcia Cabeza
c3d70f6e95 Adds text for show comment children 2016-07-14 18:02:27 +02:00
Alberto Garcia Cabeza
62a7b32389 Adds texts to icons on comments votes 2016-07-12 13:55:52 +02:00
Alberto Garcia Cabeza
77b99c1b5c Adds text to icons like and unlike on debates 2016-07-12 13:48:55 +02:00
Alberto Garcia Cabeza
f3e0626709 Adds text to notifications icons on header 2016-07-12 13:24:49 +02:00
Juanjo Bazán
7f01dbdca2 makes sure setting helper is used in views 2016-07-08 14:42:28 +02:00
Alberto Garcia Cabeza
702cfe13d1 Fixes specs 2016-07-06 14:47:09 +02:00
Alberto Garcia Cabeza
42722080fc Changes references to Madrid 2016-07-05 13:47:14 +02:00
Alberto Garcia Cabeza
ece2f6f019 Removes Madrid references on pages 2016-07-04 18:07:45 +02:00
rgarcia
745de9bb77 sends invitation email to users 2016-06-27 23:37:58 +02:00