shapado:cantonics-shapado.git
6 years agofix twitter users from shapado <4.0 fix-twitter-fb-users-next
Patrick Aljord [Tue, 8 Mar 2011 08:38:25 +0000 (03:38 -0500)]
fix twitter users from shapado <4.0

6 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Thu, 24 Feb 2011 11:35:37 +0000 (12:35 +0100)]
Localisation updates from translatewiki.net.

6 years agoadd task to create an external widget for existing groups
Patrick Aljord [Fri, 4 Mar 2011 23:53:39 +0000 (18:53 -0500)]
add task to create an external widget for existing groups
remove welcome widgets (use mainlist widgets only)
fix creating widget when no subtab is specified

6 years agoadded tasks to create identica and twitter friends lists
Patrick Aljord [Wed, 2 Mar 2011 22:39:56 +0000 (17:39 -0500)]
added tasks to create identica and twitter friends lists

6 years agoadded identica friends suggestions
Patrick Aljord [Wed, 2 Mar 2011 22:32:55 +0000 (17:32 -0500)]
added identica friends suggestions

6 years agoadded twitter friends suggestions
Patrick Aljord [Wed, 2 Mar 2011 06:54:21 +0000 (01:54 -0500)]
added twitter friends suggestions

6 years agofix deep stack level error on loging in with facebook
Patrick Aljord [Mon, 28 Feb 2011 07:45:16 +0000 (02:45 -0500)]
fix deep stack level error on loging in with facebook
added missing task to fixall

6 years agomoved facebook friends to its own model
Patrick Aljord [Fri, 25 Feb 2011 06:17:22 +0000 (01:17 -0500)]
moved facebook friends to its own model

6 years agorenamed facebook widget to suggestions widget
Patrick Aljord [Fri, 18 Feb 2011 07:15:32 +0000 (02:15 -0500)]
renamed facebook widget to suggestions widget
added a /suggestions route for users

6 years agofix adding and removing friends
Patrick Aljord [Thu, 17 Feb 2011 07:34:15 +0000 (02:34 -0500)]
fix adding and removing friends

6 years agoWIP facebook friends widget
Patrick Aljord [Mon, 14 Feb 2011 07:40:18 +0000 (02:40 -0500)]
WIP facebook friends widget

6 years agoMerge remote-tracking branch 'origin/fix-raketask' into next
David A. Cuadrado [Mon, 21 Feb 2011 05:17:54 +0000 (00:17 -0500)]
Merge remote-tracking branch 'origin/fix-raketask' into next

6 years agoadd back the admin tabs for now
David A. Cuadrado [Mon, 21 Feb 2011 05:17:30 +0000 (00:17 -0500)]
add back the admin tabs for now

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoFix create questions fix-raketask
Jorge H. Cuadrado [Mon, 21 Feb 2011 05:13:15 +0000 (00:13 -0500)]
Fix create questions
- The validates_length_of option :message was renamed to :wrong_length
- Update setup:create_admin to set the preferred_languages

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoMerge remote-tracking branch 'origin/next' into next
David A. Cuadrado [Sun, 20 Feb 2011 15:47:46 +0000 (10:47 -0500)]
Merge remote-tracking branch 'origin/next' into next

6 years agoMerge remote-tracking branch 'ui/ui' into next
David A. Cuadrado [Sun, 20 Feb 2011 15:47:11 +0000 (10:47 -0500)]
Merge remote-tracking branch 'ui/ui' into next

6 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Mon, 14 Feb 2011 18:33:09 +0000 (19:33 +0100)]
Localisation updates from translatewiki.net.

6 years agoadd ssl support
David A. Cuadrado [Mon, 14 Feb 2011 05:46:14 +0000 (00:46 -0500)]
add ssl support

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoWidgets page admin updated
Francisco Rodriguez [Sun, 13 Feb 2011 21:38:46 +0000 (16:38 -0500)]
Widgets page admin updated

Signed-off-by: Francisco Rodriguez <francisco.rodriguez@finario.com>
6 years agoEditing group in place
Francisco Rodriguez [Sun, 13 Feb 2011 18:12:37 +0000 (13:12 -0500)]
Editing group in place

Signed-off-by: Francisco Rodriguez <francisco.rodriguez@finario.com>
6 years agoAdmin Area General Layout fixed
Francisco Rodriguez [Sun, 13 Feb 2011 17:08:03 +0000 (12:08 -0500)]
Admin Area General Layout fixed

Signed-off-by: Francisco Rodriguez <francisco.rodriguez@finario.com>
6 years agoMerge remote branch 'upstream/next' into ui
Francisco Rodriguez [Sun, 13 Feb 2011 15:45:48 +0000 (10:45 -0500)]
Merge remote branch 'upstream/next' into ui

6 years agoMerge remote-tracking branch 'origin/jc-newui' into next
David A. Cuadrado [Sun, 13 Feb 2011 15:44:40 +0000 (10:44 -0500)]
Merge remote-tracking branch 'origin/jc-newui' into next

6 years agoMerge remote-tracking branch 'origin/fix-raketask' into next
David A. Cuadrado [Sun, 13 Feb 2011 15:44:00 +0000 (10:44 -0500)]
Merge remote-tracking branch 'origin/fix-raketask' into next

6 years agoMerge remote branch 'upstream/fix-raketask' into ui
Francisco Rodriguez [Sun, 13 Feb 2011 09:10:38 +0000 (04:10 -0500)]
Merge remote branch 'upstream/fix-raketask' into ui

6 years agoMerge remote branch 'upstream/jc-newui' into ui
Francisco Rodriguez [Sun, 13 Feb 2011 08:38:45 +0000 (03:38 -0500)]
Merge remote branch 'upstream/jc-newui' into ui

6 years agoupdate flag form jc-newui
Jorge H. Cuadrado [Sun, 13 Feb 2011 08:14:53 +0000 (03:14 -0500)]
update flag form

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoupdate reward and close request forms
Jorge H. Cuadrado [Sun, 13 Feb 2011 08:14:12 +0000 (03:14 -0500)]
update reward and close request forms

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoUser edit form css fixed
Francisco Rodriguez [Sun, 13 Feb 2011 08:12:11 +0000 (03:12 -0500)]
User edit form css fixed

Signed-off-by: Francisco Rodriguez <francisco.rodriguez@finario.com>
6 years agoAdd fixdb:cleanup task
Jorge H. Cuadrado [Sun, 13 Feb 2011 07:23:50 +0000 (02:23 -0500)]
Add fixdb:cleanup task

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoFix fixall rake task
Jorge H. Cuadrado [Sun, 13 Feb 2011 05:47:57 +0000 (00:47 -0500)]
Fix fixall rake task

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agofix crash when creating a group
David A. Cuadrado [Sat, 12 Feb 2011 23:00:08 +0000 (18:00 -0500)]
fix crash when creating a group

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agofix a couple of errors in controllers
David A. Cuadrado [Sat, 12 Feb 2011 19:20:43 +0000 (14:20 -0500)]
fix a couple of errors in controllers

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoMerge remote-tracking branch 'origin/answer-specs' into next
David A. Cuadrado [Mon, 7 Feb 2011 05:28:08 +0000 (00:28 -0500)]
Merge remote-tracking branch 'origin/answer-specs' into next

6 years agorefactor question email
David A. Cuadrado [Mon, 7 Feb 2011 05:27:28 +0000 (00:27 -0500)]
refactor question email

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoadded reply-to email to new questions reply-to-next
Patrick Aljord [Mon, 7 Feb 2011 04:51:28 +0000 (23:51 -0500)]
added reply-to email to new questions

6 years agoadd mail address for the question
David A. Cuadrado [Mon, 7 Feb 2011 01:15:25 +0000 (20:15 -0500)]
add mail address for the question

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoMerge remote-tracking branch 'ui/ui' into next
David A. Cuadrado [Mon, 7 Feb 2011 01:07:23 +0000 (20:07 -0500)]
Merge remote-tracking branch 'ui/ui' into next

6 years agoadd to whenever config
David A. Cuadrado [Mon, 7 Feb 2011 01:03:21 +0000 (20:03 -0500)]
add to whenever config

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoscripts to ask/answer from email
David A. Cuadrado [Mon, 7 Feb 2011 01:02:07 +0000 (20:02 -0500)]
scripts to ask/answer from email

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Thu, 3 Feb 2011 00:22:47 +0000 (01:22 +0100)]
Localisation updates from translatewiki.net.

6 years agoFix broken specs and add more for answers answer-specs
Jorge H. Cuadrado [Sun, 6 Feb 2011 08:41:44 +0000 (03:41 -0500)]
Fix broken specs and add more for answers

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoAdded css for main content, the tabs for main content are working as should and the...
Francisco Rodriguez [Sun, 6 Feb 2011 03:58:37 +0000 (22:58 -0500)]
Added css for main content, the tabs for main content are working as should and the content too

Signed-off-by: Francisco Rodriguez <francisco.rodriguez@finario.com>
6 years agoFirst styles for User area - Logged
Francisco Rodriguez [Sun, 6 Feb 2011 00:51:46 +0000 (19:51 -0500)]
First styles for User area - Logged

Signed-off-by: Francisco Rodriguez <francisco.rodriguez@finario.com>
6 years agoFixes to the login menu
Francisco Rodriguez [Sat, 5 Feb 2011 20:45:06 +0000 (15:45 -0500)]
Fixes to the login menu

Signed-off-by: Francisco Rodriguez <francisco.rodriguez@finario.com>
6 years agoupdate more deps
David A. Cuadrado [Sat, 5 Feb 2011 17:51:46 +0000 (12:51 -0500)]
update more deps

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoMerge remote branch 'upstream/next' into ui
Francisco Rodriguez [Sat, 5 Feb 2011 16:43:48 +0000 (11:43 -0500)]
Merge remote branch 'upstream/next' into ui

6 years agoMerging with upstream
Francisco Rodriguez [Sat, 5 Feb 2011 16:43:45 +0000 (11:43 -0500)]
Merging with upstream

Signed-off-by: Francisco Rodriguez <francisco.rodriguez@finario.com>
6 years agoupdate mongoid
David A. Cuadrado [Sat, 5 Feb 2011 16:13:00 +0000 (11:13 -0500)]
update mongoid

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agocheck is votes are nil
Patrick Aljord [Sun, 30 Jan 2011 23:58:33 +0000 (18:58 -0500)]
check is votes are nil

6 years agoFirst version of the profile page - admin side
Francisco Rodriguez [Thu, 27 Jan 2011 05:12:45 +0000 (00:12 -0500)]
First version of the profile page - admin side

Signed-off-by: Francisco Rodriguez <francisco.rodriguez@finario.com>
6 years agoQuestion.update_last_target does not always set a value for last_target_date
Patrick Aljord [Wed, 26 Jan 2011 00:58:10 +0000 (19:58 -0500)]
Question.update_last_target does not always set a value for last_target_date
so use updated_at when last_target_date nil

6 years agosort languages on new questions page
Patrick Aljord [Mon, 24 Jan 2011 01:01:48 +0000 (20:01 -0500)]
sort languages on new questions page

6 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sat, 22 Jan 2011 19:04:44 +0000 (20:04 +0100)]
Localisation updates from translatewiki.net.

6 years agoMerge remote branch 'origin/answer-specs' into next
David A. Cuadrado [Sun, 23 Jan 2011 19:41:12 +0000 (14:41 -0500)]
Merge remote branch 'origin/answer-specs' into next

Conflicts:
Gemfile.lock

6 years agoupdate dependencies
David A. Cuadrado [Sun, 23 Jan 2011 18:07:12 +0000 (13:07 -0500)]
update dependencies

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoImplement some specs for answer
Jorge H. Cuadrado [Sun, 23 Jan 2011 07:24:49 +0000 (02:24 -0500)]
Implement some specs for answer

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoFix broken specs
Jorge H. Cuadrado [Sun, 23 Jan 2011 06:25:55 +0000 (01:25 -0500)]
Fix broken specs

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agouse machinist_mongo instead of fabrication
Jorge H. Cuadrado [Sun, 23 Jan 2011 06:02:21 +0000 (01:02 -0500)]
use machinist_mongo instead of fabrication

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoAdd template for answer model's specs
Jorge H. Cuadrado [Sun, 23 Jan 2011 01:05:53 +0000 (20:05 -0500)]
Add template for answer model's specs

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoadded ask_question widget
Patrick Aljord [Sat, 8 Jan 2011 05:18:28 +0000 (00:18 -0500)]
added ask_question widget
only show iframe preview for external widgets

6 years agoadded embedded widget preview
Patrick Aljord [Thu, 6 Jan 2011 07:00:06 +0000 (02:00 -0500)]
added embedded widget preview

6 years agoadded external widgets
Patrick Aljord [Tue, 4 Jan 2011 22:35:47 +0000 (17:35 -0500)]
added external widgets
makes it possible to turn any widget into an embedded one
each widget gets custom css and/or shapado css

6 years agosend email when admin logs in
Patrick Aljord [Thu, 30 Dec 2010 01:21:23 +0000 (20:21 -0500)]
send email when admin logs in

6 years agofix links to moderation page in flag notifier view
Patrick Aljord [Tue, 28 Dec 2010 07:34:15 +0000 (02:34 -0500)]
fix links to moderation page in flag notifier view

6 years agomissing view
Patrick Aljord [Tue, 28 Dec 2010 07:13:00 +0000 (02:13 -0500)]
missing view

6 years agoadded missing strings and updated notifiers to new formats
Patrick Aljord [Tue, 28 Dec 2010 07:06:18 +0000 (02:06 -0500)]
added missing strings and updated notifiers to new formats

6 years agofix i18n in header and footer of notifiers
Patrick Aljord [Tue, 28 Dec 2010 06:54:08 +0000 (01:54 -0500)]
fix i18n in header and footer of notifiers

6 years agomail mods and owners when a post is flagged
Patrick Aljord [Tue, 28 Dec 2010 06:26:06 +0000 (01:26 -0500)]
mail mods and owners when a post is flagged

6 years agoupdate mongoid
David A. Cuadrado [Mon, 17 Jan 2011 07:01:42 +0000 (02:01 -0500)]
update mongoid

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoreplace cronedit with whenever
David A. Cuadrado [Sat, 15 Jan 2011 22:39:34 +0000 (17:39 -0500)]
replace cronedit with whenever

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agothere is no need to mark the string as safe
David A. Cuadrado [Sat, 15 Jan 2011 22:09:21 +0000 (17:09 -0500)]
there is no need to mark the string as safe

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoreplace asset_packager with smart_asset
David A. Cuadrado [Sat, 15 Jan 2011 22:01:16 +0000 (17:01 -0500)]
replace asset_packager with smart_asset

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agofix javascript issues
David A. Cuadrado [Sat, 15 Jan 2011 22:00:57 +0000 (17:00 -0500)]
fix javascript issues

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoupdate relationships
David A. Cuadrado [Sat, 15 Jan 2011 21:36:32 +0000 (16:36 -0500)]
update relationships

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoupdating code to mongoid rc WIP
David A. Cuadrado [Sat, 15 Jan 2011 21:33:27 +0000 (16:33 -0500)]
updating code to mongoid rc WIP

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoupdate dependencies
David A. Cuadrado [Sat, 15 Jan 2011 21:21:46 +0000 (16:21 -0500)]
update dependencies

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Fri, 14 Jan 2011 10:59:57 +0000 (11:59 +0100)]
Localisation updates from translatewiki.net.

6 years agoMerge remote branch 'ui/ui' into next
David A. Cuadrado [Sat, 15 Jan 2011 20:38:34 +0000 (15:38 -0500)]
Merge remote branch 'ui/ui' into next

6 years agoMerge branch 'master' into next
David A. Cuadrado [Sat, 15 Jan 2011 20:35:19 +0000 (15:35 -0500)]
Merge branch 'master' into next

Conflicts:
app/controllers/answers_controller.rb
app/controllers/questions_controller.rb
app/controllers/users_controller.rb

6 years agoalways find questions and answers according to their group fix-commenting-on-same-slug
Patrick Aljord [Sat, 15 Jan 2011 00:48:57 +0000 (19:48 -0500)]
always find questions and answers according to their group

6 years agofix commenting on two questions with same slugs
Patrick Aljord [Fri, 14 Jan 2011 22:55:57 +0000 (17:55 -0500)]
fix commenting on two questions with same slugs
on two different groups

6 years agoAdding sass code for login box, adding just urls for icons while i get all the icons
Francisco Rodriguez [Fri, 14 Jan 2011 06:54:45 +0000 (01:54 -0500)]
Adding sass code for login box, adding just urls for icons while i get all the icons

Signed-off-by: Francisco Rodriguez <francisco.rodriguez@finario.com>
6 years agoMerge remote branch 'ui/ui' into next
David A. Cuadrado [Fri, 14 Jan 2011 06:04:33 +0000 (01:04 -0500)]
Merge remote branch 'ui/ui' into next

6 years agoAdded some fixes for question output, and for comments
Francisco Rodriguez [Tue, 11 Jan 2011 04:29:29 +0000 (23:29 -0500)]
Added some fixes for question output, and for comments

Signed-off-by: Francisco Rodriguez <francisco.rodriguez@finario.com>
6 years agoMerge branch 'next' of gitorious.org:shapado/shapado into next
Patrick Aljord [Tue, 28 Dec 2010 05:42:08 +0000 (00:42 -0500)]
Merge branch 'next' of gitorious.org:shapado/shapado into next

6 years agoadded task to update groups notification configs
Patrick Aljord [Tue, 28 Dec 2010 05:41:02 +0000 (00:41 -0500)]
added task to update groups notification configs

6 years agoChange behavior of quick question box: next-quick-question
Jorge H. Cuadrado [Mon, 27 Dec 2010 08:13:37 +0000 (03:13 -0500)]
Change behavior of quick question box:
- Redirect to questions#new with the text entered as a question title

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoFix show a closed question and open questions
Jorge H. Cuadrado [Fri, 24 Dec 2010 08:23:23 +0000 (03:23 -0500)]
Fix show a closed question and open questions

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoFix Questions#new view
Jorge H. Cuadrado [Fri, 24 Dec 2010 07:56:00 +0000 (02:56 -0500)]
Fix Questions#new view

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoFix showing 'request close question' form
Jorge H. Cuadrado [Fri, 24 Dec 2010 07:41:53 +0000 (02:41 -0500)]
Fix showing 'request close question' form

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agoFix follow question with ajax
Jorge H. Cuadrado [Fri, 24 Dec 2010 07:04:25 +0000 (02:04 -0500)]
Fix follow question with ajax

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
6 years agofix calling follower? without a question
Patrick Aljord [Fri, 24 Dec 2010 06:21:00 +0000 (01:21 -0500)]
fix calling follower? without a question

6 years agoadded auth_providers.yml sample
Patrick Aljord [Fri, 24 Dec 2010 06:15:33 +0000 (01:15 -0500)]
added auth_providers.yml sample

6 years agomissing i18n string for connecting group to twitter
Patrick Aljord [Fri, 24 Dec 2010 05:55:04 +0000 (00:55 -0500)]
missing i18n string for connecting group to twitter

6 years agoMerge remote branch 'origin/post-to-twitter' into next
David A. Cuadrado [Fri, 24 Dec 2010 03:54:33 +0000 (22:54 -0500)]
Merge remote branch 'origin/post-to-twitter' into next

6 years agoactually send the tweets
Patrick Aljord [Thu, 23 Dec 2010 09:05:14 +0000 (04:05 -0500)]
actually send the tweets

6 years agoadded GroupNotificationConfig to send activities to twitter (or else)
Patrick Aljord [Thu, 23 Dec 2010 01:42:55 +0000 (20:42 -0500)]
added GroupNotificationConfig to send activities to twitter (or else)

6 years agoallow user to send tweets on each answers and comments
Patrick Aljord [Mon, 20 Dec 2010 05:54:55 +0000 (00:54 -0500)]
allow user to send tweets on each answers and comments

6 years agofix nil error when there is no value
Patrick Aljord [Mon, 20 Dec 2010 05:03:37 +0000 (00:03 -0500)]
fix nil error when there is no value