Raimond Garcia
|
d62b30c487
|
Merge pull request #353 from AyuntamientoMadrid/hot-score-347
Hot score 347
|
2015-09-04 17:24:42 +02:00 |
|
kikito
|
8b16ecfcf9
|
fixes typo and specs
|
2015-09-04 15:36:54 +02:00 |
|
kikito
|
dd4a2d57cf
|
makes admin/organization specs more robust
|
2015-09-04 15:32:15 +02:00 |
|
Alberto Garcia Cabeza
|
a75cbefe8d
|
Styles for header,footer,filters, alerts and pages
|
2015-09-04 15:19:50 +02:00 |
|
Alberto Garcia Cabeza
|
e0959f3e28
|
Improves account checkboxes and edit debate button
|
2015-09-04 15:07:41 +02:00 |
|
Alberto Garcia Cabeza
|
4e92b5c3ce
|
Adds back link on verification pages
|
2015-09-04 15:06:38 +02:00 |
|
Alberto Garcia Cabeza
|
2e8669c4c9
|
Changes some texts
|
2015-09-04 15:06:05 +02:00 |
|
Juanjo Bazán
|
2a4c29c7ca
|
Merge branch 'master' into hot-score-347
|
2015-09-04 14:59:51 +02:00 |
|
kikito
|
9f970568ac
|
Displays debate.created_at in debates#index
|
2015-09-04 12:16:11 +02:00 |
|
Juanjo Bazán
|
5af7bc1aee
|
removes language switcher if only one locale
|
2015-09-03 23:47:55 +02:00 |
|
Enrique García
|
858adf891f
|
Merge pull request #346 from AyuntamientoMadrid/ancestry
Ancestry
|
2015-09-03 17:19:08 +02:00 |
|
Juanjo Bazán
|
dfc1ccb108
|
renames helper method
|
2015-09-03 17:13:19 +02:00 |
|
Juanjo Bazán
|
05a647f9e7
|
Merge pull request #345 from AyuntamientoMadrid/improve_styles
Improve styles
|
2015-09-03 16:43:10 +02:00 |
|
Juanjo Bazán
|
358028c3e6
|
Fixes conflicts. Merge branch 'master' into ancestry
|
2015-09-03 16:37:28 +02:00 |
|
Juanjo Bazán
|
136c1e73ed
|
uses ancestry to retrieve debate comments
|
2015-09-03 16:32:54 +02:00 |
|
Alberto Garcia Cabeza
|
f20192d9d7
|
Improves styles for debates
|
2015-09-03 14:15:45 +02:00 |
|
Alberto Garcia Cabeza
|
3255995ea1
|
Adds new styles for pages
|
2015-09-03 14:15:01 +02:00 |
|
Alberto Garcia Cabeza
|
8559833cc0
|
Changes texts for emails
|
2015-09-03 14:11:25 +02:00 |
|
Enrique García
|
aa22c82a5c
|
Merge pull request #331 from AyuntamientoMadrid/letter_verification
Letter verification
|
2015-09-03 12:38:08 +02:00 |
|
Juanjo Bazán
|
572432f2cf
|
Merge pull request #339 from AyuntamientoMadrid/remove-tag-filter-337
Remove tag filter
|
2015-09-03 11:50:53 +02:00 |
|
kikito
|
002d86884b
|
Removes the tag selector from debate#index view & refactors i18n
|
2015-09-03 11:15:05 +02:00 |
|
Enrique García
|
1c9cfb5a48
|
Merge pull request #333 from AyuntamientoMadrid/favicon
adds favicon to other layouts
|
2015-09-03 10:18:19 +02:00 |
|
Alberto Garcia Cabeza
|
3f53f61b1d
|
Fixes conflicts
|
2015-09-03 00:12:59 +02:00 |
|
Alberto Garcia Cabeza
|
3172223930
|
Updates header and footer
|
2015-09-02 23:43:32 +02:00 |
|
Alberto Garcia Cabeza
|
7fefcb692e
|
Changes and updates texts
|
2015-09-02 23:43:08 +02:00 |
|
Alberto Garcia Cabeza
|
a8cbc60b02
|
Adds new pages, includes new texts
|
2015-09-02 23:42:06 +02:00 |
|
rgarcia
|
137ca75055
|
adds favicon to other layouts
|
2015-09-02 22:34:16 +02:00 |
|
rgarcia
|
99d779bcec
|
adds letter code verification
|
2015-09-02 21:57:03 +02:00 |
|
Juanjo Bazán
|
dee2d0196b
|
ancestries
moves to ancestry from acts_as_commentable_with_threading
|
2015-09-02 19:23:09 +02:00 |
|
Raimond Garcia
|
faf1b32cf5
|
Merge pull request #329 from AyuntamientoMadrid/verification
Verification
|
2015-09-02 18:58:25 +02:00 |
|
Juanjo Bazán
|
eb689d7c7e
|
refactors comment form
|
2015-09-02 17:22:21 +02:00 |
|
Juanjo Bazán
|
04127b23f9
|
Merge pull request #323 from AyuntamientoMadrid/filter-dry-282
Dries filters code
|
2015-09-02 14:24:06 +02:00 |
|
kikito
|
79febe7bb8
|
Adds shared/filter_subnav partial to DRY filters
|
2015-09-02 13:39:27 +02:00 |
|
kikito
|
ebacc8c9c7
|
Uses has_filters in all controllers with filters & renames @filter to @current_filter
|
2015-09-02 13:21:46 +02:00 |
|
Juanjo Bazán
|
31a8c15344
|
removes redundant condition
|
2015-09-02 12:57:09 +02:00 |
|
Alberto Garcia Cabeza
|
da86c5d6e0
|
Adds styles for verification account process
|
2015-09-02 12:34:08 +02:00 |
|
Juanjo Bazán
|
5c10435064
|
disables voting on comments for not allowed users
|
2015-09-02 12:23:56 +02:00 |
|
Juanjo Bazán
|
8915ce7ffd
|
adds interface to disallow organizations votes
on debates
|
2015-09-02 12:16:55 +02:00 |
|
rgarcia
|
587749782d
|
hot fix for anonymous votes
|
2015-09-01 22:56:27 +02:00 |
|
Juanjo Bazán
|
c6c32a0795
|
adds translation for admin settings' keys names
|
2015-09-01 20:00:41 +02:00 |
|
Juanjo Bazán
|
ac7ad1d863
|
hides 'too many anonymous votes' layer
|
2015-09-01 17:49:03 +02:00 |
|
Juanjo Bazán
|
9f4a98d3a0
|
moves translation keys
|
2015-09-01 17:49:02 +02:00 |
|
Alberto Garcia Cabeza
|
bcc58ab0c4
|
Adds styles for too much anonymous votes
|
2015-09-01 17:49:02 +02:00 |
|
Alberto Garcia Cabeza
|
57e373a7cf
|
Adds styles for too much anonymous comments
|
2015-09-01 17:49:02 +02:00 |
|
Juanjo Bazán
|
2e5b5bccb5
|
adds methods to decide if a user can vote a debate
|
2015-09-01 17:49:01 +02:00 |
|
rgarcia
|
9838ba86ad
|
hides social network login
|
2015-09-01 16:30:12 +02:00 |
|
Raimond Garcia
|
3c665153d4
|
Merge pull request #300 from AyuntamientoMadrid/flag-helper
Flag helper
|
2015-09-01 15:19:16 +02:00 |
|
kikito
|
9a071d2ed7
|
Renames @voted_values to @debate_votes in controllers
|
2015-09-01 13:07:03 +02:00 |
|
rgarcia
|
369fc6aef7
|
hides social network login
|
2015-09-01 12:46:02 +02:00 |
|
kikito
|
005fd4c09a
|
Replaces can? :flag/:unflag by a helper function
|
2015-09-01 10:34:46 +02:00 |
|