kikito
4e5d53f2f1
Updates the Moderation Organisation controller
2015-08-13 20:05:32 +02:00
kikito
a59ef10e44
adds organization controller, with views and tests
2015-08-12 18:26:12 +02:00
rgarcia
66e4581a84
fixes conflicts with master
2015-08-10 16:46:27 +02:00
Raimond Garcia
16183d9909
Merge pull request #116 from AyuntamientoMadrid/admin-77
...
Administrator and Moderator basic interface
2015-08-10 16:41:47 +02:00
Alberto Garcia Cabeza
91cdfbc8a1
Adds content on footer
2015-08-10 15:39:38 +02:00
Alberto Garcia Cabeza
c048f25941
Fixes conflicts
2015-08-08 13:28:29 +02:00
Alberto Garcia Cabeza
fdfef95595
Adds styles for account page and edit user
2015-08-08 13:21:46 +02:00
Juanjo Bazán
f8becd1b23
Merge branch 'master' into admin-77
2015-08-08 13:00:41 +02:00
Juanjo Bazán
90a3dcdc16
Merge pull request #119 from AyuntamientoMadrid/header
...
Changes styles for header
2015-08-08 01:51:59 +02:00
Alberto Garcia Cabeza
d45a22781a
Changes styles for header
2015-08-07 23:23:16 +02:00
rgarcia
beb1a796f5
adds email sending preferences [ #23 ]
2015-08-07 20:56:27 +02:00
rgarcia
3752054aab
sends emails [ #23 ]
2015-08-07 20:52:53 +02:00
rgarcia
a65396886a
adds error messages to account edit
2015-08-07 17:47:53 +02:00
rgarcia
076448ec80
fixes credentials page
2015-08-07 17:47:12 +02:00
kikito
8d83607331
Implements dashboard controllers & views for admin & moderation
2015-08-07 17:20:28 +02:00
Alberto Garcia Cabeza
8fdba1b5b4
Merges accounts show with registrations edit
2015-08-07 12:16:20 +02:00
Juanjo Bazán
af0698da35
fixes conflicts
2015-08-07 10:12:58 +02:00
Raimond Garcia
3279eeba45
Merge pull request #111 from AyuntamientoMadrid/user_nickname_98
...
User nickname
2015-08-07 09:23:44 +02:00
Juanjo Bazán
37199125fa
refactors votes view code to helper
2015-08-07 09:19:02 +02:00
Alberto Garcia Cabeza
df3884ad18
Adds styles for debate new
2015-08-06 20:54:37 +02:00
rgarcia
6e59df2a3b
adds link to debate description
2015-08-06 20:54:37 +02:00
Alberto Garcia Cabeza
f9cb8151ff
Adds styles for authentication pages
2015-08-06 20:53:14 +02:00
kikito
a194d9584b
merges master and fixes conflicts
2015-08-06 19:25:51 +02:00
kikito
c4c764df38
Adds nickname and use_nickname to "my profile"
2015-08-06 19:19:45 +02:00
kikito
17a741d838
Adds nickname support in the registration form
2015-08-06 18:54:03 +02:00
Juanjo Bazán
cdaa3e2808
favors dom_id
2015-08-06 18:53:40 +02:00
Juanjo Bazán
33489e7b0c
adds css classes to voted options in debates
...
for logged users.
Closes #88
2015-08-06 18:53:05 +02:00
Juanjo Bazán
8d36487cd0
Merge pull request #105 from AyuntamientoMadrid/description_link
...
adds link to debate description
2015-08-06 18:09:44 +02:00
Alberto Garcia Cabeza
1067d2272e
Adds styles for debate new
2015-08-06 17:59:22 +02:00
rgarcia
515d083633
use custom layout for devise controllers
2015-08-06 16:01:01 +02:00
rgarcia
ae34be1ddd
adds link to debate description
2015-08-06 15:50:36 +02:00
Juanjo Bazán
44e049e483
Merge pull request #104 from AyuntamientoMadrid/debates_title_length_93
...
Debates title length
2015-08-06 15:25:16 +02:00
kikito
5c141e36ab
uses the debate title length in the debates form
2015-08-06 14:01:48 +02:00
rgarcia
ec6d34a49f
fixes conflicts
2015-08-06 13:42:57 +02:00
Alberto Garcia Cabeza
56f480d5c0
Improves CSS styles for votes
2015-08-06 12:53:19 +02:00
Alberto Garcia Cabeza
f0be767ae8
Updates styles for debates show
2015-08-06 12:42:41 +02:00
Alberto Garcia Cabeza
77ecf39852
Updates styles for debates index
2015-08-06 11:19:37 +02:00
Fernando Seror
c4eb29f99d
Merge branch 'master' into escoger_idioma_803
...
Conflicts:
app/controllers/application_controller.rb
2015-08-05 15:47:52 -05:00
Fernando Seror
a89d621d1d
Allow locale to be set through the front-end
...
* Store the last used locale in the session
* Allow home page to be identified in helpers even when containing
parameters
* Create initializer to explicitly set the available locales, the
default and the load_path
2015-08-05 15:43:39 -05:00
Juanjo Bazán
ae8068f5fd
fix conflict
2015-08-05 14:46:18 +02:00
Juanjo Bazán
8d87a69e0f
hides comment forms from not logged users
...
Closes #66
2015-08-05 14:12:58 +02:00
rgarcia
fa5b678b69
fixes conflicts with master [ #25 ]
2015-08-05 13:47:23 +02:00
rgarcia
5ce8db002b
adds vote partial for debate index [ #25 ]
2015-08-05 12:24:22 +02:00
rgarcia
91b52ad8d2
refactors voting implementation [ #25 ]
2015-08-05 12:24:22 +02:00
kikito
fc4e67824b
Merge branch 'master' into debates_description_html
...
I removed the truncation from debates.description because
debates.description returns html
Conflicts:
app/views/debates/_debate.html.erb
app/views/debates/show.html.erb
2015-08-04 19:07:20 +02:00
kikito
1fa4087bef
Removes all the extra sanitisation from debates
...
This makes the feature red
2015-08-04 18:42:05 +02:00
Juanjo Bazán
a2ea42d13d
adds first 3 debates as featured_debates
2015-08-04 18:41:09 +02:00
Juanjo Bazán
c3046ccc2b
fixes build
...
adds empty featured_debates
2015-08-04 17:56:38 +02:00
Alberto Garcia Cabeza
4344bc121f
Changes styles for debates index and debate show
2015-08-04 13:25:00 +02:00
rgarcia
2a3086010e
adds voting for comments functionality [ #25 ]
2015-08-02 13:37:37 +02:00
