shapado:piglops-shapado.git
6 years agoAllow see posts history to unlogged users
Jorge H. Cuadrado [Tue, 30 Aug 2011 14:56:12 +0000 (09:56 -0500)]
Allow see posts history to unlogged users

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoFix caching widgets
Jorge H. Cuadrado [Tue, 30 Aug 2011 02:54:24 +0000 (21:54 -0500)]
Fix caching widgets

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoAdd missing file
Jorge H. Cuadrado [Tue, 30 Aug 2011 02:26:45 +0000 (21:26 -0500)]
Add missing file

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoRestore filters for followed, by me, preferred, contributed, and collaborate
Jorge H. Cuadrado [Tue, 30 Aug 2011 02:00:48 +0000 (21:00 -0500)]
Restore filters for followed, by me, preferred, contributed, and collaborate

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoFix notify follows by email
Jorge H. Cuadrado [Mon, 29 Aug 2011 22:49:14 +0000 (17:49 -0500)]
Fix notify follows by email

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoMerge remote-tracking branch 'origin/fixes-kuadrosx'
David A. Cuadrado [Fri, 26 Aug 2011 23:35:13 +0000 (18:35 -0500)]
Merge remote-tracking branch 'origin/fixes-kuadrosx'

Conflicts:
app/controllers/users_controller.rb

6 years agoMerge remote-tracking branch 'origin/fixes-patcito'
David A. Cuadrado [Fri, 26 Aug 2011 23:34:01 +0000 (18:34 -0500)]
Merge remote-tracking branch 'origin/fixes-patcito'

6 years agofind user by id or login instead of just login
Patrick Aljord [Fri, 26 Aug 2011 23:28:27 +0000 (18:28 -0500)]
find user by id or login instead of just login

6 years agohide moderate menu on Questions#index
Patrick Aljord [Fri, 26 Aug 2011 23:17:42 +0000 (18:17 -0500)]
hide moderate menu on Questions#index

6 years agoraise 404 error in User#feed when the user is not found
Jorge H. Cuadrado [Fri, 26 Aug 2011 23:02:57 +0000 (18:02 -0500)]
raise 404 error in User#feed when the user is not found

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoFix rendring destroy activities
Jorge H. Cuadrado [Fri, 26 Aug 2011 22:29:16 +0000 (17:29 -0500)]
Fix rendring destroy activities

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoFix hiding annuncements without js
Jorge H. Cuadrado [Fri, 26 Aug 2011 16:25:53 +0000 (11:25 -0500)]
Fix hiding annuncements without js

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoFix show answer for mobile ui
Jorge H. Cuadrado [Fri, 26 Aug 2011 16:16:56 +0000 (11:16 -0500)]
Fix show answer for mobile ui

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agofix domain in give advice notifier
Patrick Aljord [Fri, 26 Aug 2011 04:47:51 +0000 (23:47 -0500)]
fix domain in give advice notifier

6 years agoMerge remote-tracking branch 'origin/fixes-patcito'
David A. Cuadrado [Thu, 25 Aug 2011 23:14:28 +0000 (18:14 -0500)]
Merge remote-tracking branch 'origin/fixes-patcito'

6 years agoMerge remote-tracking branch 'origin/fixes-kuadrosx'
David A. Cuadrado [Thu, 25 Aug 2011 23:14:25 +0000 (18:14 -0500)]
Merge remote-tracking branch 'origin/fixes-kuadrosx'

6 years agofix
Jorge H. Cuadrado [Thu, 25 Aug 2011 23:13:24 +0000 (18:13 -0500)]
fix

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agomake follow question require login
Patrick Aljord [Thu, 25 Aug 2011 23:04:42 +0000 (18:04 -0500)]
make follow question require login

6 years agoRequire login for follow and unfollow questions
Jorge H. Cuadrado [Thu, 25 Aug 2011 23:01:48 +0000 (18:01 -0500)]
Require login for follow and unfollow questions

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoMerge remote-tracking branch 'origin/fixes-kuadrosx'
David A. Cuadrado [Thu, 25 Aug 2011 22:40:13 +0000 (17:40 -0500)]
Merge remote-tracking branch 'origin/fixes-kuadrosx'

6 years agoFix Jobs::Mailer.on_ask_question and move incrementing answers_count out of magent
Jorge H. Cuadrado [Thu, 25 Aug 2011 22:38:34 +0000 (17:38 -0500)]
Fix Jobs::Mailer.on_ask_question and move incrementing answers_count out of magent

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agofix i18n for twitter jobs
Patrick Aljord [Wed, 24 Aug 2011 21:43:32 +0000 (16:43 -0500)]
fix i18n for twitter jobs

6 years agouse googl instead of bit.ly
Patrick Aljord [Wed, 24 Aug 2011 21:43:13 +0000 (16:43 -0500)]
use googl instead of bit.ly

6 years agoFix small glitch with text placement in admin tabs
Jorge H. Cuadrado [Wed, 24 Aug 2011 14:34:13 +0000 (09:34 -0500)]
Fix small glitch with text placement in admin tabs

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoMerge remote-tracking branch 'origin/master' into fixes-kuadrosx
Jorge H. Cuadrado [Wed, 24 Aug 2011 14:00:02 +0000 (09:00 -0500)]
Merge remote-tracking branch 'origin/master' into fixes-kuadrosx

6 years agoincrement line-height to question description text
Jorge H. Cuadrado [Wed, 24 Aug 2011 01:23:48 +0000 (20:23 -0500)]
increment line-height to question description text

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoFix image size for top user widget
Jorge H. Cuadrado [Wed, 24 Aug 2011 00:54:11 +0000 (19:54 -0500)]
Fix image size for top user widget

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoMerge remote-tracking branch 'origin/fixes-patcito'
David A. Cuadrado [Wed, 24 Aug 2011 00:31:12 +0000 (19:31 -0500)]
Merge remote-tracking branch 'origin/fixes-patcito'

6 years agofix comment url in notifier
Patrick Aljord [Wed, 24 Aug 2011 00:29:08 +0000 (19:29 -0500)]
fix comment url in notifier

6 years agoMerge remote-tracking branch 'origin/fixes-patcito'
David A. Cuadrado [Wed, 24 Aug 2011 00:19:37 +0000 (19:19 -0500)]
Merge remote-tracking branch 'origin/fixes-patcito'

6 years agofix link to group in notifier
Patrick Aljord [Wed, 24 Aug 2011 00:08:19 +0000 (19:08 -0500)]
fix link to group in notifier

6 years agoMerge remote-tracking branch 'origin/fixes-kuadrosx'
David A. Cuadrado [Tue, 23 Aug 2011 22:56:16 +0000 (17:56 -0500)]
Merge remote-tracking branch 'origin/fixes-kuadrosx'

6 years agoFix hide announcements
Jorge H. Cuadrado [Tue, 23 Aug 2011 22:42:44 +0000 (17:42 -0500)]
Fix hide announcements

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoi18n fix
Patrick Aljord [Tue, 23 Aug 2011 19:43:03 +0000 (14:43 -0500)]
i18n fix

6 years agoMerge remote-tracking branch 'origin/fixes-kuadrosx'
David A. Cuadrado [Tue, 23 Aug 2011 17:18:52 +0000 (12:18 -0500)]
Merge remote-tracking branch 'origin/fixes-kuadrosx'

6 years agoShow message error for announcement when creating an announcement fails
Jorge H. Cuadrado [Tue, 23 Aug 2011 17:16:43 +0000 (12:16 -0500)]
Show message error for announcement when creating an announcement fails

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoMerge remote branch 'upstream/master' into ui
dgfrancisco [Tue, 23 Aug 2011 03:06:36 +0000 (22:06 -0500)]
Merge remote branch 'upstream/master' into ui

6 years agoMerge remote-tracking branch 'ui/ui'
David A. Cuadrado [Tue, 23 Aug 2011 02:37:22 +0000 (21:37 -0500)]
Merge remote-tracking branch 'ui/ui'

6 years agoFix Editor.setup
Jorge H. Cuadrado [Tue, 23 Aug 2011 02:06:39 +0000 (21:06 -0500)]
Fix Editor.setup

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoMerge remote branch 'upstream/fixes-kuadrosx' into ui
dgfrancisco [Tue, 23 Aug 2011 01:25:00 +0000 (20:25 -0500)]
Merge remote branch 'upstream/fixes-kuadrosx' into ui

6 years agoMerge remote branch 'upstream/master' into ui
dgfrancisco [Tue, 23 Aug 2011 01:24:48 +0000 (20:24 -0500)]
Merge remote branch 'upstream/master' into ui

6 years agoAdding fixes for show question
dgfrancisco [Tue, 23 Aug 2011 01:24:28 +0000 (20:24 -0500)]
Adding fixes for show question

Signed-off-by: dgfrancisco <dgfranciscorodriguez@gmail.com>
6 years agoFix group's form
Jorge H. Cuadrado [Tue, 23 Aug 2011 01:12:49 +0000 (20:12 -0500)]
Fix group's form

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoMerge remote-tracking branch 'origin/master' into fixes-kuadrosx
Jorge H. Cuadrado [Tue, 23 Aug 2011 01:11:52 +0000 (20:11 -0500)]
Merge remote-tracking branch 'origin/master' into fixes-kuadrosx

6 years agoAdd missing files
Jorge H. Cuadrado [Mon, 22 Aug 2011 23:13:12 +0000 (18:13 -0500)]
Add missing files

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoMerge remote-tracking branch 'origin/fixes-kuadrosx'
David A. Cuadrado [Mon, 22 Aug 2011 23:06:32 +0000 (18:06 -0500)]
Merge remote-tracking branch 'origin/fixes-kuadrosx'

6 years agoMerge remote-tracking branch 'origin/fixes-patcito'
David A. Cuadrado [Mon, 22 Aug 2011 23:06:29 +0000 (18:06 -0500)]
Merge remote-tracking branch 'origin/fixes-patcito'

6 years agoUse class instead of id to mark an textarea as editor and show the editor to edit...
Jorge H. Cuadrado [Mon, 22 Aug 2011 22:57:26 +0000 (17:57 -0500)]
Use class instead of id to mark an textarea as editor and show the editor to edit an answer

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agomake sure to update group when notifications options are changed
Patrick Aljord [Mon, 22 Aug 2011 22:53:35 +0000 (17:53 -0500)]
make sure to update group when notifications options are changed

6 years agoMerge remote-tracking branch 'origin/fixes-kuadrosx'
David A. Cuadrado [Mon, 22 Aug 2011 21:58:40 +0000 (16:58 -0500)]
Merge remote-tracking branch 'origin/fixes-kuadrosx'

6 years agoadded rel=nofollow
Patrick Aljord [Mon, 22 Aug 2011 21:55:31 +0000 (16:55 -0500)]
added rel=nofollow

6 years agoMerge remote branch 'upstream/fixes-kuadrosx' into ui
dgfrancisco [Mon, 22 Aug 2011 21:41:54 +0000 (16:41 -0500)]
Merge remote branch 'upstream/fixes-kuadrosx' into ui

6 years agoShow the others answers when and answer was marked as solution
Jorge H. Cuadrado [Mon, 22 Aug 2011 21:36:44 +0000 (16:36 -0500)]
Show the others answers when and answer was marked as solution

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoImprove a bit the show question's style
Jorge H. Cuadrado [Mon, 22 Aug 2011 21:15:15 +0000 (16:15 -0500)]
Improve a bit the show question's style

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoMerge remote branch 'upstream/master' into ui
dgfrancisco [Mon, 22 Aug 2011 20:57:30 +0000 (15:57 -0500)]
Merge remote branch 'upstream/master' into ui

6 years agoQuick fix for user profile view for mobiles
Jorge H. Cuadrado [Mon, 22 Aug 2011 20:38:12 +0000 (15:38 -0500)]
Quick fix for user profile view for mobiles

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoFix show theme
Jorge H. Cuadrado [Mon, 22 Aug 2011 20:14:04 +0000 (15:14 -0500)]
Fix show theme

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agomore i18n updates
Patrick Aljord [Sun, 21 Aug 2011 23:59:19 +0000 (18:59 -0500)]
more i18n updates

6 years agoi18n update for searches
Patrick Aljord [Sun, 21 Aug 2011 22:20:02 +0000 (17:20 -0500)]
i18n update for searches

6 years agoupdate mongoid_ext to support kaminari paginator
David A. Cuadrado [Sun, 21 Aug 2011 21:32:20 +0000 (16:32 -0500)]
update mongoid_ext to support kaminari paginator

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoMerge remote-tracking branch 'origin/fixes-patcito'
David A. Cuadrado [Sun, 21 Aug 2011 20:48:19 +0000 (15:48 -0500)]
Merge remote-tracking branch 'origin/fixes-patcito'

6 years agofix not showing link to comment on notifier
Patrick Aljord [Sun, 21 Aug 2011 20:44:19 +0000 (15:44 -0500)]
fix not showing link to comment on notifier

6 years agofix paginator for jquery mobile
David A. Cuadrado [Sun, 21 Aug 2011 19:50:19 +0000 (14:50 -0500)]
fix paginator for jquery mobile

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agogive full path to partial
Patrick Aljord [Sun, 21 Aug 2011 19:25:47 +0000 (14:25 -0500)]
give full path to partial

6 years agofix unicorn version
David A. Cuadrado [Sun, 21 Aug 2011 19:10:20 +0000 (14:10 -0500)]
fix unicorn version

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 21 Aug 2011 11:22:47 +0000 (13:22 +0200)]
Localisation updates from translatewiki.net.

6 years agoMerge remote-tracking branch 'origin/fixes-patcito'
David A. Cuadrado [Sun, 21 Aug 2011 03:33:40 +0000 (22:33 -0500)]
Merge remote-tracking branch 'origin/fixes-patcito'

6 years agocheck if user is logged in
Patrick Aljord [Sun, 21 Aug 2011 02:26:42 +0000 (21:26 -0500)]
check if user is logged in

6 years agofix crash on questions#index
Patrick Aljord [Sun, 21 Aug 2011 02:20:46 +0000 (21:20 -0500)]
fix crash on questions#index

6 years agocheck for geop in shared/
Patrick Aljord [Sat, 20 Aug 2011 05:18:42 +0000 (00:18 -0500)]
check for geop in shared/

6 years agodelete obsolete class
David A. Cuadrado [Sat, 20 Aug 2011 04:57:09 +0000 (23:57 -0500)]
delete obsolete class

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoallow resizing textareas
Patrick Aljord [Sat, 20 Aug 2011 00:57:55 +0000 (19:57 -0500)]
allow resizing textareas

6 years agoMerge remote-tracking branch 'origin/fixes-patcito'
David A. Cuadrado [Fri, 19 Aug 2011 23:49:43 +0000 (18:49 -0500)]
Merge remote-tracking branch 'origin/fixes-patcito'

6 years agogave a min height to column2
Patrick Aljord [Fri, 19 Aug 2011 23:44:11 +0000 (18:44 -0500)]
gave a min height to column2

6 years agoMerge remote-tracking branch 'origin/fixes-patcito'
David A. Cuadrado [Fri, 19 Aug 2011 23:09:06 +0000 (18:09 -0500)]
Merge remote-tracking branch 'origin/fixes-patcito'

6 years agoMerge remote-tracking branch 'origin/fixes-kuadrosx'
David A. Cuadrado [Fri, 19 Aug 2011 23:09:00 +0000 (18:09 -0500)]
Merge remote-tracking branch 'origin/fixes-kuadrosx'

6 years agotiny style fix for invitations
Patrick Aljord [Fri, 19 Aug 2011 23:05:39 +0000 (18:05 -0500)]
tiny style fix for invitations

6 years agoMerge branch 'master' of gitorious.org:shapado/shapado
Patrick Aljord [Fri, 19 Aug 2011 22:15:05 +0000 (17:15 -0500)]
Merge branch 'master' of gitorious.org:shapado/shapado

6 years agoi18n fix
Patrick Aljord [Fri, 19 Aug 2011 22:14:21 +0000 (17:14 -0500)]
i18n fix

6 years agoUpdate rails version, fix some broken specs and remove some warnings
Jorge H. Cuadrado [Fri, 19 Aug 2011 20:01:45 +0000 (15:01 -0500)]
Update rails version, fix some broken specs and remove some warnings

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoMerge remote-tracking branch 'origin/master' into fixes-kuadrosx
Jorge H. Cuadrado [Fri, 19 Aug 2011 19:19:48 +0000 (14:19 -0500)]
Merge remote-tracking branch 'origin/master' into fixes-kuadrosx

6 years agomoderate actions now responds to html format
Jorge H. Cuadrado [Thu, 18 Aug 2011 23:58:38 +0000 (18:58 -0500)]
moderate actions now responds to html format

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoAdd dropdown to moderate questions from Questions#index view
Jorge H. Cuadrado [Thu, 18 Aug 2011 23:19:41 +0000 (18:19 -0500)]
Add dropdown to moderate questions from Questions#index view

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoAdd link to ban answer form Questions#show
Jorge H. Cuadrado [Thu, 18 Aug 2011 20:25:41 +0000 (15:25 -0500)]
Add link to ban answer form Questions#show

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoMerge remote-tracking branch 'origin/fixes-kuadrosx'
David A. Cuadrado [Wed, 17 Aug 2011 23:06:36 +0000 (18:06 -0500)]
Merge remote-tracking branch 'origin/fixes-kuadrosx'

6 years agoAdd missing files
Jorge H. Cuadrado [Wed, 17 Aug 2011 23:05:51 +0000 (18:05 -0500)]
Add missing files

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoMerge remote-tracking branch 'origin/fixes-kuadrosx'
David A. Cuadrado [Wed, 17 Aug 2011 23:04:03 +0000 (18:04 -0500)]
Merge remote-tracking branch 'origin/fixes-kuadrosx'

6 years agoImprove moderating from show question view WIP
Jorge H. Cuadrado [Wed, 17 Aug 2011 23:00:43 +0000 (18:00 -0500)]
Improve moderating from show question view WIP

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoMerge remote-tracking branch 'origin/fixes-patcito'
David A. Cuadrado [Wed, 17 Aug 2011 20:41:34 +0000 (15:41 -0500)]
Merge remote-tracking branch 'origin/fixes-patcito'

6 years agoMerge remote-tracking branch 'origin/fixes-kuadrosx'
David A. Cuadrado [Wed, 17 Aug 2011 20:41:28 +0000 (15:41 -0500)]
Merge remote-tracking branch 'origin/fixes-kuadrosx'

6 years agoip -> IP address
Siebrand Mazeland [Wed, 17 Aug 2011 17:20:32 +0000 (19:20 +0200)]
ip -> IP address

6 years agoi18n fix thanks to Siebrand Mazeland
Patrick Aljord [Wed, 17 Aug 2011 08:57:03 +0000 (03:57 -0500)]
i18n fix thanks to Siebrand Mazeland

6 years agoDon't show edit and destroy link when on Themes#show when the theme is not a group...
Jorge H. Cuadrado [Wed, 17 Aug 2011 03:55:17 +0000 (22:55 -0500)]
Don't show edit and destroy link when on Themes#show when the theme is not a group's theme

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoImprove members ui:
Jorge H. Cuadrado [Wed, 17 Aug 2011 02:19:10 +0000 (21:19 -0500)]
Improve members ui:
-Remove form to add a member
-Add a live search

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoMerge remote-tracking branch 'origin/fixes-kuadrosx'
David A. Cuadrado [Wed, 17 Aug 2011 01:01:56 +0000 (20:01 -0500)]
Merge remote-tracking branch 'origin/fixes-kuadrosx'

6 years agoreplace total_entries with total_count
Jorge H. Cuadrado [Tue, 16 Aug 2011 23:52:50 +0000 (18:52 -0500)]
replace total_entries with total_count

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoMerge remote-tracking branch 'origin/fixes-kuadrosx'
David A. Cuadrado [Tue, 16 Aug 2011 23:38:41 +0000 (18:38 -0500)]
Merge remote-tracking branch 'origin/fixes-kuadrosx'

6 years agoAdd missing file
Jorge H. Cuadrado [Tue, 16 Aug 2011 23:37:36 +0000 (18:37 -0500)]
Add missing file

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoadded extensions to custom assets
Patrick Aljord [Tue, 16 Aug 2011 20:35:39 +0000 (15:35 -0500)]
added extensions to custom assets

6 years agofall back on geoip when user doesn't provide html5 geolocation
Patrick Aljord [Sun, 14 Aug 2011 01:29:28 +0000 (20:29 -0500)]
fall back on geoip when user doesn't provide html5 geolocation
cache queries to mapquest and geoip