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 |
|
Juanjo Bazán
|
2ba3f8a1a9
|
Merge pull request #39 from AyuntamientoMadrid/wysiwyg-39
Adds WYSIWYG to debate's form
|
2015-07-29 10:19:23 +02:00 |
|
rgarcia
|
1deecea0af
|
adds wysiwyg to debate description
|
2015-07-28 21:46:01 +02:00 |
|
rgarcia
|
63cac453e6
|
binds js behaviour to ajax generated content [#47]
|
2015-07-28 21:04:58 +02:00 |
|
rgarcia
|
8a642d3c96
|
fixes specs [#47]
|
2015-07-28 20:53:09 +02:00 |
|
rgarcia
|
bdcd513f26
|
responds with ajax to debate vote [#47]
|
2015-07-28 20:52:59 +02:00 |
|
rgarcia
|
be2a481cd7
|
fixes specs [#47]
|
2015-07-28 20:32:59 +02:00 |
|
rgarcia
|
3247180dfa
|
responds with ajax to comment creation [#47]
|
2015-07-28 20:32:53 +02:00 |
|
Juanjo Bazán
|
be81c17ea3
|
removes test directory
|
2015-07-28 18:53:04 +02:00 |
|
Juanjo Bazán
|
efc1b71dbf
|
adds i18n to header
ref: #38
|
2015-07-28 18:49:41 +02:00 |
|
rgarcia
|
7a53055db1
|
updates alert styling [#45]
|
2015-07-28 18:33:09 +02:00 |
|
rgarcia
|
416693fb01
|
fixes specs [#45]
|
2015-07-28 18:32:51 +02:00 |
|
rgarcia
|
81a5ddb580
|
refactors recaptchable helper [#45]
|
2015-07-28 18:32:45 +02:00 |
|
rgarcia
|
c5bfc9420f
|
adds recaptcha validation to registration controller [#45] [#45]
|
2015-07-28 18:32:10 +02:00 |
|
Enrique García
|
6a6804f73b
|
Merge pull request #48 from AyuntamientoMadrid/footer
Adds fake footer
|
2015-07-28 17:00:03 +02:00 |
|
Enrique García
|
5860efe35d
|
Merge pull request #46 from AyuntamientoMadrid/beautification
Beautification
|
2015-07-28 16:50:32 +02:00 |
|
Juanjo Bazán
|
e9c1910d7d
|
adds i18n to debates' interface
|
2015-07-28 16:48:36 +02:00 |
|
kikito
|
d5710c8dc6
|
Removes '|' after button in debates/show
The rest of the commit noise is trailing spaces :(
|
2015-07-28 16:32:07 +02:00 |
|
decabeza
|
d422830228
|
Adds fake footer
|
2015-07-28 14:07:47 +02:00 |
|
rgarcia
|
05bff9dc1f
|
adds styling to submit button
|
2015-07-28 13:55:31 +02:00 |
|
rgarcia
|
1609f6970f
|
displays debates next to each other
|
2015-07-28 13:55:15 +02:00 |
|