Commit Graph

15065 Commits

Author SHA1 Message Date
Enrique García
eec198a3a6 Merge pull request #689 from AyuntamientoMadrid/rails-up
rails up!
2015-11-13 10:58:56 +01:00
Juanjo Bazán
17c2fa10c8 rails up! 2015-11-13 10:32:17 +01:00
Juanjo Bazán
68b4d36af2 update dependencies 2015-11-13 10:30:22 +01:00
Enrique García
c96d9068b7 Merge pull request #688 from kikito/add-info-to-readme
Add missing line to README
2015-11-12 13:56:08 +01:00
kikito
6fa0e750c5 Add missing line to README 2015-11-12 13:46:34 +01:00
Juanjo Bazán
1ca7ca6e05 hides comments posted as mod/admin from user page 2015-11-12 12:22:21 +01:00
Juanjo Bazán
c258a4f3b4 adds scope for only normal user comments 2015-11-12 12:15:36 +01:00
Juanjo Bazán
a881ced801 adds user's email to activity page for admins 2015-11-12 12:04:34 +01:00
Juanjo Bazán
72fecabe56 Merge pull request #682 from AyuntamientoMadrid/little_changes
Fixes footer logos and change en title
2015-11-10 12:39:59 +01:00
Alberto Garcia Cabeza
5050712e5c Fixes footer logos and change en title 2015-11-10 12:15:55 +01:00
Enrique García
1fa66b0587 Merge pull request #678 from AyuntamientoMadrid/i18n
removes unique language for production env
2015-11-10 11:15:24 +01:00
rgarcia
91f9d5e6af removes unique language for production env 2015-11-10 10:57:39 +01:00
Raimond Garcia
c512fb6f12 Merge pull request #677 from AyuntamientoMadrid/comments-info
adds info about deleted items on comments activity
2015-11-09 15:26:56 +01:00
rgarcia
56e752e829 brings back extra security checks 2015-11-09 15:20:23 +01:00
rgarcia
ef2e7ca4f9 fixes specs 2015-11-09 14:27:56 +01:00
rgarcia
08c499d4f6 removes spec focus 2015-11-09 13:49:21 +01:00
rgarcia
f4cee3b1c1 adds helper specs 2015-11-09 13:46:37 +01:00
rgarcia
ceb157b53b removes unused code 2015-11-09 13:46:29 +01:00
rgarcia
7259ac06e8 renames user_helper 2015-11-09 13:28:02 +01:00
Juanjo Bazán
0614629d35 adds info about deleted items on comments activity 2015-11-09 13:12:44 +01:00
Raimond Garcia
dc3ecf5fab Merge pull request #675 from AyuntamientoMadrid/avatar-bug
Avatar bug
2015-11-09 11:16:44 +01:00
Raimond Garcia
8f60f0b6d3 Merge pull request #676 from AyuntamientoMadrid/renaming-header
Renaming header
2015-11-09 11:16:31 +01:00
Juanjo Bazán
09a1a2bd2a changes header in admin, moderation & management 2015-11-09 09:53:45 +01:00
Juanjo Bazán
c65ef9c02b better title for management 2015-11-09 09:50:28 +01:00
Juanjo Bazán
40d28355ea adds style to i18n text 2015-11-09 09:50:10 +01:00
Juanjo Bazán
b0e9297b28 changes web main header to 'Madrid Decide' 2015-11-09 09:37:46 +01:00
Juanjo Bazán
cc5babe764 hides comment's author avatar for erased users 2015-11-08 13:21:08 +01:00
Juanjo Bazán
057563d37a shows author avatar in prop/deb only if not hidden 2015-11-08 13:20:36 +01:00
Raimond Garcia
f09fbd519a Merge pull request #673 from AyuntamientoMadrid/simple-format
adds simple format to comments
2015-11-08 10:41:47 +01:00
Raimond Garcia
77e2643229 Merge pull request #674 from avances123/master
rake task for inserting fixtures in README doc
2015-11-08 10:41:20 +01:00
Fabio Rueda
6833ff8a28 rake task for inserting fixtures in README doc 2015-11-08 00:46:48 +01:00
Juanjo Bazán
e38a74d73f adds simple format to comments 2015-11-07 20:38:43 +01:00
Juanjo Bazán
d8fc892a3d updates dependencies 2015-11-06 20:52:06 +01:00
Raimond Garcia
6df3cab2f1 Merge pull request #669 from AyuntamientoMadrid/user-page
User page
2015-11-06 13:15:55 +01:00
Alberto Garcia Cabeza
ca8f410319 Adds styles for user's activity page 2015-11-06 12:28:04 +01:00
Juanjo Bazán
cb04b95956 update dependencies 2015-11-05 18:54:26 +01:00
Juanjo Bazán
b1ea8f7938 increases coverage of user page 2015-11-05 16:39:09 +01:00
Juanjo Bazán
2671b25ba6 makes author name a link to activity page
in debates/proposals/comments
2015-11-04 14:09:16 +01:00
Juanjo Bazán
3465b00e89 adds 'My activity' link 2015-11-04 13:51:57 +01:00
Juanjo Bazán
f57eef4929 makes public activity toggleable 2015-11-04 13:51:31 +01:00
kikito
cf6e451966 updates rollbar to the latest version 2015-11-04 11:16:17 +01:00
Juanjo Bazán
a1cb162286 Merge pull request #668 from andion/patch-3
Update "More information" links to use PagesController
2015-11-04 10:28:23 +01:00
Lucas Andión Montáns
2569e18e08 Update "More information" links to use PagesController
Paths were hardcoded instead of using PagesController actions and defined routes under routes.rb
2015-11-04 09:47:24 +01:00
Juanjo Bazán
6d26901f9f adds specs for user's page 2015-11-03 20:26:13 +01:00
Juanjo Bazán
8c4444985f renames spec 2015-11-03 20:18:00 +01:00
Raimond Garcia
c3fba60d05 Merge pull request #667 from AyuntamientoMadrid/dynamic-supports-number
removes hardcoding of proposal's supports
2015-11-03 19:56:33 +01:00
Juanjo Bazán
fe0618e2c1 restyling user's page 2015-11-03 19:54:57 +01:00
Juanjo Bazán
e8232f296e adds comments to user's page 2015-11-03 19:40:02 +01:00
Juanjo Bazán
7b2e09d54d adds debates to user's page 2015-11-03 19:29:35 +01:00
Juanjo Bazán
15e2ca815d adds activity page with user's proposals 2015-11-03 19:29:35 +01:00