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

20144 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alberto Garcia Cabeza
8559833cc0 Changes texts for emails 2015-09-03 14:11:25 +02:00
Alberto Garcia Cabeza
4631b39d25 Updates custom icons fonts 2015-09-03 14:10:01 +02:00
Enrique García
86783db3c3 Merge pull request #344 from AyuntamientoMadrid/fixes_specs 
fixes specs for exact link texts
 2015-09-03 14:04:04 +02:00
rgarcia
28fd82c06e fixes specs for exact link texts 2015-09-03 13:17:26 +02:00
rgarcia
efecc697db adds second server for production 2015-09-03 12:45:02 +02:00
Raimond Garcia
f640a74e0a Merge pull request #327 from AyuntamientoMadrid/exact-capybara 
Exact capybara
 2015-09-03 12:39:23 +02:00
Enrique García
aa22c82a5c Merge pull request #331 from AyuntamientoMadrid/letter_verification 
Letter verification
 2015-09-03 12:38:08 +02:00
Juanjo Bazán
1d180e3545 Merge pull request #340 from AyuntamientoMadrid/tag-cloud-338 
Fixes tag cloud
 2015-09-03 12:10:11 +02:00
kikito
e2b405083c merges master and fixes conflicts 2015-09-03 12:02:16 +02:00
kikito
b23bd2c94d Fixes tag cloud 
* Makes order work
* Limits it to the first 20 in Debates#index
Fixes #338
 2015-09-03 11:50:58 +02:00
Juanjo Bazán
572432f2cf Merge pull request #339 from AyuntamientoMadrid/remove-tag-filter-337 
Remove tag filter
 2015-09-03 11:50:53 +02:00
kikito
3f98ab74b0 Makes tag checking more efficient in Debates#index 
1) Only loads the tags if params[:tag] is present
2) Only checks for existence of the tag, instead of loading them all
and getting their names
 2015-09-03 11:18:39 +02:00
kikito
e0f8f8d8de Removes Debate.search & uses Debate.tagged_by when appropriate 
Using `params` was wrong here because if given an inexistent tag,
@tag_filter was nil but the debates were still filtered by it (so the
listing and what the page title said were different)
 2015-09-03 11:17:21 +02:00
kikito
002d86884b Removes the tag selector from debate#index view & refactors i18n 2015-09-03 11:15:05 +02:00
Enrique García
1c9cfb5a48 Merge pull request #333 from AyuntamientoMadrid/favicon 
adds favicon to other layouts
 2015-09-03 10:18:19 +02:00
Juanjo Bazán
27ed66ea71 Merge pull request #336 from AyuntamientoMadrid/cleanup 
Cleanup
 2015-09-03 09:35:04 +02:00
rgarcia
10127f546e upgrade before_filter to new syntax 2015-09-03 01:40:24 +02:00
rgarcia
4897d5df4e makes spaces consistent 2015-09-03 01:29:46 +02:00
rgarcia
29ae0c68f8 removes unnecessary comments 2015-09-03 01:29:13 +02:00
rgarcia
ae0ad77197 reorders before_actions 2015-09-03 01:28:46 +02:00
Raimond Garcia
276df52c69 Merge pull request #335 from AyuntamientoMadrid/improve_texts 
Improve texts
 2015-09-03 00:27:36 +02:00
Alberto Garcia Cabeza
3f53f61b1d Fixes conflicts 2015-09-03 00:12:59 +02:00
Alberto Garcia Cabeza
fca3a4de37 Changes tests for new texts 2015-09-03 00:10:07 +02:00
Alberto Garcia Cabeza
3172223930 Updates header and footer 2015-09-02 23:43:32 +02:00
Alberto Garcia Cabeza
7fefcb692e Changes and updates texts 2015-09-02 23:43:08 +02:00
Alberto Garcia Cabeza
a8cbc60b02 Adds new pages, includes new texts 2015-09-02 23:42:06 +02:00
rgarcia
137ca75055 adds favicon to other layouts 2015-09-02 22:34:16 +02:00
rgarcia
b8e35ac95f cleans up 2015-09-02 22:06:50 +02:00
rgarcia
4cb7a698fe fixes spec 2015-09-02 22:01:07 +02:00
rgarcia
4d97063887 removes unused spec 2015-09-02 21:59:51 +02:00
rgarcia
99d779bcec adds letter code verification 2015-09-02 21:57:03 +02:00
rgarcia
280028cfa4 adds missing translation for incorrect phone 2015-09-02 21:45:53 +02:00
Juanjo Bazán
73f0b4b74e adds migration to remove AaCwT columns 
it migrates existing comments to ancestry
 2015-09-02 19:24:57 +02:00
Juanjo Bazán
dee2d0196b ancestries 
moves to ancestry from acts_as_commentable_with_threading
 2015-09-02 19:23:09 +02:00
Juanjo Bazán
3eae5dff1f adds ancestry 2015-09-02 19:21:15 +02:00
Raimond Garcia
faf1b32cf5 Merge pull request #329 from AyuntamientoMadrid/verification 
Verification
 2015-09-02 18:58:25 +02:00
kikito
e3cbae4f02 Makes capybara exact. Should fix some randomly-failing specs 2015-09-02 18:05:43 +02:00
Raimond Garcia
36d8bd778b Merge pull request #325 from AyuntamientoMadrid/admin-in-seed 
creates admin user in db/seeds
 2015-09-02 17:36:29 +02:00
kikito
47b66f3f37 creates admin user in db/seeds 2015-09-02 17:25:12 +02:00
Juanjo Bazán
e0c67d8404 adds ancestry column to comments 2015-09-02 17:24:24 +02:00
Juanjo Bazán
eb689d7c7e refactors comment form 2015-09-02 17:22:21 +02:00
Juanjo Bazán
df5ef2dc29 makes helper independent of commentable class 2015-09-02 17:06:11 +02:00
kikito
c7b44485b3 modifies example so that the dev database can be used to generate the assets of staging, preproduction and production 2015-09-02 16:52:29 +02:00
Juanjo Bazán
04127b23f9 Merge pull request #323 from AyuntamientoMadrid/filter-dry-282 
Dries filters code
 2015-09-02 14:24:06 +02:00
kikito
c3b1fa7434 fixes failing i18n specs 2015-09-02 14:15:14 +02:00
Raimond Garcia
dac1a9726b Merge pull request #322 from AyuntamientoMadrid/one-hundred-free-votes 
changes rules for allowing debate votes
 2015-09-02 13:46:44 +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
79febe7bb8 Adds shared/filter_subnav partial to DRY filters 2015-09-02 13:39:27 +02:00
kikito
ebacc8c9c7 Uses has_filters in all controllers with filters & renames @filter to @current_filter 2015-09-02 13:21:46 +02:00
kikito
83d08b0017 Implements the HasFilters controller concern 2015-09-02 13:21:05 +02:00