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

766 Commits

Author SHA1 Message Date
Alberto Garcia Cabeza
2aac7b413c Improves styles for index, header and footer 2015-09-07 00:17:21 +02:00
Alberto Garcia Cabeza
eedd919424 Improves styles and texts for devise pages 2015-09-07 00:16:54 +02:00
Alberto Garcia Cabeza
a7e593c039 Updates texts 2015-09-07 00:15:39 +02:00
Juanjo Bazán
26a2a67a71 refactors debate's tags related utility methods 
tags are already loaded, using them instead of extracting them again for each debate saves 50 query per index (2 query per debate in the page)
 2015-09-06 22:51:34 +02:00
Raimond Garcia
d27500b832 Merge pull request #384 from AyuntamientoMadrid/pending-filter-in-admin 
Pending filters in admin
 2015-09-06 22:38:17 +02:00
Juanjo Bazán
bf18da3faa adds cache for authors of debate/comment 2015-09-06 22:03:31 +02:00
Juanjo Bazán
9104242eed adds pending filter to admin/users 2015-09-06 21:58:34 +02:00
Juanjo Bazán
e618c12344 removes weird char 2015-09-06 21:55:33 +02:00
Juanjo Bazán
bc90812d37 adds pending filter to admin/comments 2015-09-06 21:45:41 +02:00
Juanjo Bazán
1a7806150a adds pending filter to admin/debates 2015-09-06 21:42:22 +02:00
Juanjo Bazán
ca8c445404 removes close button from alert for no-logged user 2015-09-06 20:40:11 +02:00
Juanjo Bazán
8c7d47a922 typo 2015-09-06 20:39:35 +02:00
Álvaro Durán Tovar
7fd7f2cc81 fix indentation on shared/errors 2015-09-06 19:55:37 +02:00
Álvaro Durán Tovar
92ae988251 adds close button to alert boxes, also adds 
data-alert attribute to enable javascript
on them
 2015-09-06 19:54:12 +02:00
Raimond Garcia
e560bdfc90 Merge pull request #377 from AyuntamientoMadrid/caching_debates 
updates comment form cache
 2015-09-06 14:23:24 +02:00
rgarcia
d8f8dc826b updates comment form cache 2015-09-06 14:22:46 +02:00
Juanjo Bazán
31b00c32f4 removes unneeded to_a 2015-09-06 12:25:47 +02:00
Juanjo Bazán
60089b8986 uses author info in comment/debate cache 
author is already preloaded and we avoid expensive touching methods
 2015-09-06 12:13:39 +02:00
Juanjo Bazán
5b3f9e5642 uses preloaded info 2015-09-06 12:07:58 +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
ae872b88ac updates blog link 2015-09-05 20:15:31 +02:00
Juanjo Bazán
b020795d3d adds search to debates index 2015-09-05 15:20:46 +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
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
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
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
9f970568ac Displays debate.created_at in debates#index 2015-09-04 12:16:11 +02:00
Juanjo Bazán
5af7bc1aee removes language switcher if only one locale 2015-09-03 23:47:55 +02:00
Enrique García
858adf891f Merge pull request #346 from AyuntamientoMadrid/ancestry 
Ancestry
 2015-09-03 17:19:08 +02:00
Juanjo Bazán
dfc1ccb108 renames helper method 2015-09-03 17:13:19 +02:00
Juanjo Bazán
05a647f9e7 Merge pull request #345 from AyuntamientoMadrid/improve_styles 
Improve styles
 2015-09-03 16:43:10 +02:00
Juanjo Bazán
358028c3e6 Fixes conflicts. Merge branch 'master' into ancestry 2015-09-03 16:37:28 +02:00
Juanjo Bazán
136c1e73ed uses ancestry to retrieve debate comments 2015-09-03 16:32:54 +02:00
Alberto Garcia Cabeza
f20192d9d7 Improves styles for debates 2015-09-03 14:15:45 +02:00
Alberto Garcia Cabeza
3255995ea1 Adds new styles for pages 2015-09-03 14:15:01 +02:00