Raimond Garcia
|
a9dedbd2b6
|
Merge pull request #290 from AyuntamientoMadrid/pages
adds pages controller for static pages
|
2015-08-29 20:07:33 +02:00 |
|
Juanjo Bazán
|
62f170b402
|
Merge pull request #289 from jjballano/225-reorder-tags
#225 : Tag cloud ordered by count and name
|
2015-08-29 19:47:19 +02:00 |
|
jjballano
|
46f334f38c
|
#225 : refactor
|
2015-08-29 18:43:23 +01:00 |
|
Juanjo Bazán
|
84feeba085
|
adds pages controller for static pages
|
2015-08-29 19:32:08 +02:00 |
|
jjballano
|
a67c0abcec
|
#225 : Tag cloud ordered by count and name
|
2015-08-29 18:16:02 +01:00 |
|
rgarcia
|
062445339e
|
removes spec focus
|
2015-08-29 17:08:20 +02:00 |
|
Raimond Garcia
|
cb69c64d39
|
Merge pull request #288 from AyuntamientoMadrid/officials-search
admins can search officials by name or email
|
2015-08-29 17:06:53 +02:00 |
|
Juanjo Bazán
|
43b333b844
|
admins can search officials by name or email
|
2015-08-29 17:02:21 +02:00 |
|
Raimond Garcia
|
c64bb88e12
|
Merge pull request #287 from AyuntamientoMadrid/admin-improvements
Admin improvements
|
2015-08-29 16:59:53 +02:00 |
|
Juanjo Bazán
|
1156fdc48e
|
fixes i18n keys
|
2015-08-29 16:42:48 +02:00 |
|
Juanjo Bazán
|
58f3442257
|
Merge pull request #286 from AyuntamientoMadrid/beta_testers
Beta testers
|
2015-08-29 16:37:08 +02:00 |
|
Juanjo Bazán
|
0f1329fa85
|
implements organizations search for admins
|
2015-08-29 16:30:32 +02:00 |
|
Juanjo Bazán
|
59c2fdb596
|
adds search method to Organization
|
2015-08-29 16:29:55 +02:00 |
|
rgarcia
|
092dbb56c9
|
adds translations
|
2015-08-29 16:06:30 +02:00 |
|
rgarcia
|
bf0234ff44
|
adds specs for beta testers
|
2015-08-29 15:54:17 +02:00 |
|
rgarcia
|
d0fa2a3ae6
|
adds capistrano task to upload beta tester list
|
2015-08-29 15:54:17 +02:00 |
|
rgarcia
|
171150bcf5
|
displays email sent flash after sign up
|
2015-08-29 15:48:03 +02:00 |
|
rgarcia
|
f92b6de22d
|
authenticates beta testers in beta site
|
2015-08-29 15:48:03 +02:00 |
|
rgarcia
|
814744e1af
|
add beta tester list to .gitignore
|
2015-08-29 15:42:52 +02:00 |
|
Juanjo Bazán
|
c4de2b9af5
|
removes nonexistent feature
|
2015-08-29 15:20:24 +02:00 |
|
Juanjo Bazán
|
29f4976a07
|
fix specs
|
2015-08-29 14:17:41 +02:00 |
|
Juanjo Bazán
|
943ddc60fb
|
adds missing i18n key
|
2015-08-29 14:04:11 +02:00 |
|
Juanjo Bazán
|
99b23ba354
|
fixes html render of i18n text
|
2015-08-29 13:55:37 +02:00 |
|
Juanjo Bazán
|
7753bd35c8
|
pluralizes organización
|
2015-08-29 13:49:32 +02:00 |
|
Juanjo Bazán
|
57090cd794
|
updates admin texts for Tags
|
2015-08-29 13:49:15 +02:00 |
|
Raimond Garcia
|
d1d1558757
|
Merge pull request #285 from AyuntamientoMadrid/verification-namespace
Verification namespace
|
2015-08-29 12:54:57 +02:00 |
|
Juanjo Bazán
|
b6926b0213
|
configures active model i18n keys
|
2015-08-29 12:41:13 +02:00 |
|
Juanjo Bazán
|
e8463d1372
|
moves Residence model to Verification namespace
|
2015-08-29 12:38:07 +02:00 |
|
Juanjo Bazán
|
e33723635b
|
moves Email model to Verification namespace
|
2015-08-29 12:26:20 +02:00 |
|
Juanjo Bazán
|
52f57c5b39
|
fixes letter new form
|
2015-08-29 12:21:55 +02:00 |
|
Juanjo Bazán
|
e6fd62189b
|
moves Sms model to Verification namespace
|
2015-08-29 12:17:27 +02:00 |
|
Juanjo Bazán
|
50dcbcdf9b
|
moves Letter to Verification namespace
|
2015-08-29 12:07:43 +02:00 |
|
Juanjo Bazán
|
1353a1c64b
|
Merge pull request #274 from AyuntamientoMadrid/refactor-selects
Refactor selects
|
2015-08-29 11:36:38 +02:00 |
|
Juanjo Bazán
|
7fdc8e6615
|
adds more precise verification to specs
|
2015-08-29 11:30:11 +02:00 |
|
Juanjo Bazán
|
b6920cc3af
|
Merge pull request #239 from jmgcrespo/master
admin management of moderator users
|
2015-08-29 11:25:03 +02:00 |
|
Juanjo Bazán
|
55edf26a15
|
Merge pull request #283 from AyuntamientoMadrid/improve_design
Improve design
|
2015-08-29 11:08:21 +02:00 |
|
Jose Manuel
|
d963d94996
|
Restored master Gemfile.lock
|
2015-08-29 02:29:13 +01:00 |
|
Jose Manuel
|
ef1f89ab84
|
Merge branch 'refactored_moderator' into master
|
2015-08-29 02:15:26 +01:00 |
|
Jose Manuel
|
e21336aeff
|
Refactored admin´s moderator controller
|
2015-08-29 01:39:46 +01:00 |
|
Alberto Garcia Cabeza
|
ee72096890
|
fixes conflicts
|
2015-08-29 00:40:15 +02:00 |
|
Alberto Garcia Cabeza
|
f75c21f40f
|
Improve admin's styles
|
2015-08-29 00:35:08 +02:00 |
|
Alberto Garcia Cabeza
|
c0eb46288c
|
Improves header, footer and debates mobile styles
|
2015-08-29 00:34:49 +02:00 |
|
Alberto Garcia Cabeza
|
13fe1dcb9f
|
Changes bg images, adds favicon and alerts styles
|
2015-08-29 00:33:40 +02:00 |
|
kikito
|
a7929c607d
|
adds a helper to simplify the way selects and filters are rendered
|
2015-08-28 20:07:45 +02:00 |
|
kikito
|
ae98ba3572
|
merges master and fixes conflicts
|
2015-08-28 19:57:28 +02:00 |
|
Raimond Garcia
|
7847610c19
|
Merge pull request #281 from AyuntamientoMadrid/hidden_comments
Estilo y ocultación de comentarios
|
2015-08-28 19:26:44 +02:00 |
|
kikito
|
9ca71929cf
|
do not include foobar in rspec by default
|
2015-08-28 19:26:03 +02:00 |
|
kikito
|
b872d9a46d
|
fixes failing specs
|
2015-08-28 19:19:18 +02:00 |
|
kikito
|
c989607b50
|
Merge branch 'master' into hidden_comments
|
2015-08-28 18:53:44 +02:00 |
|
Raimond Garcia
|
b1117dd1af
|
Merge pull request #275 from mlovic/filter-topic
Allow debates to be filtered by topic
|
2015-08-28 17:41:38 +02:00 |
|