shapado:shapado.git
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

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

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

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

7 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

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

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

7 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

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

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

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

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

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

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

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

7 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

7 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

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

7 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>
7 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>
7 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>
7 years agoyou should be logged in to use this action
David A. Cuadrado [Mon, 2 May 2011 05:28:38 +0000 (00:28 -0500)]
you should be logged in to use this action

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoadd default postfix config
David A. Cuadrado [Sat, 30 Apr 2011 20:32:57 +0000 (15:32 -0500)]
add default postfix config

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agofix tags on index
David A. Cuadrado [Fri, 29 Apr 2011 00:36:01 +0000 (19:36 -0500)]
fix tags on index

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoupdate haml, sass and compass gems; fix error when rendering a question
David A. Cuadrado [Fri, 29 Apr 2011 00:33:53 +0000 (19:33 -0500)]
update haml, sass and compass gems; fix error when rendering a question

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoMerge remote-tracking branch 'ui/ui' into next
David A. Cuadrado [Thu, 28 Apr 2011 23:38:07 +0000 (18:38 -0500)]
Merge remote-tracking branch 'ui/ui' into next

7 years agoupdate some deps
David A. Cuadrado [Thu, 28 Apr 2011 23:37:33 +0000 (18:37 -0500)]
update some deps

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoAdding fixes for search results
Francisco Rodriguez [Thu, 28 Apr 2011 00:05:46 +0000 (19:05 -0500)]
Adding fixes for search results

Signed-off-by: Francisco Rodriguez <francisco.rodriguez@finario.com>
7 years agoMerge remote branch 'upstream/next' into ui
Francisco Rodriguez [Wed, 27 Apr 2011 17:05:48 +0000 (12:05 -0500)]
Merge remote branch 'upstream/next' into ui

7 years agofix showing vote_box on answers
Patrick Aljord [Wed, 27 Apr 2011 00:37:18 +0000 (19:37 -0500)]
fix showing vote_box on answers

7 years agoMerge remote-tracking branch 'origin/next-paginate' into next
David A. Cuadrado [Mon, 25 Apr 2011 02:07:38 +0000 (21:07 -0500)]
Merge remote-tracking branch 'origin/next-paginate' into next

7 years agodon't show quick question on /questions/new, this fixes the language select ordering...
Patrick Aljord [Thu, 21 Apr 2011 07:44:06 +0000 (02:44 -0500)]
don't show quick question on /questions/new, this fixes the language select ordering js code

7 years agoif group is social only and user is not connected, redirect to /connect
Patrick Aljord [Thu, 21 Apr 2011 06:23:00 +0000 (01:23 -0500)]
if group is social only and user is not connected, redirect to /connect

7 years agodon't send invite when email is empty
Patrick Aljord [Thu, 21 Apr 2011 06:22:07 +0000 (01:22 -0500)]
don't send invite when email is empty

7 years agomake use of state machine to handle invitations states
Patrick Aljord [Thu, 21 Apr 2011 06:15:21 +0000 (01:15 -0500)]
make use of state machine to handle invitations states

7 years agouse a cookie to check whether user logged in from a popup or not
Patrick Aljord [Thu, 21 Apr 2011 05:53:21 +0000 (00:53 -0500)]
use a cookie to check whether user logged in from a popup or not

7 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Wed, 20 Apr 2011 08:07:39 +0000 (10:07 +0200)]
Localisation updates from translatewiki.net.

7 years agofix bug when edition question
David A. Cuadrado [Wed, 20 Apr 2011 05:12:15 +0000 (00:12 -0500)]
fix bug when edition question

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoAdd more specs for questions controller next-paginate
Jorge H. Cuadrado [Wed, 20 Apr 2011 04:26:01 +0000 (23:26 -0500)]
Add more specs for questions controller

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agotask to update the versions on the db
David A. Cuadrado [Mon, 18 Apr 2011 18:44:25 +0000 (13:44 -0500)]
task to update the versions on the db

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agofix some versioning bugs
David A. Cuadrado [Mon, 18 Apr 2011 03:59:55 +0000 (22:59 -0500)]
fix some versioning bugs

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoMerge remote-tracking branch 'origin/next-paginate' into next
David A. Cuadrado [Mon, 18 Apr 2011 03:33:53 +0000 (22:33 -0500)]
Merge remote-tracking branch 'origin/next-paginate' into next

7 years agoreimplement versions backend
David A. Cuadrado [Mon, 18 Apr 2011 03:32:12 +0000 (22:32 -0500)]
reimplement versions backend

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoAdd specs for Votes controller and add more specs for Question controllers
Jorge H. Cuadrado [Mon, 18 Apr 2011 01:28:37 +0000 (20:28 -0500)]
Add specs for Votes controller and add more specs for Question controllers

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoFix issue in translatewiki.net because unquoted "no" is a special keyword in YAML...
Siebrand Mazeland [Sat, 16 Apr 2011 19:59:57 +0000 (21:59 +0200)]
Fix issue in translatewiki.net because unquoted "no" is a special keyword in YAML files.

7 years agoMerge remote-tracking branch 'origin/next-paginate' into next
David A. Cuadrado [Sat, 16 Apr 2011 14:56:02 +0000 (09:56 -0500)]
Merge remote-tracking branch 'origin/next-paginate' into next

7 years agoAdd Users controller specs and fix some broken specs
Jorge H. Cuadrado [Sat, 16 Apr 2011 01:54:07 +0000 (20:54 -0500)]
Add Users controller specs and fix some broken specs

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoAdd new group link to group list in the topbar
Jorge H. Cuadrado [Fri, 15 Apr 2011 23:21:59 +0000 (18:21 -0500)]
Add new group link to group list in the topbar

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoforgot to add the locales
David A. Cuadrado [Fri, 15 Apr 2011 20:33:17 +0000 (15:33 -0500)]
forgot to add the locales

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoMerge remote-tracking branch 'origin/invitations-fixes' into next
David A. Cuadrado [Fri, 15 Apr 2011 18:43:41 +0000 (13:43 -0500)]
Merge remote-tracking branch 'origin/invitations-fixes' into next

7 years agoImplement and use paginate_opts method
Jorge H. Cuadrado [Fri, 15 Apr 2011 16:54:05 +0000 (11:54 -0500)]
Implement and use paginate_opts method

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agofix accepting invitations and added an accepted_by and accepted_at fields
Patrick Aljord [Fri, 15 Apr 2011 07:04:38 +0000 (02:04 -0500)]
fix accepting invitations and added an accepted_by and accepted_at fields

7 years agoallow to specify the role of invited users
Patrick Aljord [Fri, 15 Apr 2011 06:55:23 +0000 (01:55 -0500)]
allow to specify the role of invited users

7 years agoonly show pending invitations (invitations that have not been accepted yet)
Patrick Aljord [Fri, 15 Apr 2011 00:56:11 +0000 (19:56 -0500)]
only show pending invitations (invitations that have not been accepted yet)

7 years agocheck for type of signup
Patrick Aljord [Fri, 15 Apr 2011 00:49:30 +0000 (19:49 -0500)]
check for type of signup

7 years agoadded role select translations
Patrick Aljord [Fri, 15 Apr 2011 00:46:10 +0000 (19:46 -0500)]
added role select translations

7 years agofix creating and revoking invitations
Patrick Aljord [Wed, 13 Apr 2011 05:35:07 +0000 (00:35 -0500)]
fix creating and revoking invitations

7 years agoshow specific login menu for each kind of signup
Patrick Aljord [Wed, 13 Apr 2011 05:00:59 +0000 (00:00 -0500)]
show specific login menu for each kind of signup