156 Commits

Author	SHA1	Message	Date
Raimond Garcia	a9a8359bc7	Merge pull request #216 from AyuntamientoMadrid/design_improvements ... Design improvements	2015-08-21 20:17:34 +02:00
Alberto Garcia Cabeza	ff6285d114	Improves general styles	2015-08-21 18:57:09 +02:00
Juanjo Bazán	b396a3b415	refactors user's registration ... Simplifies process and fields: * In: username * Out: first_name, last_name, phone, nickname, use_nickname? Closes #213	2015-08-21 16:41:08 +02:00
kikito	8ca546a431	merges master and fixes conflicts	2015-08-17 02:40:11 +02:00
kikito	543f718891	Adds phone_number to the regular user registration / account views	2015-08-17 01:16:08 +02:00
kikito	de73eac2d0	Moves the registrations controller to users/registrations ... This is necessary because rails gets confused when it has a a “root” registration_controller and another non-root one. The non-root one uses the views from the root.	2015-08-17 01:16:07 +02:00