consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,274 Commits 1 Branch 0 Tags
5ec12e4b5bc162bd5aa934624c765c79fad44be3
Commit Graph

69 Commits

Author SHA1 Message Date
Juanjo Bazán
5ec12e4b5b Merge branch 'master' into redux-polling 2016-12-27 18:22:06 +01:00
Alberto Garcia Cabeza
76a3c61020 improves html structure for comments on debates and proposals 2016-12-19 13:43:09 +01:00
Alberto Garcia Cabeza
87e7e7e4ea fixes specs 2016-12-07 18:16:09 +01:00
Juanjo Bazán
6aa96c4471 removes mentions to enquiries and deprecated code 2016-12-07 14:48:44 +01:00
Alberto Garcia Cabeza
3b2fe1e184 improves headings and outline structure 2016-12-05 17:02:42 +01:00
rgarcia
e12f183775 fixes typo 2016-11-19 14:03:10 +01:00
rgarcia
724dac4df2 cherry picks creating poll question from successful proposals 2016-11-18 21:09:28 +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
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
d5af06da5d Adds proposal's total votes in index/show views 2016-09-12 17:56:15 +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
b107790039 Adds links, texts and i18n 2016-09-07 12:46:29 +02:00
Alberto Garcia Cabeza
dd7629b5af Adds notification menu and message for empty notifications 2016-06-15 21:00:56 +02:00
Alberto Garcia Cabeza
2dc39192b8 Adds button to proposal's show to 'Send notification' 2016-06-15 17:13:44 +02:00
Alberto Garcia Cabeza
e550a40f90 Adds share and comment button on email 2016-06-07 16:12:16 +02:00
Alberto Garcia Cabeza
bfc9c6c0df Improves styles for proposal show 2016-06-06 17:51:16 +02:00
Alberto Garcia Cabeza
84f9dcaa76 Adds tabs for notifications on proposal show 2016-06-06 17:26:48 +02:00
rgarcia
fc6cc090f8 displays notifications in proposal view 2016-06-06 12:21:48 +02:00
Juanjo Bazán
6760199a90 Merge pull request #1090 from consul/back-links 
Back links
 2016-04-28 16:52:09 +02:00
Alberto Garcia Cabeza
7320d17bea Moves back links inside a partial 2016-04-26 13:04:57 +02:00
Alberto Garcia Cabeza
f079bdac8a Improves styles for retire proposals 2016-04-23 13:28:43 +02:00
Juanjo Bazán
5b4a7b8cf8 adds link to explanation 2016-04-23 13:24:15 +02:00
Juanjo Bazán
58a5e2a283 authors can retire proposals now 2016-04-23 13:24:15 +02:00
Juanjo Bazán
87d2d74f66 updates devise & ahoy 2016-04-19 13:27:16 +02:00
Alberto Garcia Cabeza
e55a4c9f23 Renters videos on proposals show 2016-04-14 16:38:39 +02:00
Enrique García
2d59e4739d Merge pull request #1038 from consul/embed-video 
Moves and makes bigger embed video on proposals
 2016-04-05 12:08:02 +02:00
Alberto Garcia Cabeza
5bef2f193c Moves and makes bigger embed video on proposals 2016-04-05 11:27:20 +02:00
Bertocq
f18a1778ff Hashtag al compartir en redes sociales #65 @AyuntamientoMadrid/consul 2016-04-04 20:56:29 +02:00
Alberto García Cabeza
f2291070b2 Merge pull request #1007 from palomahnhp/embed_videos_in_show_proposal 
embed video in proposal show #949
 2016-03-29 17:33:31 +02:00
Juanjo Bazán
4eb822a73c improves styles for whatsapp sharing button 2016-03-21 11:56:08 +01:00
Juanjo Bazán
df6e3301b9 uses generic urls in whatsapp sharing button 2016-03-21 11:52:49 +01:00
Alberto García Cabeza
3f63c5af7b Merge pull request #985 from Ana06/master 
Share with WhatsApp
 2016-03-21 11:33:14 +01:00
palomahnhp
3c7b71018b embed video in proposal show 2016-03-20 20:44:20 +01:00
Alberto Garcia Cabeza
3ec0971b37 Replaces icons i tags for span 2016-03-14 19:32:48 +01:00
Ana
8119df26fb Use of fontastic instead of font-awesome 2016-03-12 22:20:35 +01:00
Ana
f4b7e0c142 Share with Whatsapp improvement 2016-03-11 00:34:07 +01:00
Ana
f866c7be8f Share with WhatsApp in proposals 2016-03-11 00:25:29 +01:00
Alberto Garcia Cabeza
3752f3a53b Adds foundation 6 🎉 2016-02-26 19:33:33 +01:00
rgarcia
21b9e31f11 uses geozones instead of district tags 2016-01-25 22:28:46 +01:00
Alberto Garcia Cabeza
5e5d790e8d Merge branch 'master' into refactor_styles 2015-12-16 13:37:46 +01:00
Alberto Garcia Cabeza
66acbdbb66 Removes unused classes 2015-12-16 11:58:36 +01:00
rgarcia
60d6f1c41b annotates legislations instead of proposals 2015-12-16 11:45:47 +01:00
Rod Wilhelmy
dea9110a69 Fix nil error for non-logged users in proposals#show 2015-12-16 11:45:46 +01:00
Abigail Sosa
bb5da1af7f Se agrega usuario autor a cada anotacion 2015-12-16 11:45:46 +01:00
Abigail Sosa
189a6426b1 Se agregan anotaciones a propuestas existentes 2015-12-16 11:45:46 +01:00
kikito
d4bbf0d26e refactors shared part of debate & proposal views 2015-10-21 14:47:17 +02:00
kikito
6c5d1faa90 Uses the new field, erased_at, for erased users 2015-10-21 14:28:21 +02:00
rgarcia
dc93ea6dba displays proposal created within management layout 2015-10-13 15:00:23 +02:00
rgarcia
a3503c7eb3 refactors manager proposal votes 2015-10-08 14:40:47 +02:00