shapado:shapado.git
7 years agocap tasks to deal with websocket
David A. Cuadrado [Thu, 26 May 2011 20:36:05 +0000 (15:36 -0500)]
cap tasks to deal with websocket

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoAdding fixes for comments
dgfrancisco [Thu, 26 May 2011 15:25:07 +0000 (10:25 -0500)]
Adding fixes for comments

Signed-off-by: dgfrancisco <dgfranciscorodriguez@gmail.com>
7 years agoMerge remote-tracking branch 'origin/fixes-jc' into next
David A. Cuadrado [Thu, 26 May 2011 04:05:46 +0000 (23:05 -0500)]
Merge remote-tracking branch 'origin/fixes-jc' into next

7 years agofix question/answer counting when using mailing feature
David A. Cuadrado [Thu, 26 May 2011 04:05:23 +0000 (23:05 -0500)]
fix question/answer counting when using mailing feature

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoMerge remote-tracking branch 'origin/next' into fixes-jc
Jorge H. Cuadrado [Thu, 26 May 2011 03:34:04 +0000 (22:34 -0500)]
Merge remote-tracking branch 'origin/next' into fixes-jc

7 years agoList user's favorite answers in his profile
Jorge H. Cuadrado [Thu, 26 May 2011 03:32:13 +0000 (22:32 -0500)]
List user's favorite answers in his profile

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoFix current tags widget and merge it with cloud tags widget
Jorge H. Cuadrado [Wed, 25 May 2011 21:07:22 +0000 (16:07 -0500)]
Fix current tags widget and merge it with cloud tags widget

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agocheck whether languages param is present before updating
Patrick Aljord [Wed, 25 May 2011 19:18:02 +0000 (14:18 -0500)]
check whether languages param is present before updating

7 years agomonkey patch to use facebook group credentials
David A. Cuadrado [Wed, 25 May 2011 17:00:36 +0000 (12:00 -0500)]
monkey patch to use facebook group credentials

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoMerge remote-tracking branch 'origin/autocomplete-languages-next' into next
David A. Cuadrado [Wed, 25 May 2011 14:31:51 +0000 (09:31 -0500)]
Merge remote-tracking branch 'origin/autocomplete-languages-next' into next

7 years agolink to groups domain in group list menu on top bar autocomplete-languages-next
Patrick Aljord [Wed, 25 May 2011 04:39:29 +0000 (23:39 -0500)]
link to groups domain in group list menu on top bar

7 years agoadded possibility to resend invitations
Patrick Aljord [Wed, 25 May 2011 03:29:05 +0000 (22:29 -0500)]
added possibility to resend invitations

7 years agocheck whether friend has preferred tags on group
Patrick Aljord [Tue, 24 May 2011 07:06:36 +0000 (02:06 -0500)]
check whether friend has preferred tags on group

7 years agoif no languages selection is empty, show all group's languages
Patrick Aljord [Tue, 24 May 2011 07:05:57 +0000 (02:05 -0500)]
if no languages selection is empty, show all group's languages

7 years agoFix voting feedback
Jorge H. Cuadrado [Tue, 24 May 2011 02:49:07 +0000 (21:49 -0500)]
Fix voting feedback

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoFix error pages and remove extra links from navigation bar
Jorge H. Cuadrado [Mon, 23 May 2011 21:55:33 +0000 (16:55 -0500)]
Fix error pages and remove extra links from navigation bar

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agofix typo
Patrick Aljord [Mon, 23 May 2011 21:26:31 +0000 (16:26 -0500)]
fix typo

7 years agoonly suggest friends that are member of the current group
Patrick Aljord [Mon, 23 May 2011 08:18:54 +0000 (03:18 -0500)]
only suggest friends that are member of the current group

7 years agoupdated flash notice string when following a user
Patrick Aljord [Mon, 23 May 2011 08:18:12 +0000 (03:18 -0500)]
updated flash notice string when following a user

7 years agoonly show languages that the user actually know and that are part of the group's...
Patrick Aljord [Sun, 22 May 2011 23:50:26 +0000 (18:50 -0500)]
only show languages that the user actually know and that are part of the group's list of languages in Questions#new form

7 years agoswitch groups and users to use autocomplete for languages
Patrick Aljord [Sat, 21 May 2011 07:13:38 +0000 (02:13 -0500)]
switch groups and users to use autocomplete for languages
added two helper methods to help with the process

7 years agorenamed languages to avoid confusion with cldr locales
Patrick Aljord [Sat, 21 May 2011 07:13:03 +0000 (02:13 -0500)]
renamed languages to avoid confusion with cldr locales

7 years agoremove debugging method
Patrick Aljord [Sat, 21 May 2011 07:12:31 +0000 (02:12 -0500)]
remove debugging method

7 years agoallow autocomplete plugin to deny new entries
Patrick Aljord [Sat, 21 May 2011 07:11:36 +0000 (02:11 -0500)]
allow autocomplete plugin to deny new entries
add possibility to use a non-ajax source

7 years agoAdding missing file
dgfrancisco [Fri, 20 May 2011 02:19:08 +0000 (21:19 -0500)]
Adding missing file

Signed-off-by: dgfrancisco <dgfranciscorodriguez@gmail.com>
7 years agoFixes for group menu when its not logged in
dgfrancisco [Thu, 19 May 2011 22:05:54 +0000 (17:05 -0500)]
Fixes for group menu when its not logged in

Signed-off-by: dgfrancisco <dgfranciscorodriguez@gmail.com>
7 years agoAdding fixes for moderate section
dgfrancisco [Thu, 19 May 2011 21:47:52 +0000 (16:47 -0500)]
Adding fixes for moderate section

Signed-off-by: dgfrancisco <dgfranciscorodriguez@gmail.com>
7 years agoFixing the markdown content, lists and pre
dgfrancisco [Thu, 19 May 2011 19:52:23 +0000 (14:52 -0500)]
Fixing the markdown content, lists and pre

Signed-off-by: dgfrancisco <dgfranciscorodriguez@gmail.com>
7 years agoFixing spam report into a question
dgfrancisco [Thu, 19 May 2011 17:57:17 +0000 (12:57 -0500)]
Fixing spam report into a question

Signed-off-by: dgfrancisco <dgfranciscorodriguez@gmail.com>
7 years agoMerge remote-tracking branch 'origin/fix-notifiers-raw-links' into next
David A. Cuadrado [Thu, 19 May 2011 03:55:32 +0000 (22:55 -0500)]
Merge remote-tracking branch 'origin/fix-notifiers-raw-links' into next

7 years agoFix user's website link on his profile
Jorge H. Cuadrado [Thu, 19 May 2011 01:20:13 +0000 (20:20 -0500)]
Fix user's website link on his profile

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoShow user's activities in his profile
Jorge H. Cuadrado [Thu, 19 May 2011 01:05:21 +0000 (20:05 -0500)]
Show user's activities in his profile

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agofix link on give_advice fix-notifiers-raw-links
Patrick Aljord [Wed, 18 May 2011 23:16:59 +0000 (18:16 -0500)]
fix link on give_advice

7 years agomake sure all html links are shown correctly in notifiers
Patrick Aljord [Wed, 18 May 2011 22:48:56 +0000 (17:48 -0500)]
make sure all html links are shown correctly in notifiers

7 years agoMerge remote-tracking branch 'origin/fix-connect' into next
David A. Cuadrado [Wed, 18 May 2011 07:10:07 +0000 (02:10 -0500)]
Merge remote-tracking branch 'origin/fix-connect' into next

7 years agoMerge remote-tracking branch 'origin/fix-save-share' into next
David A. Cuadrado [Wed, 18 May 2011 07:10:02 +0000 (02:10 -0500)]
Merge remote-tracking branch 'origin/fix-save-share' into next

7 years agoMerge remote-tracking branch 'origin/fixes-jc' into next
David A. Cuadrado [Wed, 18 May 2011 07:09:58 +0000 (02:09 -0500)]
Merge remote-tracking branch 'origin/fixes-jc' into next

7 years agofix deploy script
David A. Cuadrado [Wed, 18 May 2011 07:08:49 +0000 (02:08 -0500)]
fix deploy script

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agojust use auth_providers.yml that's in shared/config fix-connect
Patrick Aljord [Wed, 18 May 2011 06:07:42 +0000 (01:07 -0500)]
just use auth_providers.yml that's in shared/config

7 years agofix connecting existing user with an external account even if no existing user is...
Patrick Aljord [Wed, 18 May 2011 06:03:42 +0000 (01:03 -0500)]
fix connecting existing user with an external account even if no existing user is associated with it

7 years agoRemove both ads routes and manage ads' link
Jorge H. Cuadrado [Wed, 18 May 2011 02:33:15 +0000 (21:33 -0500)]
Remove both ads routes and manage ads' link

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoFix Searches#show
Jorge H. Cuadrado [Wed, 18 May 2011 01:33:28 +0000 (20:33 -0500)]
Fix Searches#show

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoFix user's atom feed and Users#activity action
Jorge H. Cuadrado [Wed, 18 May 2011 01:02:36 +0000 (20:02 -0500)]
Fix user's atom feed and Users#activity action

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoFix showing the content for each version and fix showing the diff between versions...
Jorge H. Cuadrado [Tue, 17 May 2011 21:33:47 +0000 (16:33 -0500)]
Fix showing the content for each version and fix showing the diff between versions for question history

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoAdd sort by question's last activity
Jorge H. Cuadrado [Tue, 17 May 2011 00:47:04 +0000 (19:47 -0500)]
Add sort by question's last activity

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoupdate group share config which is now its own collection fix-save-share
Patrick Aljord [Tue, 17 May 2011 07:34:09 +0000 (02:34 -0500)]
update group share config which is now its own collection

7 years agoupdated deploy.rb to use jammit instead
Patrick Aljord [Tue, 17 May 2011 07:23:59 +0000 (02:23 -0500)]
updated deploy.rb to use jammit instead

7 years agoforgot to add second param
Patrick Aljord [Tue, 17 May 2011 07:03:13 +0000 (02:03 -0500)]
forgot to add second param

7 years agoupdate to latest jquery 1.6.1 social-friends-refactor
Patrick Aljord [Tue, 17 May 2011 03:06:24 +0000 (22:06 -0500)]
update to latest jquery 1.6.1

7 years agomake sure to show votes
Patrick Aljord [Tue, 17 May 2011 03:05:35 +0000 (22:05 -0500)]
make sure to show votes

7 years agofix link to linked_in
Patrick Aljord [Tue, 17 May 2011 03:05:06 +0000 (22:05 -0500)]
fix link to linked_in

7 years agorefactor social friends lists, moved everything to ExternalFriendsList
Patrick Aljord [Tue, 17 May 2011 03:02:27 +0000 (22:02 -0500)]
refactor social friends lists, moved everything to ExternalFriendsList
* fix a few bugs when social friends lists are empty
* make sure to merge user_info correctly
* check that social friends have been imported correctly on visiting Users#social_connect
* refactored a few methods in users related to suggestions

7 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>
7 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>
7 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>
7 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>
7 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

7 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>
7 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

7 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>
7 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

7 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>
7 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

7 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

7 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

7 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>
7 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>
7 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

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

7 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

7 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

7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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

7 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>
7 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

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

7 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

7 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

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

7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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>
7 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

7 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