consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,760 Commits 1 Branch 0 Tags
b921ac9d331b9bb5fd5fa27fb4fa0bb431f035ee
Commit Graph

662 Commits

Author SHA1 Message Date
Juanjo Bazán
b921ac9d33 adds proposal url to social buttons 2015-09-23 16:55:44 +02:00
Enrique García
44f19085a9 Merge pull request #539 from AyuntamientoMadrid/activities 
Activities
 2015-09-23 12:40:02 +02:00
Enrique García
be092dce0d Merge pull request #543 from AyuntamientoMadrid/media-icon 
moves social media icon to public
 2015-09-23 12:33:43 +02:00
Juanjo Bazán
651c3e184f moves social media icon to public 2015-09-23 12:25:42 +02:00
kikito
6e185fd62e uses :back in proposals/show 2015-09-22 18:07:49 +02:00
Enrique García
4697cabbd9 Merge pull request #538 from AyuntamientoMadrid/share_proposal 
Adds social share for supported proposals
 2015-09-22 17:32:45 +02:00
Juanjo Bazán
02b1e30205 logs activity: restore admin actions 
on User/Proposal/Debate/Comment
 2015-09-22 17:24:13 +02:00
Enrique García
3e7a8e572e Merge pull request #483 from juandefelix/user-from-omniauth 
Añadido :terms_of_service a User::first_or_create_for_oauth
 2015-09-22 16:42:14 +02:00
Enrique García
72787b6284 Merge pull request #485 from juandefelix/keep-filter 
Conservar orden de búsqueda al hacer click en "Volver"
 2015-09-22 16:41:20 +02:00
Enrique García
f3253d02d6 Merge pull request #524 from dgilperez/ie_alert_cookie 
Cookie for IE alert
 2015-09-22 16:38:31 +02:00
Juanjo Bazán
7741023e6a adds activity page to administration 2015-09-22 16:30:43 +02:00
Alberto Garcia Cabeza
34c8dd0b8a Adds social share for supported proposals 2015-09-22 16:04:54 +02:00
kikito
3b405f3e29 changes css style name to avoid conflicts 2015-09-22 14:23:11 +02:00
kikito
343025872b changes comment moderation to be similar to proposals moderation 2015-09-22 14:20:37 +02:00
kikito
69e74c4207 Style in comment moderation 2015-09-21 16:12:55 +02:00
kikito
12f1796e7b Merge branch 'master' into debates-moderation-530 2015-09-21 15:52:25 +02:00
kikito
757205a93e Unifies bulk & debates moderation forms in a single one 2015-09-21 15:41:01 +02:00
kikito
1d5904d478 displays the complete text of the proposal in the moderation interface 2015-09-21 12:47:13 +02:00
juandefelix
b519cb75fa added warning text underneath omniauth sign up links 2015-09-19 20:36:16 -05:00
juandefelix
09b751bda9 "Back" link directs to previous page 2015-09-19 19:00:11 -05:00
Juanjo Bazán
b7185bfdf1 moves social media icon to asset pipeline 2015-09-18 13:06:29 +02:00
Juanjo Bazán
1d2717a137 improves social cards info for proposals 2015-09-18 12:34:44 +02:00
Juanjo Bazán
a60fdc8ccd sets debate's title as title page in debate/show 2015-09-18 12:34:14 +02:00
Juanjo Bazán
d6c38b17ba adds social media meta tags for proposals 2015-09-18 11:48:42 +02:00
Alberto Garcia Cabeza
e502884259 Adds new playlist video on more info pages 2015-09-18 10:27:26 +02:00
David Gil
e8f1d627b1 binds the ie alert close link to a cookie that will be checked before showing the alert the next time 2015-09-18 01:25:55 +02:00
Juanjo Bazán
2ffb22a249 Merge pull request #519 from AyuntamientoMadrid/fix-tagcloud-488 
Fix tagcloud
 2015-09-17 17:24:39 +02:00
Enrique García
9d774adfb5 Merge pull request #517 from AyuntamientoMadrid/minor_improves 
Minor improves
 2015-09-17 17:24:08 +02:00
kikito
f9101b4970 Implements tag_cloud using the new custom counters 2015-09-17 16:55:16 +02:00
Juanjo Bazán
9e1a550b42 [admin/comments] info of hidden Debate/Proposal 
Removes link to hidden objects
 2015-09-17 13:53:29 +02:00
Alberto Garcia Cabeza
efe1e58318 Improves styles for moderator actions 2015-09-17 13:38:49 +02:00
Alberto Garcia Cabeza
de4b0eb502 Improves styles for verification account 2015-09-17 13:38:32 +02:00
Enrique García
a92aeea17a Merge pull request #512 from AyuntamientoMadrid/ie8 
Popup < IE9
 2015-09-17 11:04:09 +02:00
Alberto Garcia Cabeza
bdf420666b Moves browser's url out of yml 2015-09-17 10:50:14 +02:00
Enrique García
7f09881c74 Merge pull request #513 from AyuntamientoMadrid/final_verification 
Final verification
 2015-09-17 10:20:42 +02:00
Alberto Garcia Cabeza
56a72b9118 Adds author name and level on lists 2015-09-16 20:45:02 +02:00
Alberto Garcia Cabeza
9c47129274 Simplifies final verification page 2015-09-16 17:27:57 +02:00
Alberto Garcia Cabeza
d5274a69c4 Adds IE popup for IE less than IE9 versions 2015-09-16 15:37:47 +02:00
kikito
3490f0fa70 Merge branch 'master' into fix-tagcloud-488 2015-09-15 17:13:48 +02:00
kikito
d324c061b3 Refactors shared/_tags view to always take a param called taggable 2015-09-15 15:28:14 +02:00
Raimond Garcia
fac69770c8 Merge pull request #499 from AyuntamientoMadrid/percentages 
makes percentage votes to sum 100
 2015-09-15 15:05:22 +02:00
Alberto Garcia Cabeza
fd488092de Adds styles for proposal percentage and attached 2015-09-15 14:21:09 +02:00
Alberto Garcia Cabeza
98ae8c8014 Fixes proposal moderation 2015-09-15 14:19:56 +02:00
Juanjo Bazán
1c5f77def2 makes percentage votes to sum 100 2015-09-15 14:11:12 +02:00
Alberto Garcia Cabeza
41c147de11 Fixes videos for mobile 2015-09-15 10:21:32 +02:00
Alberto Garcia Cabeza
c5052ff270 Moves videos order 2015-09-15 09:13:11 +02:00
Alberto Garcia Cabeza
6b9cfec9e5 Updates some texts 2015-09-15 09:08:17 +02:00
Alberto Garcia Cabeza
3879e88762 Adds videos to proposals info page 2015-09-15 09:07:49 +02:00
Alberto Garcia Cabeza
ff03396ae1 Replaces home icons png to svg 2015-09-15 08:57:49 +02:00
Juanjo Bazán
817b5806ba adds video_url to proposals 2015-09-14 21:40:03 +02:00