consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,144 Commits 1 Branch 0 Tags
a6d470ded657ff18d11d25b901b63facbfae6eb1
Commit Graph

9884 Commits

Author SHA1 Message Date
rgarcia
7775da6f8d fixes cache error when no user signed in 2015-09-05 22:02:51 +02:00
rgarcia
e751c53a5d converts necessary variables to instance variables 2015-09-05 22:02:51 +02:00
rgarcia
0e1678467d adds admins and moderators to cache keys 2015-09-05 22:02:51 +02:00
rgarcia
5200d76be6 caches comments 2015-09-05 22:02:51 +02:00
rgarcia
93378eea98 caches debates show 2015-09-05 22:02:50 +02:00
Raimond Garcia
17ebb07daf Merge pull request #367 from AyuntamientoMadrid/blog 
adds nicer blog url
 2015-09-05 20:26:22 +02:00
Juanjo Bazán
5d5de36ad1 adds spec for info pages 2015-09-05 20:16:20 +02:00
Juanjo Bazán
ae872b88ac updates blog link 2015-09-05 20:15:31 +02:00
rgarcia
2bc1b5f1a5 adds nicer blog url 2015-09-05 19:57:33 +02:00
Juanjo Bazán
b020795d3d adds search to debates index 2015-09-05 15:20:46 +02:00
Juanjo Bazán
771f44c22b adds self.search to Debate 2015-09-05 15:05:56 +02:00
Alberto Garcia Cabeza
54eeff41b7 Adds search form to sidebar 2015-09-05 14:01:59 +02:00
Juanjo Bazán
1b51738be6 updates blog link 2015-09-05 12:29:05 +02:00
rgarcia
c7129a9218 initialize dropdown after turbolink request 2015-09-05 01:18:09 +02:00
Raimond Garcia
7ff855dac4 Merge pull request #362 from AyuntamientoMadrid/pending-filter 
Changes default filter to 'pending' in /admin & /moderation
 2015-09-05 00:52:30 +02:00
Raimond Garcia
b55c08879d Merge pull request #363 from AyuntamientoMadrid/god-kills-a-cat 
validates uniqueness of username 😭
 2015-09-05 00:52:06 +02:00
Raimond Garcia
8c678c88e8 Merge pull request #364 from AyuntamientoMadrid/error_pages 
Error pages
 2015-09-05 00:49:53 +02:00
Alberto Garcia Cabeza
83b44fd53a Improves layout, adds link to checkbox's label 2015-09-05 00:34:18 +02:00
Alberto Garcia Cabeza
22f579f376 Improves styles for auth pages mobile version 2015-09-05 00:31:19 +02:00
Juanjo Bazán
0a33a64c93 typo 2015-09-04 23:22:16 +02:00
Juanjo Bazán
3a7a8f13f5 validates uniqueness of username 😭 2015-09-04 23:15:41 +02:00
Juanjo Bazán
63378ba24c makes 'pending' filter the default in /admin/orgs 2015-09-04 22:39:07 +02:00
Juanjo Bazán
4ef2ed753d makes 'pending' filter the default in /moderation 2015-09-04 22:39:07 +02:00
Raimond Garcia
149984c263 Merge pull request #359 from AyuntamientoMadrid/fixes-comment-flags 
fixes issue with flags on comments with children
 2015-09-04 22:24:48 +02:00
Alberto Garcia Cabeza
128a2bc956 Updates some texts 2015-09-04 20:42:02 +02:00
Juanjo Bazán
ea85059dbb fixes issue with flags on comments with children 
Closes #318
 2015-09-04 19:35:48 +02:00
kikito
55c48e3719 Fixes randomly-failing travis specs 
The problem was that after changing page with the selects, capybara
needs to “find something which has changed on the page” in order to
“wait”. The “have_selects” did not wait because they did not change
(you change them, then the page changes, and they stay the same)
 2015-09-04 17:44:32 +02:00
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
Raimond Garcia
a92de7c0d3 Merge pull request #354 from AyuntamientoMadrid/improve_design 
Improve design
 2015-09-04 15:27:35 +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
08c31c5985 calls all the sorting scopes the same way 2015-09-04 14:17:59 +02:00
kikito
b6699932d1 uses the hot_score in the welcome screen 2015-09-04 14:16:05 +02:00
kikito
9bb63e9b32 Makes comments increase the hot_score 2015-09-04 14:04:45 +02:00
kikito
83ebbb14b1 Refactors hot_score calculations 2015-09-04 13:59:30 +02:00
Juanjo Bazán
f9067fe201 Fixes CKeditor & Turbolinks issue 
Closes #330
 2015-09-04 13:16:25 +02:00
kikito
fba4f1fade Adds initial hot score implementation for debates 2015-09-04 12:34:17 +02:00
Juanjo Bazán
53bf3ac14f Merge pull request #349 from dbillionlabs/better_asset 
Smaller, better, no reason for the image being so big
 2015-09-04 12:30:44 +02:00
kikito
9f970568ac Displays debate.created_at in debates#index 2015-09-04 12:16:11 +02:00
kikito
3012f2ffcd Removes reorder in debate (no default order) 2015-09-04 11:54:19 +02:00
kikito
134f38a38f Removes debates default order 2015-09-04 11:51:21 +02:00
kikito
19e6740ee4 Refactors has_filters.rb 2015-09-04 11:50:29 +02:00
kikito
7c3ca55de1 Adds the default score selector/controller. Refactors debates specs 2015-09-04 11:50:07 +02:00
Raimond Garcia
1c3654d2af Merge pull request #350 from AyuntamientoMadrid/locales 
Removes language switcher if only one locale
 2015-09-04 00:43:18 +02:00
Juanjo Bazán
5af7bc1aee removes language switcher if only one locale 2015-09-03 23:47:55 +02:00