consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,118 Commits 1 Branch 0 Tags
b6af10a91fa70e3d901b2bf8c03279b2623a894f
Commit Graph

676 Commits

Author SHA1 Message Date
Juanjo Bazán
04127b23f9 Merge pull request #323 from AyuntamientoMadrid/filter-dry-282 
Dries filters code
 2015-09-02 14:24:06 +02:00
Juanjo Bazán
274ddb2589 changes rules for allowing debate votes 
first 100 votes are allowed for unverified users
 2015-09-02 13:40:38 +02:00
kikito
83d08b0017 Implements the HasFilters controller concern 2015-09-02 13:21:05 +02:00
Alberto Garcia Cabeza
c06491db57 Changes test for verification process 2015-09-02 12:51:32 +02:00
Juanjo Bazán
c6c32a0795 adds translation for admin settings' keys names 2015-09-01 20:00:41 +02:00
Juanjo Bazán
f02f1a9888 adds extra expect in spec to avoid loadtime errors 2015-09-01 17:54:09 +02:00
Juanjo Bazán
872a23443b updates anonymous counter in debate when voted 
refactors to move all related code to Debate model
 2015-09-01 17:49:02 +02:00
Juanjo Bazán
9e7722e7ef adds verification specs for user 
includes #unverified? method
 2015-09-01 17:49:02 +02:00
Juanjo Bazán
bbf96259fc adds controller check for anonymous votes 2015-09-01 17:49:02 +02:00
Juanjo Bazán
3a15895617 loads seeds for testing 2015-09-01 17:49:01 +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
Juanjo Bazán
916f0bf901 adds spec for Setting 2015-09-01 17:49:01 +02:00
Raimond Garcia
3c665153d4 Merge pull request #300 from AyuntamientoMadrid/flag-helper 
Flag helper
 2015-09-01 15:19:16 +02:00
kikito
d0c7c7fe79 Adds User.comment_flags 2015-09-01 13:09:35 +02:00
kikito
c2faf0ef92 Merge Vote.in with Vote.for_debates 2015-09-01 13:08:32 +02:00
Juanjo Bazán
8037248b73 marks social network login specs as pending 
temporary, for the beta testing phase
 2015-09-01 12:56:15 +02:00
kikito
6902d2851b Takes already-flagged-content out of Ability's concerns 2015-09-01 10:33:11 +02:00
Juanjo Bazán
5def8ba1e8 Merge pull request #296 from AyuntamientoMadrid/styling_pages 
Styling pages
 2015-08-31 22:01:36 +02:00
Alberto Garcia Cabeza
b0f7d74c47 Changes site language test, comment unused keys 2015-08-31 21:55:23 +02:00
Juanjo Bazán
a00abc0020 adds touch to debates on tag destroy 2015-08-31 20:26:30 +02:00
kikito
27ece220f6 Transform Flag.flag! & unflag! into non-raising methods 
They now return false and do nothing instead
 2015-08-31 19:02:50 +02:00
Juanjo Bazán
3217d262b4 Merge pull request #292 from AyuntamientoMadrid/mask_user_data 
Mask user data
 2015-08-30 15:22:25 +02:00
rgarcia
932612a207 adds specs for masked emails and phones 2015-08-30 15:15:13 +02:00
rgarcia
01aa0a5a40 refactors specs 2015-08-30 12:51:34 +02:00
rgarcia
0f145da18b adds specs 2015-08-30 12:51:26 +02:00
Raimond Garcia
a9dedbd2b6 Merge pull request #290 from AyuntamientoMadrid/pages 
adds pages controller for static pages
 2015-08-29 20:07:33 +02:00
Juanjo Bazán
62f170b402 Merge pull request #289 from jjballano/225-reorder-tags 
#225 : Tag cloud ordered by count and name
 2015-08-29 19:47:19 +02:00
Juanjo Bazán
84feeba085 adds pages controller for static pages 2015-08-29 19:32:08 +02:00
jjballano
a67c0abcec #225 : Tag cloud ordered by count and name 2015-08-29 18:16:02 +01:00
rgarcia
062445339e removes spec focus 2015-08-29 17:08:20 +02:00
Juanjo Bazán
43b333b844 admins can search officials by name or email 2015-08-29 17:02:21 +02:00
Raimond Garcia
c64bb88e12 Merge pull request #287 from AyuntamientoMadrid/admin-improvements 
Admin improvements
 2015-08-29 16:59:53 +02:00
Juanjo Bazán
0f1329fa85 implements organizations search for admins 2015-08-29 16:30:32 +02:00
Juanjo Bazán
59c2fdb596 adds search method to Organization 2015-08-29 16:29:55 +02:00
rgarcia
bf0234ff44 adds specs for beta testers 2015-08-29 15:54:17 +02:00
Juanjo Bazán
29f4976a07 fix specs 2015-08-29 14:17:41 +02:00
Juanjo Bazán
e8463d1372 moves Residence model to Verification namespace 2015-08-29 12:38:07 +02:00
Juanjo Bazán
e6fd62189b moves Sms model to Verification namespace 2015-08-29 12:17:27 +02:00
Juanjo Bazán
50dcbcdf9b moves Letter to Verification namespace 2015-08-29 12:07:43 +02:00
Juanjo Bazán
1353a1c64b Merge pull request #274 from AyuntamientoMadrid/refactor-selects 
Refactor selects
 2015-08-29 11:36:38 +02:00
Juanjo Bazán
7fdc8e6615 adds more precise verification to specs 2015-08-29 11:30:11 +02:00
Jose Manuel
ef1f89ab84 Merge branch 'refactored_moderator' into master 2015-08-29 02:15:26 +01:00
kikito
ae98ba3572 merges master and fixes conflicts 2015-08-28 19:57:28 +02:00
Raimond Garcia
7847610c19 Merge pull request #281 from AyuntamientoMadrid/hidden_comments 
Estilo y ocultación de comentarios
 2015-08-28 19:26:44 +02:00
kikito
b872d9a46d fixes failing specs 2015-08-28 19:19:18 +02:00
Raimond Garcia
b1117dd1af Merge pull request #275 from mlovic/filter-topic 
Allow debates to be filtered by topic
 2015-08-28 17:41:38 +02:00
Marko Lovic
c11b611b1a Combine debates topic and order filters 2015-08-28 17:23:36 +02:00
kikito
934512ad7a made the locale switcher use less js, more ruby & html 2015-08-28 17:02:06 +02:00
Enrique García
9664dbb975 Merge pull request #272 from AyuntamientoMadrid/fix-replies 
adds comments labels per comment
 2015-08-28 15:46:08 +02:00
kikito
ffad7fbc86 Rename UserApi to CensusApi. Fixes #271 2015-08-28 15:38:22 +02:00