shapado:cantonics-shapado.git
7 years agodo not allow to pick an answer if the question is marked as subjetive
David A. Cuadrado [Tue, 16 Nov 2010 05:28:11 +0000 (00:28 -0500)]
do not allow to pick an answer if the question is marked as subjetive

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agodo not duplicate the answer
David A. Cuadrado [Tue, 16 Nov 2010 05:13:40 +0000 (00:13 -0500)]
do not duplicate the answer

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agosome fixes on rewards code
David A. Cuadrado [Mon, 15 Nov 2010 05:44:02 +0000 (00:44 -0500)]
some fixes on rewards code

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agobounty -> reward
David A. Cuadrado [Mon, 15 Nov 2010 05:24:14 +0000 (00:24 -0500)]
bounty -> reward

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoimplemented new badges: investor, promoter, benefactor, altruist
David A. Cuadrado [Mon, 15 Nov 2010 05:17:48 +0000 (00:17 -0500)]
implemented new badges: investor, promoter, benefactor, altruist

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoimprove a bit the format
David A. Cuadrado [Mon, 15 Nov 2010 04:16:53 +0000 (23:16 -0500)]
improve a bit the format

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agofix rake task
David A. Cuadrado [Mon, 15 Nov 2010 03:59:33 +0000 (22:59 -0500)]
fix rake task

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agofix some broken queries
David A. Cuadrado [Mon, 15 Nov 2010 03:57:02 +0000 (22:57 -0500)]
fix some broken queries

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agofix task
David A. Cuadrado [Mon, 15 Nov 2010 03:36:24 +0000 (22:36 -0500)]
fix task

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoMerge remote branch 'origin/first-count-next' into next
David A. Cuadrado [Mon, 15 Nov 2010 02:51:58 +0000 (21:51 -0500)]
Merge remote branch 'origin/first-count-next' into next

7 years agofix on_create_answer task
David A. Cuadrado [Mon, 15 Nov 2010 02:51:15 +0000 (21:51 -0500)]
fix on_create_answer task

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoreplaced all first(opts) and count(opts) with where(opts).count and where(opts).first first-count-next
Patrick Aljord [Mon, 15 Nov 2010 02:48:30 +0000 (21:48 -0500)]
replaced all first(opts) and count(opts) with where(opts).count and where(opts).first

7 years agofix badge model
David A. Cuadrado [Mon, 15 Nov 2010 02:35:21 +0000 (21:35 -0500)]
fix badge model

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoMerge remote branch 'origin/deliver-next' into next
David A. Cuadrado [Mon, 15 Nov 2010 02:11:08 +0000 (21:11 -0500)]
Merge remote branch 'origin/deliver-next' into next

7 years agomake use of new deliver syntax deliver-next
Patrick Aljord [Mon, 15 Nov 2010 02:09:56 +0000 (21:09 -0500)]
make use of new deliver syntax

7 years agohandle provider when connecting the account
David A. Cuadrado [Mon, 15 Nov 2010 02:09:32 +0000 (21:09 -0500)]
handle provider when connecting the account

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoMerge remote branch 'origin/sent-to-twitter-next' into next
David A. Cuadrado [Mon, 15 Nov 2010 02:00:46 +0000 (21:00 -0500)]
Merge remote branch 'origin/sent-to-twitter-next' into next

7 years agoMerge remote branch 'origin/sent-to-twitter-next' into next
David A. Cuadrado [Mon, 15 Nov 2010 02:00:07 +0000 (21:00 -0500)]
Merge remote branch 'origin/sent-to-twitter-next' into next

7 years agouse question_url instead of url_for sent-to-twitter-next
Patrick Aljord [Mon, 15 Nov 2010 01:46:36 +0000 (20:46 -0500)]
use question_url instead of url_for

7 years agosend tweet on asking questions and other mongoid fixes
Patrick Aljord [Mon, 15 Nov 2010 01:33:12 +0000 (20:33 -0500)]
send tweet on asking questions and other mongoid fixes

7 years agoforgot to add this check
David A. Cuadrado [Mon, 15 Nov 2010 01:28:59 +0000 (20:28 -0500)]
forgot to add this check

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoupdate jquery ui, add a slider to select the bounty value
David A. Cuadrado [Mon, 15 Nov 2010 01:26:12 +0000 (20:26 -0500)]
update jquery ui, add a slider to select the bounty value

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agocomplete bounty implementation
David A. Cuadrado [Mon, 15 Nov 2010 00:56:38 +0000 (19:56 -0500)]
complete bounty implementation

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoAfter starting a bounty, you must wait 1 day before awarding it
David A. Cuadrado [Sun, 14 Nov 2010 23:47:29 +0000 (18:47 -0500)]
After starting a bounty, you must wait 1 day before awarding it

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agorename shorten_url to short_url and fix twitter login check
Patrick Aljord [Sun, 14 Nov 2010 23:46:10 +0000 (18:46 -0500)]
rename shorten_url to short_url and fix twitter login check

7 years agocannot close questions with active bounties
David A. Cuadrado [Sun, 14 Nov 2010 23:40:28 +0000 (18:40 -0500)]
cannot close questions with active bounties

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agomagent task to close a bounty
David A. Cuadrado [Sun, 14 Nov 2010 23:38:18 +0000 (18:38 -0500)]
magent task to close a bounty

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agomoved shorten_url to a method
Patrick Aljord [Sun, 14 Nov 2010 20:32:03 +0000 (15:32 -0500)]
moved shorten_url to a method

7 years agovarious fixes in jobs and User
Patrick Aljord [Sun, 14 Nov 2010 07:49:10 +0000 (02:49 -0500)]
various fixes in jobs and User

7 years agofix User#twitter_login?
Patrick Aljord [Sun, 14 Nov 2010 07:20:08 +0000 (02:20 -0500)]
fix User#twitter_login?

7 years agouse magent to send tweets, shorten questions urls on asking
Patrick Aljord [Sun, 14 Nov 2010 05:15:27 +0000 (00:15 -0500)]
use magent to send tweets, shorten questions urls on asking

7 years agofix User#merge_user
David A. Cuadrado [Sun, 14 Nov 2010 20:25:55 +0000 (15:25 -0500)]
fix User#merge_user

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoexport friend lists
David A. Cuadrado [Sun, 14 Nov 2010 20:14:11 +0000 (15:14 -0500)]
export friend lists

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agonew EmbeddedHash which fakes some Mongoid::Document methods; fixes memberships
David A. Cuadrado [Sun, 14 Nov 2010 20:03:52 +0000 (15:03 -0500)]
new EmbeddedHash which fakes some Mongoid::Document methods; fixes memberships

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoport to mongoid
David A. Cuadrado [Sun, 14 Nov 2010 18:35:09 +0000 (13:35 -0500)]
port to mongoid

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agofix question followers
David A. Cuadrado [Sun, 14 Nov 2010 18:15:52 +0000 (13:15 -0500)]
fix question followers

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agofix User#followers
David A. Cuadrado [Sun, 14 Nov 2010 17:13:21 +0000 (12:13 -0500)]
fix User#followers

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agofix User#following?
David A. Cuadrado [Sun, 14 Nov 2010 17:11:42 +0000 (12:11 -0500)]
fix User#following?

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agorefactor bounty rewards
David A. Cuadrado [Sun, 14 Nov 2010 08:00:09 +0000 (03:00 -0500)]
refactor bounty rewards

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agotypo
David A. Cuadrado [Sun, 14 Nov 2010 07:43:51 +0000 (02:43 -0500)]
typo

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoreward bounty
David A. Cuadrado [Sun, 14 Nov 2010 07:39:49 +0000 (02:39 -0500)]
reward bounty

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agodisplay bounty
David A. Cuadrado [Sun, 14 Nov 2010 07:18:50 +0000 (02:18 -0500)]
display bounty

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoimplement action to start a bounty
David A. Cuadrado [Sun, 14 Nov 2010 06:56:12 +0000 (01:56 -0500)]
implement action to start a bounty

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agouse field since embeds_one is buggy
David A. Cuadrado [Sun, 14 Nov 2010 06:36:06 +0000 (01:36 -0500)]
use field since embeds_one is buggy

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agofix magent call
David A. Cuadrado [Sun, 14 Nov 2010 06:07:19 +0000 (01:07 -0500)]
fix magent call

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agofix User#merge_user
David A. Cuadrado [Sun, 14 Nov 2010 05:21:19 +0000 (00:21 -0500)]
fix User#merge_user

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agomoved to NotificationConfig
Patrick Aljord [Sun, 14 Nov 2010 02:37:47 +0000 (21:37 -0500)]
moved to NotificationConfig

7 years agoremove comment and fix dates task
Patrick Aljord [Sun, 14 Nov 2010 02:12:34 +0000 (21:12 -0500)]
remove comment and fix dates task

7 years agofix dates in users and other collections
Patrick Aljord [Sun, 14 Nov 2010 02:04:18 +0000 (21:04 -0500)]
fix dates in users and other collections

7 years agoadded checkboxes to send to twitter
Patrick Aljord [Sat, 13 Nov 2010 23:33:15 +0000 (18:33 -0500)]
added checkboxes to send to twitter

7 years agoinherit from hash
David A. Cuadrado [Sun, 14 Nov 2010 02:02:55 +0000 (21:02 -0500)]
inherit from hash

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoMerge remote branch 'origin/next-specs' into next
David A. Cuadrado [Sun, 14 Nov 2010 00:39:10 +0000 (19:39 -0500)]
Merge remote branch 'origin/next-specs' into next

Conflicts:
app/models/group.rb

7 years agorefactor
David A. Cuadrado [Sun, 14 Nov 2010 00:38:00 +0000 (19:38 -0500)]
refactor

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoAdd file for user specs
Jorge H. Cuadrado [Sun, 14 Nov 2010 00:35:02 +0000 (19:35 -0500)]
Add file for user specs

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agodisable validation for now
David A. Cuadrado [Sun, 14 Nov 2010 00:28:56 +0000 (19:28 -0500)]
disable validation for now

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoFix some broken specs
Jorge H. Cuadrado [Sun, 14 Nov 2010 00:17:53 +0000 (19:17 -0500)]
Fix some broken specs

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoadd some default values
David A. Cuadrado [Sun, 14 Nov 2010 00:12:10 +0000 (19:12 -0500)]
add some default values

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agofix multiauth revision
David A. Cuadrado [Sun, 14 Nov 2010 00:08:52 +0000 (19:08 -0500)]
fix multiauth revision

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agofix User#connect
David A. Cuadrado [Sat, 13 Nov 2010 23:37:44 +0000 (18:37 -0500)]
fix User#connect

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoAdd more specs for groups
Jorge H. Cuadrado [Sat, 13 Nov 2010 23:23:56 +0000 (18:23 -0500)]
Add more specs for groups

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoadd bounty model and controller
David A. Cuadrado [Sat, 13 Nov 2010 23:17:31 +0000 (18:17 -0500)]
add bounty model and controller

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoMerge remote branch 'origin/widgets-next' into next
David A. Cuadrado [Sat, 13 Nov 2010 22:37:06 +0000 (17:37 -0500)]
Merge remote branch 'origin/widgets-next' into next

7 years agodon't show question related widgets on welcome and index widget tabs widgets-next
Patrick Aljord [Sat, 13 Nov 2010 22:33:39 +0000 (17:33 -0500)]
don't show question related widgets on welcome and index widget tabs

7 years agoremoved widget display settings
Patrick Aljord [Sat, 13 Nov 2010 22:15:03 +0000 (17:15 -0500)]
removed widget display settings

7 years agoMerge remote branch 'origin/next-specs' into next
David A. Cuadrado [Sat, 13 Nov 2010 22:11:18 +0000 (17:11 -0500)]
Merge remote branch 'origin/next-specs' into next

7 years agoremoved some checkbox and updated missing strings for widgets
Patrick Aljord [Sat, 13 Nov 2010 21:57:36 +0000 (16:57 -0500)]
removed some checkbox and updated missing strings for widgets

7 years agoAdd specs for group model
Jorge H. Cuadrado [Sat, 13 Nov 2010 21:40:16 +0000 (16:40 -0500)]
Add specs for group model

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoimplemented follow ups
David A. Cuadrado [Sat, 13 Nov 2010 21:22:59 +0000 (16:22 -0500)]
implemented follow ups

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoMerge remote branch 'origin/next-specs' into next
David A. Cuadrado [Sat, 13 Nov 2010 20:26:04 +0000 (15:26 -0500)]
Merge remote branch 'origin/next-specs' into next

7 years agofix User#find_experts
David A. Cuadrado [Sat, 13 Nov 2010 20:24:31 +0000 (15:24 -0500)]
fix User#find_experts

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoAdd more specs for question model
Jorge H. Cuadrado [Sat, 13 Nov 2010 20:20:22 +0000 (15:20 -0500)]
Add more specs for question model

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agofix User#find_by_login_or_id
David A. Cuadrado [Sat, 13 Nov 2010 20:21:45 +0000 (15:21 -0500)]
fix User#find_by_login_or_id

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoMerge remote branch 'origin/recaptcha-next' into next
David A. Cuadrado [Sat, 13 Nov 2010 19:26:28 +0000 (14:26 -0500)]
Merge remote branch 'origin/recaptcha-next' into next

7 years agofix password based auth
David A. Cuadrado [Sat, 13 Nov 2010 19:26:14 +0000 (14:26 -0500)]
fix password based auth

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agofix related questions
David A. Cuadrado [Sat, 13 Nov 2010 19:26:03 +0000 (14:26 -0500)]
fix related questions

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agorecaptcha is safe html recaptcha-next
Patrick Aljord [Sat, 13 Nov 2010 19:16:33 +0000 (14:16 -0500)]
recaptcha is safe html

7 years agoadd link to answer a random unanswered question
David A. Cuadrado [Sat, 13 Nov 2010 18:12:04 +0000 (13:12 -0500)]
add link to answer a random unanswered question

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoupdate top users widget
David A. Cuadrado [Sat, 13 Nov 2010 17:35:06 +0000 (12:35 -0500)]
update top users widget

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoupdate some urls
David A. Cuadrado [Sat, 13 Nov 2010 17:31:34 +0000 (12:31 -0500)]
update some urls

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoMerge remote branch 'origin/fix-layouts-header' into next
David A. Cuadrado [Sat, 13 Nov 2010 07:32:13 +0000 (02:32 -0500)]
Merge remote branch 'origin/fix-layouts-header' into next

7 years agofix questions/unanswered
David A. Cuadrado [Sat, 13 Nov 2010 07:31:24 +0000 (02:31 -0500)]
fix questions/unanswered

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agouse raw() in other layouts fix-layouts-header
Patrick Aljord [Sat, 13 Nov 2010 07:27:10 +0000 (02:27 -0500)]
use raw() in other layouts

7 years agoassign default values
David A. Cuadrado [Sat, 13 Nov 2010 06:49:11 +0000 (01:49 -0500)]
assign default values

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoadd script import a group
David A. Cuadrado [Sat, 13 Nov 2010 06:41:46 +0000 (01:41 -0500)]
add script import a group

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoimprove export script
David A. Cuadrado [Sat, 13 Nov 2010 06:41:35 +0000 (01:41 -0500)]
improve export script

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agofix export script
David A. Cuadrado [Sat, 13 Nov 2010 05:42:34 +0000 (00:42 -0500)]
fix export script

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agofix bootstrap task
David A. Cuadrado [Sat, 13 Nov 2010 05:25:21 +0000 (00:25 -0500)]
fix bootstrap task

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoupdate task
David A. Cuadrado [Sat, 13 Nov 2010 05:18:12 +0000 (00:18 -0500)]
update task

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoMerge remote branch 'origin/mongoid-specs' into next
David A. Cuadrado [Sat, 13 Nov 2010 05:13:35 +0000 (00:13 -0500)]
Merge remote branch 'origin/mongoid-specs' into next

7 years agobugfixes
David A. Cuadrado [Sat, 13 Nov 2010 05:13:03 +0000 (00:13 -0500)]
bugfixes

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoPort moderate questions controller mongoid-specs
Jorge H. Cuadrado [Thu, 11 Nov 2010 08:21:21 +0000 (03:21 -0500)]
Port moderate questions controller

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoPrevent to set adress as nil in relocate rake task
Jorge H. Cuadrado [Thu, 11 Nov 2010 08:09:19 +0000 (03:09 -0500)]
Prevent to set adress as nil in relocate rake task

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoMerge remote branch 'origin/rendering-next' into next
David A. Cuadrado [Sat, 13 Nov 2010 03:55:31 +0000 (22:55 -0500)]
Merge remote branch 'origin/rendering-next' into next

7 years agocheckout mongoid_ext from git repo
David A. Cuadrado [Sat, 13 Nov 2010 03:29:14 +0000 (22:29 -0500)]
checkout mongoid_ext from git repo

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoUpdate UI language usage consistency.
Siebrand Mazeland [Thu, 11 Nov 2010 09:36:01 +0000 (10:36 +0100)]
Update UI language usage consistency.

7 years agoIgnore .bak files.
Siebrand Mazeland [Thu, 11 Nov 2010 09:24:31 +0000 (10:24 +0100)]
Ignore .bak files.

7 years agoRemove stray backup file.
Siebrand Mazeland [Thu, 11 Nov 2010 09:23:42 +0000 (10:23 +0100)]
Remove stray backup file.

7 years agoUpdate from svenfuchs-rails-i18n-90aec4a.
Siebrand Mazeland [Thu, 11 Nov 2010 09:22:55 +0000 (10:22 +0100)]
Update from svenfuchs-rails-i18n-90aec4a.
* renamed gsw-CH and hi-IN to not contain country code.

7 years agofix rendering with html_safe and raw(), rendering-next
Patrick Aljord [Thu, 11 Nov 2010 08:15:20 +0000 (03:15 -0500)]
fix rendering with html_safe and raw(),
upgraded will_paginate to branch rails3 as it takes care of rendering bug

7 years agofix rendering ads
Patrick Aljord [Thu, 11 Nov 2010 06:57:09 +0000 (01:57 -0500)]
fix rendering ads