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

1580 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juanjo Bazán
1b51738be6 updates blog link 2015-09-05 12:29:05 +02:00
Juanjo Bazán
0ab53fbea3 Merge pull request #365 from AyuntamientoMadrid/flags_for_turbolinks 
Flags for turbolinks
 2015-09-05 10:02:18 +02:00
rgarcia
37a5e76b7b adds flagging with turbolinks spec 2015-09-05 01:29:14 +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
Alberto Garcia Cabeza
d1b84b7398 Adds 404 and 500 error pages 2015-09-05 00:30:11 +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
ded656837e Merge pull request #358 from AyuntamientoMadrid/deploy-stable-to-prod 
changes branch for production deployments
 2015-09-04 22:25:43 +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
Juanjo Bazán
00c849b53b Merge pull request #361 from AyuntamientoMadrid/update_text 
Updates some texts
 2015-09-04 21:12:57 +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
Juanjo Bazán
a8f7611b01 changes branch for production deployments 2015-09-04 18:56:40 +02:00
Enrique García
c4b4578f51 Merge pull request #356 from AyuntamientoMadrid/fix-debates-spec 
Fixes randomly-failing travis specs
 2015-09-04 17:52:25 +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
8e451dbf66 adds even more expects to random debate order spec to fix travis 2015-09-04 16:22:07 +02:00
kikito
457b734ca4 adds within clauses to debates specs. This should wait for page refreshes if needed 2015-09-04 15:55:30 +02:00
kikito
b9453a83bb remove failing line (undefined var) 2015-09-04 15:41:12 +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
Juanjo Bazán
44bab6f4b4 adds expect to wait for to capybara 2015-09-04 15:15:20 +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
b6e6356172 fixes hot_score spec 2015-09-04 15:00:18 +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
Raimond Garcia
be420db68d Merge pull request #352 from AyuntamientoMadrid/turbolink-ckeditor 
Fixes CKeditor & Turbolinks issue
 2015-09-04 14:11:34 +02:00
kikito
50a8d4c854 adds task for updating the hot_score in debates 2015-09-04 14:11:01 +02:00
Juanjo Bazán
742eed1925 adds check for CKEditor presence 2015-09-04 14:04:46 +02:00
kikito
9bb63e9b32 Makes comments increase the hot_score 2015-09-04 14:04:45 +02:00
kikito
2975c6a38d Makes votes increase/decrease hot score 
Debates already call update_attibutes in debates (to update cached
counters), so there is no need to do an “after_voted”: the comment’s
before_save call takes care of it.
 2015-09-04 14:04:18 +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
920ba48947 Add random created_at on seeds 2015-09-04 12:45:10 +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