kikito
42b441a866
fixes specs by using the correct capthca helper instead of deactivating it
2015-08-17 12:29:42 +02:00
rgarcia
cd0a64ea3e
adds paranoia gem [ #136 ]
2015-08-17 03:46:00 +02:00
kikito
8ca546a431
merges master and fixes conflicts
2015-08-17 02:40:11 +02:00
kikito
543f718891
Adds phone_number to the regular user registration / account views
2015-08-17 01:16:08 +02:00
kikito
e84873d875
Modifies devise shared link to include organisations sometimes
2015-08-17 01:16:08 +02:00
kikito
9af1f2f4a9
Adds registration controller for organizations
2015-08-17 01:16:07 +02:00
kikito
de73eac2d0
Moves the registrations controller to users/registrations
...
This is necessary because rails gets confused when it has a a “root”
registration_controller and another non-root one. The non-root one uses
the views from the root.
2015-08-17 01:16:07 +02:00
kikito
1f2f318e83
Turns on devise scoped views
...
That way we can have users/registrations & organizations/registrations
2015-08-17 01:16:07 +02:00
kikito
9343952d52
Adds User.organization_attributes
2015-08-17 01:16:07 +02:00
Raimond Garcia
8c6081c163
Merge pull request #181 from AyuntamientoMadrid/adds-kaminari
...
adds kaminari to Gemfile
2015-08-16 23:12:40 +02:00
Juanjo Bazán
2864af087c
Merge pull request #180 from AyuntamientoMadrid/test_coverage
...
Test coverage
2015-08-16 23:11:18 +02:00
Juanjo Bazán
055c66b32f
adds kaminari to Gemfile
...
related: #80
2015-08-16 23:07:43 +02:00
rgarcia
9abe303b31
removes unused method
2015-08-16 23:05:01 +02:00
rgarcia
efa0cf16d9
uses comment strong parameters
2015-08-16 23:05:01 +02:00
Juanjo Bazán
7a53b000c9
Merge pull request #179 from AyuntamientoMadrid/cleanup
...
fixes spacing
2015-08-16 23:02:14 +02:00
rgarcia
bea38226fe
fixes spacing
2015-08-16 22:45:43 +02:00
Juanjo Bazán
57530926a1
Merge pull request #178 from AyuntamientoMadrid/error_messages-110
...
improves consistency of error messages [#110 ]
2015-08-16 19:37:21 +02:00
rgarcia
a81612b226
improves consistency of error messages [ #110 ]
2015-08-16 15:57:09 +02:00
Raimond Garcia
e4406e5916
Merge pull request #177 from AyuntamientoMadrid/fix-captcha-edit-debate
...
Bug Fix
2015-08-16 14:22:43 +02:00
Juanjo Bazán
7cc7efb2c7
uses timezone aware method instead of Date
2015-08-16 00:22:17 +02:00
Juanjo Bazán
e2e1783418
adds spec
...
checks failed debate create/update and inclusion of featured tags
2015-08-16 00:01:30 +02:00
Juanjo Bazán
aeceaf9ea8
fixes bug: edit Debate was not validating captcha
2015-08-15 23:51:30 +02:00
Juanjo Bazán
b62729aac6
removes spanish fixed text from test factory
2015-08-15 22:19:01 +02:00
Juanjo Bazán
c3974de2ff
fixes locales
2015-08-15 22:16:47 +02:00
Juanjo Bazán
8cb654092b
Merge pull request #176 from dgilperez/issue-172
...
Adds CRUD for tags to admin section and featured tags support for debates
2015-08-15 22:00:37 +02:00
David Gil
308d71e517
remove unused method
2015-08-15 20:05:33 +02:00
David Gil
a4ec38d752
adds create and destroy to the tags CRUD
2015-08-15 20:01:52 +02:00
David Gil
664f656fe3
tests featured tags administration and adding featured tags to debates
2015-08-15 19:38:42 +02:00
David Gil
8b89cc5117
adds some js to click-and-add tags to the debate's tag list input
2015-08-15 18:57:27 +02:00
Juanjo Bazán
c909db4022
Merge pull request #175 from AyuntamientoMadrid/refactoring
...
Refactoring
2015-08-15 18:53:01 +02:00
David Gil
1de941d1fa
adding featured tags list to debate form
2015-08-15 18:36:10 +02:00
David Gil
0a4aafd8de
scaffolds a tag list to mark tags as featured on the admin section
2015-08-15 18:22:29 +02:00
David Gil
ae960bba9f
adds featured field to tags
2015-08-15 18:21:25 +02:00
rgarcia
9f2d60c4ce
refactors voted debates
2015-08-15 14:57:41 +02:00
rgarcia
4751954377
refactors debate search
2015-08-15 14:57:04 +02:00
Raimond Garcia
8cf8d9f857
Merge pull request #174 from AyuntamientoMadrid/improving_debates
...
Improving debates
2015-08-15 02:14:21 +02:00
rgarcia
cc1e1aab60
fixes specs
...
for vampires
2015-08-15 01:55:39 +02:00
Alberto Garcia Cabeza
09d71ad84f
Merge branch 'master' into improving_debates
...
Conflicts:
app/assets/stylesheets/debates.scss
app/assets/stylesheets/participacion.scss
2015-08-15 01:45:56 +02:00
Alberto Garcia Cabeza
3ab3285ce4
Cleans scss files
2015-08-15 01:20:26 +02:00
Alberto Garcia Cabeza
510a5c8332
Improves styles for tag cloud
2015-08-15 01:13:55 +02:00
Alberto Garcia Cabeza
4d8b0a01ce
Includes count number of comments on debate show
2015-08-15 01:13:34 +02:00
Alberto Garcia Cabeza
26e2a7bcbb
Cleans style guide
2015-08-15 01:05:46 +02:00
Alberto Garcia Cabeza
f98510cea7
Improves styles for simple captcha
2015-08-15 01:05:00 +02:00
Alberto Garcia Cabeza
feb85c2aea
Adds blog link on header
2015-08-15 00:58:45 +02:00
Alberto Garcia Cabeza
7f2897aef4
Removes unused images
2015-08-15 00:57:41 +02:00
Alberto Garcia Cabeza
a255d15793
Updates custom icons fonts
2015-08-15 00:56:58 +02:00
Alberto Garcia Cabeza
468e8c2f39
Removes unused lato fonts
2015-08-15 00:56:00 +02:00
Alberto Garcia Cabeza
b37279c8e7
Replaces Roboto font with Open Sans
2015-08-15 00:55:30 +02:00
Juanjo Bazán
7919460554
removes comment
2015-08-14 23:41:00 +02:00
Raimond Garcia
ce309f352f
Merge pull request #158 from dgilperez/issue-156
...
Añadir initial.js para mostrar Gmail-ish avatares - issue #156
2015-08-14 21:40:59 +02:00
