shapado:piglops-shapado.git
6 years agoFix creating questions in groups with only one language fix-private-groups
Jorge H. Cuadrado [Mon, 16 May 2011 01:38:40 +0000 (20:38 -0500)]
Fix creating questions in groups with only one language

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoignore public/packages
David A. Cuadrado [Sat, 14 May 2011 03:12:53 +0000 (22:12 -0500)]
ignore public/packages

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoembed assets
David A. Cuadrado [Sat, 14 May 2011 03:12:05 +0000 (22:12 -0500)]
embed assets

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoreplace smart_asset with jammit
David A. Cuadrado [Sat, 14 May 2011 03:11:17 +0000 (22:11 -0500)]
replace smart_asset with jammit

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoMerge remote-tracking branch 'origin/fix-private-groups' into next
David A. Cuadrado [Sat, 14 May 2011 01:51:38 +0000 (20:51 -0500)]
Merge remote-tracking branch 'origin/fix-private-groups' into next

6 years agouse group.languages for question's form
Jorge H. Cuadrado [Sat, 14 May 2011 01:41:38 +0000 (20:41 -0500)]
use group.languages for question's form

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoMerge remote-tracking branch 'origin/fix-social-connect' into next
David A. Cuadrado [Sat, 14 May 2011 01:06:40 +0000 (20:06 -0500)]
Merge remote-tracking branch 'origin/fix-social-connect' into next

6 years agoupdate dep
David A. Cuadrado [Sat, 14 May 2011 01:06:35 +0000 (20:06 -0500)]
update dep

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agouse override instead of push fix-social-connect
Patrick Aljord [Sat, 14 May 2011 01:03:14 +0000 (20:03 -0500)]
use override instead of push

6 years agoupdate deploy script
David A. Cuadrado [Sat, 14 May 2011 01:00:15 +0000 (20:00 -0500)]
update deploy script

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoMerge remote-tracking branch 'origin/popupfix' into next
David A. Cuadrado [Sat, 14 May 2011 00:34:00 +0000 (19:34 -0500)]
Merge remote-tracking branch 'origin/popupfix' into next

6 years agoMerge remote-tracking branch 'origin/fix-social-connect' into next
David A. Cuadrado [Sat, 14 May 2011 00:33:56 +0000 (19:33 -0500)]
Merge remote-tracking branch 'origin/fix-social-connect' into next

6 years agoMerge remote-tracking branch 'origin/fix-private-groups' into next
David A. Cuadrado [Sat, 14 May 2011 00:33:52 +0000 (19:33 -0500)]
Merge remote-tracking branch 'origin/fix-private-groups' into next

6 years agoadd deploy script
David A. Cuadrado [Sat, 14 May 2011 00:33:18 +0000 (19:33 -0500)]
add deploy script

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoFix creating groups and fix loggin in private groups
Jorge H. Cuadrado [Fri, 13 May 2011 23:14:46 +0000 (18:14 -0500)]
Fix creating groups and fix loggin in private groups

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agofix merging facebook accounts, make sure user_info is always merged
Patrick Aljord [Thu, 12 May 2011 07:53:48 +0000 (02:53 -0500)]
fix merging facebook accounts, make sure user_info is always merged

6 years agofix merging social accounts
Patrick Aljord [Thu, 12 May 2011 06:06:07 +0000 (01:06 -0500)]
fix merging social accounts

6 years agoget more info from social friends so it can be used in the social invitations widget
Patrick Aljord [Fri, 22 Apr 2011 08:58:31 +0000 (03:58 -0500)]
get more info from social friends so it can be used in the social invitations widget

6 years agopass popup as param to make sure the cookie is set so that the popup will be closed popupfix
Patrick Aljord [Fri, 13 May 2011 22:34:23 +0000 (17:34 -0500)]
pass popup as param to make sure the cookie is set so that the popup will be closed

6 years agofix path
David A. Cuadrado [Fri, 13 May 2011 17:57:13 +0000 (12:57 -0500)]
fix path

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agomake sure old process is killed
David A. Cuadrado [Fri, 13 May 2011 17:42:36 +0000 (12:42 -0500)]
make sure old process is killed

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoadd a patch to alleviate the recursive locking problem
David A. Cuadrado [Fri, 13 May 2011 08:12:17 +0000 (03:12 -0500)]
add a patch to alleviate the recursive locking problem

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoupdate revision
David A. Cuadrado [Fri, 13 May 2011 08:08:27 +0000 (03:08 -0500)]
update revision

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agodo not duplicate questions on index
David A. Cuadrado [Fri, 13 May 2011 05:49:50 +0000 (00:49 -0500)]
do not duplicate questions on index

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agofix sorting questions
David A. Cuadrado [Fri, 13 May 2011 05:45:27 +0000 (00:45 -0500)]
fix sorting questions

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoupdate gemfile
David A. Cuadrado [Fri, 13 May 2011 00:54:17 +0000 (19:54 -0500)]
update gemfile

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agothis should work much better
David A. Cuadrado [Fri, 13 May 2011 00:24:04 +0000 (19:24 -0500)]
this should work much better

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoa couple of fixes
David A. Cuadrado [Fri, 13 May 2011 00:05:14 +0000 (19:05 -0500)]
a couple of fixes

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agotypo
David A. Cuadrado [Thu, 12 May 2011 23:52:23 +0000 (18:52 -0500)]
typo

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoMerge remote-tracking branch 'origin/invitations-next-fix' into next
David A. Cuadrado [Thu, 12 May 2011 23:50:39 +0000 (18:50 -0500)]
Merge remote-tracking branch 'origin/invitations-next-fix' into next

6 years agomore scheduler fixes
David A. Cuadrado [Thu, 12 May 2011 23:50:16 +0000 (18:50 -0500)]
more scheduler fixes

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agofix 3rd step of accepting invitation, check that user is not a member invitations-next-fix
Patrick Aljord [Thu, 12 May 2011 23:34:23 +0000 (18:34 -0500)]
fix 3rd step of accepting invitation, check that user is not a member

6 years agomore i18n fix for invitations
Patrick Aljord [Thu, 12 May 2011 23:34:01 +0000 (18:34 -0500)]
more i18n fix for invitations

6 years agoaccept invitation if user is already connected
Patrick Aljord [Thu, 12 May 2011 23:18:28 +0000 (18:18 -0500)]
accept invitation if user is already connected

6 years agodon't send invitation if user already is a member
Patrick Aljord [Thu, 12 May 2011 23:17:47 +0000 (18:17 -0500)]
don't send invitation if user already is a member

6 years agomissing translations for invitation email
Patrick Aljord [Thu, 12 May 2011 23:12:31 +0000 (18:12 -0500)]
missing translations for invitation email

6 years agothis should work better
David A. Cuadrado [Thu, 12 May 2011 23:30:26 +0000 (18:30 -0500)]
this should work better

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agofix subtabs
David A. Cuadrado [Thu, 12 May 2011 23:09:50 +0000 (18:09 -0500)]
fix subtabs

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agofix cron tasks
David A. Cuadrado [Thu, 12 May 2011 22:52:19 +0000 (17:52 -0500)]
fix cron tasks

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agofix shapado.yml sample
David A. Cuadrado [Thu, 12 May 2011 22:21:34 +0000 (17:21 -0500)]
fix shapado.yml sample

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agofix invitation email
David A. Cuadrado [Thu, 12 May 2011 21:41:05 +0000 (16:41 -0500)]
fix invitation email

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agodisable this until we figure out how to make routes work correctly
David A. Cuadrado [Thu, 12 May 2011 21:36:22 +0000 (16:36 -0500)]
disable this until we figure out how to make routes work correctly

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoprint a message when loading routes
David A. Cuadrado [Thu, 12 May 2011 21:22:13 +0000 (16:22 -0500)]
print a message when loading routes

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agooption to load app routes on scripts
David A. Cuadrado [Thu, 12 May 2011 21:04:18 +0000 (16:04 -0500)]
option to load app routes on scripts

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agouse the application name when reporting errors
David A. Cuadrado [Thu, 12 May 2011 17:36:48 +0000 (12:36 -0500)]
use the application name when reporting errors

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agocomplete custom loader for scripts
David A. Cuadrado [Thu, 12 May 2011 17:33:26 +0000 (12:33 -0500)]
complete custom loader for scripts

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoMerge remote-tracking branch 'origin/next-live-search' into next
David A. Cuadrado [Thu, 12 May 2011 04:06:22 +0000 (23:06 -0500)]
Merge remote-tracking branch 'origin/next-live-search' into next

6 years agoMerge remote-tracking branch 'origin/widgets' into next
David A. Cuadrado [Thu, 12 May 2011 04:06:16 +0000 (23:06 -0500)]
Merge remote-tracking branch 'origin/widgets' into next

6 years agoadd support for magent
David A. Cuadrado [Thu, 12 May 2011 04:05:30 +0000 (23:05 -0500)]
add support for magent

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoImplement live search questions with the quick question box next-live-search
Jorge H. Cuadrado [Thu, 12 May 2011 02:40:23 +0000 (21:40 -0500)]
Implement live search questions with the quick question box

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoadd a method to load the models without loading all the framework. saves a lot of...
David A. Cuadrado [Wed, 11 May 2011 23:14:28 +0000 (18:14 -0500)]
add a method to load the models without loading all the framework. saves a lot of memory when running scripts

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoImprove form fields for i18n custom html and add i18n support to custom html widget widgets
Jorge H. Cuadrado [Wed, 11 May 2011 06:51:06 +0000 (01:51 -0500)]
Improve form fields for i18n custom html and add i18n support to custom html widget

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoupdate mongoid_ext
David A. Cuadrado [Wed, 11 May 2011 19:06:27 +0000 (14:06 -0500)]
update mongoid_ext

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agomake use of MongoidExt::Versioning
David A. Cuadrado [Wed, 11 May 2011 05:25:14 +0000 (00:25 -0500)]
make use of MongoidExt::Versioning

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoImplement custom html widget
Jorge H. Cuadrado [Tue, 10 May 2011 23:15:06 +0000 (18:15 -0500)]
Implement custom html widget

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoMerge remote-tracking branch 'origin/next' into widgets
Jorge H. Cuadrado [Tue, 10 May 2011 20:12:41 +0000 (15:12 -0500)]
Merge remote-tracking branch 'origin/next' into widgets

6 years agoadd new question automatically using the websocket
David A. Cuadrado [Tue, 10 May 2011 05:20:01 +0000 (00:20 -0500)]
add new question automatically using the websocket

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoautomatically update question list
David A. Cuadrado [Tue, 10 May 2011 04:33:07 +0000 (23:33 -0500)]
automatically update question list

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoMerge remote-tracking branch 'origin/widgets' into next
David A. Cuadrado [Tue, 10 May 2011 02:32:58 +0000 (21:32 -0500)]
Merge remote-tracking branch 'origin/widgets' into next

6 years agoImplement fixdb:ads to create Adsense widgets and Adbard widgets using the stored...
Jorge H. Cuadrado [Tue, 10 May 2011 01:48:02 +0000 (20:48 -0500)]
Implement fixdb:ads to create Adsense widgets and Adbard widgets using the stored data

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoclean up code: remove old ads support
Jorge H. Cuadrado [Mon, 9 May 2011 22:46:03 +0000 (17:46 -0500)]
clean up code: remove old ads support

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoImplement adsense and adbard widgets
Jorge H. Cuadrado [Mon, 9 May 2011 21:58:55 +0000 (16:58 -0500)]
Implement adsense and adbard widgets

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoMerge remote-tracking branch 'origin/invitations-next-fix' into next
David A. Cuadrado [Mon, 9 May 2011 03:07:26 +0000 (22:07 -0500)]
Merge remote-tracking branch 'origin/invitations-next-fix' into next

6 years agoMerge remote-tracking branch 'origin/widgets' into next
David A. Cuadrado [Mon, 9 May 2011 03:07:14 +0000 (22:07 -0500)]
Merge remote-tracking branch 'origin/widgets' into next

6 years agoupdate more deps
David A. Cuadrado [Mon, 9 May 2011 02:17:32 +0000 (21:17 -0500)]
update more deps

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoMerge remote-tracking branch 'origin/next' into widgets
Jorge H. Cuadrado [Mon, 9 May 2011 02:13:30 +0000 (21:13 -0500)]
Merge remote-tracking branch 'origin/next' into widgets

Conflicts:
app/models/widgets/top_groups_widget.rb

6 years agovarious little fixes for widgets
Patrick Aljord [Sun, 8 May 2011 23:37:53 +0000 (18:37 -0500)]
various little fixes for widgets

6 years agoget list of languages from cldr
Patrick Aljord [Sun, 8 May 2011 21:37:31 +0000 (16:37 -0500)]
get list of languages from cldr

6 years agoFix delete widgets
Jorge H. Cuadrado [Sat, 7 May 2011 23:09:16 +0000 (18:09 -0500)]
Fix delete widgets

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoImprove the widget system to allow creating widgets for the header, fotter, navigatio...
Jorge H. Cuadrado [Sat, 7 May 2011 22:59:37 +0000 (17:59 -0500)]
Improve the widget system to allow creating widgets for the header, fotter, navigation bar or sidebar

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agofixed a couple of bugs in invitations, mostly typos and variable names
Patrick Aljord [Fri, 6 May 2011 23:59:12 +0000 (18:59 -0500)]
fixed a couple of bugs in invitations, mostly typos and variable names

6 years agoi18n fix
Patrick Aljord [Fri, 6 May 2011 23:44:16 +0000 (18:44 -0500)]
i18n fix

6 years agofix top users and top groups widgets
David A. Cuadrado [Fri, 6 May 2011 22:53:25 +0000 (17:53 -0500)]
fix top users and top groups widgets

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoadd unicorn to gemfile
David A. Cuadrado [Fri, 6 May 2011 22:10:23 +0000 (17:10 -0500)]
add unicorn to gemfile

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agofix path
David A. Cuadrado [Fri, 6 May 2011 22:00:48 +0000 (17:00 -0500)]
fix path

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoMerge remote-tracking branch 'origin/next-specs' into next
David A. Cuadrado [Fri, 6 May 2011 17:40:46 +0000 (12:40 -0500)]
Merge remote-tracking branch 'origin/next-specs' into next

6 years agomore i18n i18n-next
Patrick Aljord [Fri, 6 May 2011 09:02:21 +0000 (04:02 -0500)]
more i18n

6 years agoAdd specs for close request controller next-specs
Jorge H. Cuadrado [Fri, 6 May 2011 02:36:13 +0000 (21:36 -0500)]
Add specs for close request controller

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agouse site instead of domain
David A. Cuadrado [Thu, 5 May 2011 23:30:52 +0000 (18:30 -0500)]
use site instead of domain

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoupdate config files
David A. Cuadrado [Thu, 5 May 2011 23:21:47 +0000 (18:21 -0500)]
update config files

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoFix connecting account with social sites
Jorge H. Cuadrado [Thu, 5 May 2011 23:03:44 +0000 (18:03 -0500)]
Fix connecting account with social sites

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Thu, 5 May 2011 21:14:12 +0000 (23:14 +0200)]
Localisation updates from translatewiki.net.

6 years agoadd some indexes
David A. Cuadrado [Thu, 5 May 2011 02:59:08 +0000 (21:59 -0500)]
add some indexes

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoupdate some dep versions and fix some bugs when updating a group
David A. Cuadrado [Thu, 5 May 2011 01:27:42 +0000 (20:27 -0500)]
update some dep versions and fix some bugs when updating a group

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoMerge remote-tracking branch 'origin/next-specs' into next
David A. Cuadrado [Wed, 4 May 2011 16:45:28 +0000 (11:45 -0500)]
Merge remote-tracking branch 'origin/next-specs' into next

6 years agoAdd specs for searches controller
Jorge H. Cuadrado [Wed, 4 May 2011 01:07:08 +0000 (20:07 -0500)]
Add specs for searches controller

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agofix websocket
David A. Cuadrado [Tue, 3 May 2011 20:10:46 +0000 (15:10 -0500)]
fix websocket

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoMerge remote-tracking branch 'ui/ui' into next
David A. Cuadrado [Tue, 3 May 2011 20:10:35 +0000 (15:10 -0500)]
Merge remote-tracking branch 'ui/ui' into next

Conflicts:
app/views/questions/show.html.haml

6 years agoMerge remote-tracking branch 'origin/i18n-next' into next
David A. Cuadrado [Tue, 3 May 2011 20:09:15 +0000 (15:09 -0500)]
Merge remote-tracking branch 'origin/i18n-next' into next

6 years agoMerge remote-tracking branch 'origin/next-specs' into next
David A. Cuadrado [Tue, 3 May 2011 20:08:59 +0000 (15:08 -0500)]
Merge remote-tracking branch 'origin/next-specs' into next

6 years agoAdding fixes for votes, and a couple of options into the question toolbar
Francisco Rodriguez [Tue, 3 May 2011 04:01:05 +0000 (23:01 -0500)]
Adding fixes for votes, and a couple of options into the question toolbar

Signed-off-by: Francisco Rodriguez <francisco.rodriguez@finario.com>
6 years agoAdd more specs for User model
Jorge H. Cuadrado [Tue, 3 May 2011 02:57:15 +0000 (21:57 -0500)]
Add more specs for User model

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agorename web socket singleton
David A. Cuadrado [Tue, 3 May 2011 00:06:51 +0000 (19:06 -0500)]
rename web socket singleton

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agocheck if :invitation_id is not blank in Users#create
Jorge H. Cuadrado [Mon, 2 May 2011 22:27:30 +0000 (17:27 -0500)]
check if :invitation_id is not blank in Users#create

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoFix broken specs
Jorge H. Cuadrado [Mon, 2 May 2011 21:32:37 +0000 (16:32 -0500)]
Fix broken specs
- fix creating user without and invitation_id

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoUpdate before_validation syntax
Jorge H. Cuadrado [Mon, 2 May 2011 20:26:31 +0000 (15:26 -0500)]
Update before_validation syntax

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoadded missing i18n, more to come
Patrick Aljord [Mon, 2 May 2011 09:16:07 +0000 (04:16 -0500)]
added missing i18n, more to come

6 years agomore fixes
David A. Cuadrado [Mon, 2 May 2011 06:17:34 +0000 (01:17 -0500)]
more fixes

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agofix bug when connecting accounts
David A. Cuadrado [Mon, 2 May 2011 06:07:58 +0000 (01:07 -0500)]
fix bug when connecting accounts

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoditto
David A. Cuadrado [Mon, 2 May 2011 05:33:35 +0000 (00:33 -0500)]
ditto

Signed-off-by: David A. Cuadrado <krawek@gmail.com>