Enrique García
|
ab1f502e2f
|
Merge pull request #478 from AyuntamientoMadrid/mobile
Mobile
|
2015-09-12 18:50:41 +02:00 |
|
Alberto Garcia Cabeza
|
120b1a65c2
|
Changes tests for new texts
|
2015-09-12 18:13:52 +02:00 |
|
Alberto Garcia Cabeza
|
747c604127
|
Fixes styles for mobile version
|
2015-09-12 18:05:15 +02:00 |
|
kikito
|
1e59d3259a
|
removes unnecessary whenever setup
|
2015-09-12 09:01:16 +02:00 |
|
kikito
|
05bfaa5c30
|
move whenever require to Capfile
|
2015-09-12 08:56:47 +02:00 |
|
kikito
|
74d07d337d
|
adds a dummy task to schedule.rb
|
2015-09-12 08:45:00 +02:00 |
|
kikito
|
054f3b94e5
|
uses -> instead of refer
|
2015-09-11 17:32:10 +02:00 |
|
kikito
|
06821b9dfc
|
Merge branch 'master' into whenever-355
|
2015-09-11 17:28:41 +02:00 |
|
Raimond Garcia
|
942b27100b
|
Merge pull request #472 from AyuntamientoMadrid/verification-path
Verification path
|
2015-09-11 16:52:02 +02:00 |
|
Juanjo Bazán
|
eabcbb3ef7
|
fixes I18n string
|
2015-09-11 14:41:27 +02:00 |
|
Juanjo Bazán
|
bc86d81302
|
adds verification controller
|
2015-09-11 14:40:51 +02:00 |
|
kikito
|
44b5ea6018
|
first try at integrating whenever and capistrano
|
2015-09-11 14:23:41 +02:00 |
|
Alberto Garcia Cabeza
|
d364d1bf7e
|
Fixes styles for search results and filters
|
2015-09-11 13:58:33 +02:00 |
|
kikito
|
71832b5ff1
|
adds whenever
|
2015-09-11 13:26:31 +02:00 |
|
Raimond Garcia
|
67d5b6fcc8
|
Merge pull request #467 from AyuntamientoMadrid/improve_design
Improve design
|
2015-09-10 20:49:00 +02:00 |
|
rgarcia
|
abc68dc868
|
refactors lock tries [#279]
|
2015-09-10 20:26:49 +02:00 |
|
Enrique García
|
c1c213f773
|
Merge pull request #461 from AyuntamientoMadrid/final_verification-395
Final letter verification
|
2015-09-10 20:22:42 +02:00 |
|
Alberto Garcia Cabeza
|
f1e95addaa
|
Changes tests and comments unused keys
|
2015-09-10 19:29:05 +02:00 |
|
kikito
|
8596df1ea8
|
merges master and fix conflicts
|
2015-09-10 18:09:19 +02:00 |
|
Raimond Garcia
|
b6f9de7e5c
|
Merge pull request #463 from AyuntamientoMadrid/welcome-screen-308
Welcome screen
|
2015-09-10 17:57:42 +02:00 |
|
kikito
|
43bdfb940e
|
merges master and fixes conflicts
|
2015-09-10 17:47:40 +02:00 |
|
kikito
|
249aed42c4
|
Makes welcome screen work using a sessions controller
|
2015-09-10 17:41:37 +02:00 |
|
kikito
|
2c04cd07d9
|
Adds independent welcome screen
|
2015-09-10 17:40:54 +02:00 |
|
Alberto Garcia Cabeza
|
57682e8111
|
Updates header styles, moves search form to header
|
2015-09-10 17:22:11 +02:00 |
|
rgarcia
|
1fb2211776
|
removes unused validation errors [#395]
|
2015-09-10 14:27:37 +02:00 |
|
rgarcia
|
cd74744e06
|
adds validation error for letter verification code [#395]
|
2015-09-10 14:27:02 +02:00 |
|
Juanjo Bazán
|
8e1dcdc16a
|
fix bug on tag deletion when no taggable
|
2015-09-10 13:52:39 +02:00 |
|
Alberto Garcia Cabeza
|
98937e4467
|
Improves styles and texts for footer
|
2015-09-10 13:13:28 +02:00 |
|
rgarcia
|
16dd609ad0
|
adds verification tries to letter code [#332]
|
2015-09-10 11:43:25 +02:00 |
|
Raimond Garcia
|
02c101cd97
|
Merge pull request #453 from AyuntamientoMadrid/ie8
Ie8
|
2015-09-09 23:51:31 +02:00 |
|
Alberto Garcia Cabeza
|
dba3385a6c
|
Adds rem and respond js
|
2015-09-09 20:32:38 +02:00 |
|
Raimond Garcia
|
9e4fdec28e
|
Merge pull request #444 from AyuntamientoMadrid/deploy-custom-branch-357
Deploy custom branch 357
|
2015-09-09 19:57:40 +02:00 |
|
kikito
|
f8d6dd4ca7
|
strings to symbols
|
2015-09-09 19:49:09 +02:00 |
|
kikito
|
e7e1663b26
|
makes staging the only variable server. uses ENV and defaults to master
|
2015-09-09 19:46:26 +02:00 |
|
kikito
|
8c9f189d75
|
merges master and fixes conflicts
|
2015-09-09 19:36:23 +02:00 |
|
rgarcia
|
6a09e6548d
|
reverts - stats with delayed jobs
|
2015-09-09 19:17:13 +02:00 |
|
kikito
|
86e1974a58
|
monkeypatches foundation_rails_helper so it shows an error div after ckeditor
|
2015-09-09 18:36:03 +02:00 |
|
Raimond Garcia
|
bab31b0559
|
Merge pull request #448 from AyuntamientoMadrid/caches
Cache for comments
|
2015-09-09 17:01:11 +02:00 |
|
Juanjo Bazán
|
811c329199
|
changes how comment.created_at is shown
time_ago_in_words is not cache friendly
|
2015-09-09 14:57:27 +02:00 |
|
rgarcia
|
dca7e1e38f
|
moves stats storing to queue
|
2015-09-09 14:41:19 +02:00 |
|
rgarcia
|
cdc914de0d
|
moves storing of visits to queue
|
2015-09-09 14:41:19 +02:00 |
|
kikito
|
2f983198d7
|
default to custom branch in staging and pre
|
2015-09-09 12:45:09 +02:00 |
|
kikito
|
8fb62a3b35
|
asks for the branch to deploy instead of immediately deploying master in staging & pre
|
2015-09-09 12:37:33 +02:00 |
|
Juanjo Bazán
|
55b2f96062
|
changes sentence
|
2015-09-09 11:05:48 +02:00 |
|
Juanjo Bazán
|
a51198dab6
|
Merge pull request #430 from AyuntamientoMadrid/desing_improves
Desing improves
|
2015-09-09 11:04:35 +02:00 |
|
Raimond Garcia
|
b54e4e8649
|
Merge pull request #437 from AyuntamientoMadrid/debate-moderation-2
Bulk moderation
|
2015-09-08 20:55:51 +02:00 |
|
kikito
|
48ba9a436d
|
adds select all/none to bulk moderation
|
2015-09-08 20:46:18 +02:00 |
|
kikito
|
b9ebe8c2c4
|
Implements basic bulk debates functionality
|
2015-09-08 19:44:50 +02:00 |
|
Enrique García
|
5e13fe60f7
|
Merge pull request #436 from AyuntamientoMadrid/organizations-with-hidden-users
show info of hidden users in admin/organizations
|
2015-09-08 18:40:52 +02:00 |
|
Juanjo Bazán
|
6bf8af3526
|
show info of hidden users in admin/organizations
|
2015-09-08 18:06:23 +02:00 |
|