consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,684 Commits 1 Branch 0 Tags
68a9b467260d574d188eed06b1274e400891368c
Commit Graph

20684 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Enrique García
66079f1741 Merge pull request #72 from AyuntamientoMadrid/confirmable-users 
Confirmable users
 2015-07-31 15:03:47 +02:00
Juanjo Bazán
0ca3d2501f fixes build 2015-07-31 14:54:49 +02:00
Juanjo Bazán
e2f7b9c505 adds letter_opener 2015-07-31 13:51:31 +02:00
Juanjo Bazán
627616d9ff adds devise's confirmable/reconfirmable to user 2015-07-31 13:51:03 +02:00
rgarcia
0bc5ac01b2 updates spec content 2015-07-31 13:46:00 +02:00
Raimond Garcia
2ea638967b Merge pull request #64 from AyuntamientoMadrid/auth 
Adds styles for authentication pages
 2015-07-31 05:25:46 +02:00
Alberto Garcia Cabeza
851aefbaa6 Adds styles for authentication pages 2015-07-30 19:51:33 +02:00
Raimond Garcia
7fc7be371b Merge pull request #47 from AyuntamientoMadrid/ajax-47 
Mejorar usabilidad con AJAX
 2015-07-30 18:55:31 +02:00
rgarcia
ba1f4e3850 merges master [#47] 2015-07-30 18:53:04 +02:00
rgarcia
5bdc3fbaa0 updates correct dom element after voting [#47] 2015-07-30 18:45:17 +02:00
rgarcia
ad0e578f2a renders votes partial on ajax request [#47] 2015-07-30 18:43:28 +02:00
rgarcia
5d5b9d00e0 adds ajax to vote links [#47] 2015-07-30 18:43:11 +02:00
rgarcia
cd2d05e0c5 fixing conflicts [#47] [#47] 2015-07-30 18:19:38 +02:00
Juanjo Bazán
f195edef99 Merge pull request #63 from AyuntamientoMadrid/fix-readme 
Fixes README, adds CONTRIBUTING.md
 2015-07-30 17:52:37 +02:00
Juanjo Bazán
8141acafc2 typos 2015-07-30 17:51:08 +02:00
Enrique García
f3f2fd48ca Merge pull request #62 from AyuntamientoMadrid/account 
Adds basic "My account" page
 2015-07-30 17:49:59 +02:00
kikito
250358bcaf Adds CONTRIBUTING.md 2015-07-30 17:41:25 +02:00
kikito
3cd3adcb19 Adds initial README. Fixes #58 2015-07-30 17:41:14 +02:00
Juanjo Bazán
bd4b023715 adds 'my account' link to header 
ref: #22
 2015-07-30 17:36:32 +02:00
Juanjo Bazán
8f6e5ecfc8 adds basic 'my account' page 
Fields related with authentication are not included
because the auth system will change to integrate with 
Madrid.es's Ciudadano360
ref: #22
 2015-07-30 17:36:32 +02:00
Juanjo Bazán
58b43a9dc4 Merge pull request #61 from AyuntamientoMadrid/license 
Adds license. Fixes #60
 2015-07-30 16:49:08 +02:00
Enrique García
0a2bbe8c65 Merge pull request #59 from AyuntamientoMadrid/comments 
Comments
 2015-07-30 16:40:20 +02:00
kikito
4a908e3a0d Adds license. Fixes #60 2015-07-30 16:26:00 +02:00
kikito
59cea45c26 Use App.Comments module in create.js.erb 2015-07-30 14:08:05 +02:00
Alberto Garcia Cabeza
793127fbd3 Deletes margin-top on footer 2015-07-30 13:59:53 +02:00
Alberto Garcia Cabeza
d8d03604b9 Adds styles for comments 2015-07-30 13:59:35 +02:00
kikito
1237f9d8ad make a comments module. Move module initializing to application.js 2015-07-30 13:19:34 +02:00
kikito
f1ebca66c1 add app.js module 2015-07-30 12:55:45 +02:00
kikito
affda6b4c5 merges master and fixes conflicts 2015-07-29 19:14:06 +02:00
Enrique García
c3aca6ac56 Merge pull request #57 from AyuntamientoMadrid/debates 
Debates
 2015-07-29 18:51:31 +02:00
kikito
cee0aef916 Fixes spec: Tags are not separated by commas any more 2015-07-29 18:48:39 +02:00
kikito
efbb9a52d8 Fixes spec: "el " was removed from view 2015-07-29 18:47:22 +02:00
kikito
6d10d97a32 Fixes specs: "Por" was removed from the view. 2015-07-29 18:46:09 +02:00
kikito
a4bc9ed08f removes conflict code which was left there by mistake 2015-07-29 18:45:10 +02:00
Alberto Garcia Cabeza
0efa9c77f1 Adds new styles for debates show 2015-07-29 17:47:05 +02:00
Alberto Garcia Cabeza
63895f52c3 Changes tags styles 2015-07-29 17:45:43 +02:00
Alberto Garcia Cabeza
53e22e78ec Renames images for header, adds for default user 2015-07-29 17:45:43 +02:00
kikito
c495d4678c merges master and fixes conflicts 2015-07-29 17:13:09 +02:00
Juanjo Bazán
5362ce96d6 Merge pull request #56 from AyuntamientoMadrid/quiet_assets 
Adds quiet_assets to the development group to remove asset-related re…
 2015-07-29 16:29:03 +02:00
kikito
604d8ee376 Adds quiet_assets to the development group to remove asset-related requests from the log 2015-07-29 16:07:03 +02:00
Juanjo Bazán
08671414f2 removes hashrockets 2015-07-29 14:27:58 +02:00
Juanjo Bazán
146cfbcf84 removes deprecation method call 2015-07-29 13:57:56 +02:00
Raimond Garcia
6688cb6046 Merge pull request #45 from AyuntamientoMadrid/devise_recaptcha-45 
Añadir captcha al registrarse
 2015-07-29 13:40:14 +02:00
rgarcia
95101c4cc8 fixing conflicts [#45] 2015-07-29 13:36:48 +02:00
Alberto García Cabeza
ca49101209 Merge pull request #53 from AyuntamientoMadrid/buttons-style 
Adds classes to several buttons so they don't look ugly
 2015-07-29 13:22:50 +02:00
Juanjo Bazán
64e78dd019 Merge pull request #54 from AyuntamientoMadrid/wysiwyg-39 
removes options from wysiwyg [closes #39]
 2015-07-29 13:21:54 +02:00
rgarcia
6c2673b169 removes options from wysiwyg [#39] 2015-07-29 13:11:44 +02:00
kikito
b87331c958 merges master and fixes conflicts 2015-07-29 13:00:33 +02:00
kikito
c71182f6a6 Adds classes to several buttons so they don't look ugly 2015-07-29 12:54:51 +02:00
Juanjo Bazán
daa172e408 adds i18n to all devise views 
ref: #38
 2015-07-29 12:18:55 +02:00