Commit Graph

2381 Commits

Author SHA1 Message Date
rgarcia
c1c9ed6340 increases comment weight on hot scores 2015-11-17 09:57:47 +01:00
rgarcia
d502a64507 increases time units for hot scores 2015-11-17 09:50:50 +01:00
Enrique García
2e9f2011cc Merge pull request #700 from AyuntamientoMadrid/featuring-manuela
adds Manuela's featured debate
2015-11-16 12:34:02 +01:00
rgarcia
285105fd1f adds Manuela's featured debate 2015-11-16 12:26:21 +01:00
Raimond Garcia
54753ce68d Merge pull request #697 from AyuntamientoMadrid/delete_email
Deletes email for email template
2015-11-16 02:31:14 -08:00
Alberto Garcia Cabeza
d3b67def81 Deletes email for email template 2015-11-16 11:08:25 +01:00
Juanjo Bazán
e2be52cf18 Merge pull request #696 from AyuntamientoMadrid/new_texts
Updates some texts
2015-11-15 22:26:39 +01:00
Alberto Garcia Cabeza
981b9fc637 Updates some texts 2015-11-15 21:08:52 +01:00
Juanjo Bazán
1fc6c7323b updates pg 2015-11-14 22:40:21 +01:00
Juanjo Bazán
c4671ee960 hides featured debates in search & tag pages 2015-11-13 12:45:25 +01:00
Juanjo Bazán
a8e991eea2 Merge pull request #690 from AyuntamientoMadrid/featured_debates
Featured debates
2015-11-13 12:27:31 +01:00
Alberto Garcia Cabeza
ca55b43e7c Deletes text-transform for debates titles 2015-11-13 12:24:50 +01:00
Juanjo Bazán
e087d1f817 moves all static featured debates code to partial 2015-11-13 12:09:24 +01:00
Raimond Garcia
8b55d0a7c6 Merge pull request #684 from AyuntamientoMadrid/activity-improvements
Activity improvements
2015-11-13 03:02:26 -08:00
Alberto Garcia Cabeza
3037eb5dc3 Adds static featured debates 2015-11-13 12:00:46 +01:00
Alberto Garcia Cabeza
859dfc09e0 Adds featured debates 2015-11-13 11:39:49 +01:00
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