shapado:shapado.git
7 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>
7 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>
7 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>
7 years agocheck is votes are nil
Patrick Aljord [Sun, 30 Jan 2011 23:58:33 +0000 (18:58 -0500)]
check is votes are nil

7 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

7 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

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

7 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

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

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

7 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

7 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

7 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

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

7 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

7 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

7 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

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

7 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

7 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

7 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

7 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

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

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

7 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

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

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

7 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

7 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

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

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

7 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

7 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

7 years agoadd a twitter client method to Group
Patrick Aljord [Mon, 20 Dec 2010 01:31:56 +0000 (20:31 -0500)]
add a twitter client method to Group

7 years agoallow connecting a twitter account to a group
Patrick Aljord [Mon, 29 Nov 2010 18:23:50 +0000 (13:23 -0500)]
allow connecting a twitter account to a group

7 years agoadded twitter account config view for group
Patrick Aljord [Tue, 23 Nov 2010 22:28:52 +0000 (17:28 -0500)]
added twitter account config view for group

7 years agomoved subtab share to its own Social tab
Patrick Aljord [Mon, 22 Nov 2010 04:19:17 +0000 (23:19 -0500)]
moved subtab share to its own Social tab

7 years agoremove support for dlvr.it
Patrick Aljord [Fri, 19 Nov 2010 07:15:29 +0000 (02:15 -0500)]
remove support for dlvr.it

7 years agofix edit answer
David A. Cuadrado [Tue, 21 Dec 2010 21:46:02 +0000 (16:46 -0500)]
fix edit answer

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoRemove unused file
Jorge H. Cuadrado [Mon, 20 Dec 2010 08:35:13 +0000 (03:35 -0500)]
Remove unused file

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoFix asking questions, commenting answer and questions
Jorge H. Cuadrado [Mon, 20 Dec 2010 08:34:23 +0000 (03:34 -0500)]
Fix asking questions, commenting answer and questions

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agofix showing flag form
Jorge H. Cuadrado [Mon, 20 Dec 2010 06:11:46 +0000 (01:11 -0500)]
fix showing flag form

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoupdate gemfile
David A. Cuadrado [Mon, 20 Dec 2010 02:57:09 +0000 (21:57 -0500)]
update gemfile

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agofix more widgets
David A. Cuadrado [Mon, 20 Dec 2010 02:49:08 +0000 (21:49 -0500)]
fix more widgets

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agofix answer html
David A. Cuadrado [Mon, 20 Dec 2010 02:27:09 +0000 (21:27 -0500)]
fix answer html

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agofix groups widget
David A. Cuadrado [Mon, 20 Dec 2010 02:25:22 +0000 (21:25 -0500)]
fix groups widget

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agofix tag cloud widget
David A. Cuadrado [Mon, 20 Dec 2010 02:16:01 +0000 (21:16 -0500)]
fix tag cloud widget

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agofix pages widget
David A. Cuadrado [Mon, 20 Dec 2010 02:08:03 +0000 (21:08 -0500)]
fix pages widget

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoextract i18n keys that can be customized
David A. Cuadrado [Mon, 20 Dec 2010 01:55:40 +0000 (20:55 -0500)]
extract i18n keys that can be customized

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoadd admin links to main layout
David A. Cuadrado [Sun, 19 Dec 2010 18:30:48 +0000 (13:30 -0500)]
add admin links to main layout

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoupdate some forms
David A. Cuadrado [Sun, 19 Dec 2010 18:23:37 +0000 (13:23 -0500)]
update some forms

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoupdate rails
David A. Cuadrado [Sun, 19 Dec 2010 18:11:53 +0000 (13:11 -0500)]
update rails

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoupdate devise and fix user/password authentication
David A. Cuadrado [Sun, 19 Dec 2010 17:56:27 +0000 (12:56 -0500)]
update devise and fix user/password authentication

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agofix warning
David A. Cuadrado [Sun, 19 Dec 2010 00:51:29 +0000 (19:51 -0500)]
fix warning

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

7 years agoMerge remote branch 'origin/next' into next
David A. Cuadrado [Sun, 19 Dec 2010 00:39:02 +0000 (19:39 -0500)]
Merge remote branch 'origin/next' into next

7 years agoimplement saved searches(filters)
David A. Cuadrado [Sun, 19 Dec 2010 00:38:29 +0000 (19:38 -0500)]
implement saved searches(filters)

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoImplement some specs for user model
Jorge H. Cuadrado [Sun, 19 Dec 2010 00:27:17 +0000 (19:27 -0500)]
Implement some specs for user model

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoMerge remote branch 'ui/ui' into next
David A. Cuadrado [Sat, 18 Dec 2010 22:06:40 +0000 (17:06 -0500)]
Merge remote branch 'ui/ui' into next

7 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Thu, 16 Dec 2010 15:23:15 +0000 (16:23 +0100)]
Localisation updates from translatewiki.net.

7 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Thu, 16 Dec 2010 15:23:15 +0000 (16:23 +0100)]
Localisation updates from translatewiki.net.

7 years agoActions forms on question view updated with the new forms css
Francisco Rodriguez [Thu, 16 Dec 2010 07:12:18 +0000 (02:12 -0500)]
Actions forms on question view updated with the new forms css

Signed-off-by: Francisco Rodriguez <dgfranciscorodriguez@gmail.com>
7 years agoupdate css class
David A. Cuadrado [Thu, 16 Dec 2010 06:16:04 +0000 (01:16 -0500)]
update css class

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoMerge remote branch 'ui/ui' into next
David A. Cuadrado [Thu, 16 Dec 2010 06:14:08 +0000 (01:14 -0500)]
Merge remote branch 'ui/ui' into next

7 years agohighlight all tokens
David A. Cuadrado [Thu, 16 Dec 2010 06:13:34 +0000 (01:13 -0500)]
highlight all tokens

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoAdding general CSS for forms elements
Francisco Rodriguez [Thu, 16 Dec 2010 05:53:25 +0000 (00:53 -0500)]
Adding general CSS for forms elements

Signed-off-by: Francisco Rodriguez <dgfranciscorodriguez@gmail.com>
7 years agoimprove search results
David A. Cuadrado [Thu, 16 Dec 2010 04:01:48 +0000 (23:01 -0500)]
improve search results

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agolink ask question button too
David A. Cuadrado [Thu, 16 Dec 2010 01:53:59 +0000 (20:53 -0500)]
link ask question button too

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agomake search and answer buttons work
David A. Cuadrado [Thu, 16 Dec 2010 01:52:48 +0000 (20:52 -0500)]
make search and answer buttons work

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoMerge branch 'master' into next
David A. Cuadrado [Thu, 16 Dec 2010 01:47:38 +0000 (20:47 -0500)]
Merge branch 'master' into next

Conflicts:
README
app/controllers/application_controller.rb
app/controllers/oauth_controller.rb
app/controllers/users_controller.rb
app/helpers/application_helper.rb
app/models/group.rb
app/models/user.rb
config/environment.rb
config/initializers/geoip.rb
config/routes.rb
config/unicorn/unicorn.rb
script/update_geoip
vendor/plugins/open_id_authentication/lib/open_id_authentication/association.rb
vendor/plugins/open_id_authentication/lib/open_id_authentication/nonce.rb

7 years agoMerge remote branch 'ui/ui' into next
David A. Cuadrado [Thu, 16 Dec 2010 01:24:17 +0000 (20:24 -0500)]
Merge remote branch 'ui/ui' into next

7 years agoCReate New, Edit and follow up in place, and some fixes for action panels and tags...
Francisco Rodriguez [Wed, 15 Dec 2010 07:15:21 +0000 (02:15 -0500)]
CReate New, Edit and follow up in place, and some fixes for action panels and tags autocomplete and retag

Signed-off-by: Francisco Rodriguez <dgfranciscorodriguez@gmail.com>
7 years agoupdate search module
David A. Cuadrado [Wed, 15 Dec 2010 05:34:53 +0000 (00:34 -0500)]
update search module

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoupdate import script
David A. Cuadrado [Wed, 15 Dec 2010 01:34:41 +0000 (20:34 -0500)]
update import script

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agofix share-question-on panel
David A. Cuadrado [Sat, 11 Dec 2010 14:37:56 +0000 (09:37 -0500)]
fix share-question-on panel

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoMerge remote branch 'ui/ui' into next
David A. Cuadrado [Thu, 9 Dec 2010 05:52:33 +0000 (00:52 -0500)]
Merge remote branch 'ui/ui' into next

7 years agoRetag system in place, the x button for each tag removes all the form + all the tags...
Francisco Rodriguez [Tue, 7 Dec 2010 05:11:30 +0000 (00:11 -0500)]
Retag system in place, the x button for each tag removes all the form + all the tags; and the save buttons seems not working as should it be

Signed-off-by: Francisco Rodriguez <dgfranciscorodriguez@gmail.com>
7 years agoFix magent jobs for Votes next-votes
Jorge H. Cuadrado [Tue, 7 Dec 2010 04:53:24 +0000 (23:53 -0500)]
Fix magent jobs for Votes

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoMerge remote branch 'origin/next' into next-votes
Jorge H. Cuadrado [Tue, 7 Dec 2010 04:52:52 +0000 (23:52 -0500)]
Merge remote branch 'origin/next' into next-votes

7 years agofix i10n string
Patrick Aljord [Tue, 7 Dec 2010 00:21:17 +0000 (19:21 -0500)]
fix i10n string