shapado:dgfranciscos-shapado.git
7 years agoadded task to update widgets widgetization
Patrick Aljord [Mon, 8 Nov 2010 05:43:51 +0000 (00:43 -0500)]
added task to update widgets
run rake fixdb:update_questions_widgets or rake fixall

7 years agoturn the sidebar into a set of widgets
Patrick Aljord [Sat, 6 Nov 2010 20:58:52 +0000 (15:58 -0500)]
turn the sidebar into a set of widgets

7 years agoMerge remote branch 'i18n/master' into next
Patrick Aljord [Sun, 7 Nov 2010 21:40:07 +0000 (16:40 -0500)]
Merge remote branch 'i18n/master' into next

7 years agoMerge remote branch 'i18n/master'
Patrick Aljord [Sun, 7 Nov 2010 21:20:43 +0000 (16:20 -0500)]
Merge remote branch 'i18n/master'

7 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 7 Nov 2010 21:03:08 +0000 (22:03 +0100)]
Localisation updates from translatewiki.net.

7 years agoFix creating comments and creating answers next-comments-rebased
Jorge H. Cuadrado [Sat, 6 Nov 2010 23:56:49 +0000 (18:56 -0500)]
Fix creating comments and creating answers

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoComments(EmbeddedDocument) can be localized
Jorge H. Cuadrado [Sat, 6 Nov 2010 23:00:50 +0000 (18:00 -0500)]
Comments(EmbeddedDocument) can be localized

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoFix creating commets
Jorge H. Cuadrado [Mon, 1 Nov 2010 07:31:28 +0000 (02:31 -0500)]
Fix creating commets

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agofinish converting comments to EmbeddedDocument
Jorge H. Cuadrado [Mon, 1 Nov 2010 07:09:16 +0000 (02:09 -0500)]
finish converting comments to EmbeddedDocument

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoconvert comments to EmbeddedDocument [WIP]
Jorge H. Cuadrado [Sun, 31 Oct 2010 01:20:58 +0000 (20:20 -0500)]
convert comments to EmbeddedDocument [WIP]

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoresolve conflict
David A. Cuadrado [Sat, 6 Nov 2010 20:16:41 +0000 (15:16 -0500)]
resolve conflict

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

Conflicts:
Gemfile.lock

7 years agolock devise revision until it get more stable
David A. Cuadrado [Sat, 6 Nov 2010 20:12:34 +0000 (15:12 -0500)]
lock devise revision until it get more stable

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agomove sending emails to magent jobs(Jobs::Mailer) next-magent-mailer
Jorge H. Cuadrado [Sat, 6 Nov 2010 19:02:39 +0000 (14:02 -0500)]
move sending emails to magent jobs(Jobs::Mailer)

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agodisable font warnings
David A. Cuadrado [Sat, 6 Nov 2010 18:37:38 +0000 (13:37 -0500)]
disable font warnings

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoupdate deps
David A. Cuadrado [Sat, 6 Nov 2010 07:56:36 +0000 (02:56 -0500)]
update deps

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoMerge remote branch 'origin/next-mailer-notification-footer' into next
David A. Cuadrado [Sat, 6 Nov 2010 06:56:25 +0000 (01:56 -0500)]
Merge remote branch 'origin/next-mailer-notification-footer' into next

7 years agoFix user settings link for notification's footer next-mailer-notification-footer
Jorge H. Cuadrado [Sat, 6 Nov 2010 06:52:41 +0000 (01:52 -0500)]
Fix user settings link for notification's footer

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agothos comments are no longer valid
David A. Cuadrado [Sat, 6 Nov 2010 06:28:34 +0000 (01:28 -0500)]
thos comments are no longer valid

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agomove all.json to data/ and geo_common.rb to shapado/models/geo_common.rb, also conver...
David A. Cuadrado [Sat, 6 Nov 2010 06:13:39 +0000 (01:13 -0500)]
move all.json to data/ and geo_common.rb to shapado/models/geo_common.rb, also converted it into active support concern

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoFix user settings link for notification's footer backport-fix-mailer
Jorge H. Cuadrado [Sat, 6 Nov 2010 06:10:02 +0000 (01:10 -0500)]
Fix user settings link for notification's footer

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoMerge remote branch 'origin/html5-geo' into next
David A. Cuadrado [Sat, 6 Nov 2010 06:06:26 +0000 (01:06 -0500)]
Merge remote branch 'origin/html5-geo' into next

7 years agoadd geo_position model html5-geo
Patrick Aljord [Sat, 6 Nov 2010 06:05:01 +0000 (01:05 -0500)]
add geo_position model

7 years agoMerge remote branch 'origin/html5-geo' into next
David A. Cuadrado [Sat, 6 Nov 2010 06:00:06 +0000 (01:00 -0500)]
Merge remote branch 'origin/html5-geo' into next

7 years agoadd nominatim
Patrick Aljord [Sat, 6 Nov 2010 05:58:17 +0000 (00:58 -0500)]
add nominatim

7 years agoMerge remote branch 'origin/html5-geo' into next
David A. Cuadrado [Sat, 6 Nov 2010 05:36:16 +0000 (00:36 -0500)]
Merge remote branch 'origin/html5-geo' into next

7 years agoMerge branch 'master' into next
David A. Cuadrado [Sat, 6 Nov 2010 05:20:44 +0000 (00:20 -0500)]
Merge branch 'master' into next

Conflicts:
.gitignore
app/controllers/groups_controller.rb
app/helpers/application_helper.rb
app/models/notifier.rb
app/views/answers/show.html.haml
app/views/pages/show.html.haml
app/views/questions/show.html.haml
config/environments/production.rb
config/locales/groups/en.yml
public/javascripts/jsMath/easy/load.js

7 years agoadd helper to include latex
David A. Cuadrado [Sat, 6 Nov 2010 04:56:50 +0000 (23:56 -0500)]
add helper to include latex

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agouse :strict to render markdown
David A. Cuadrado [Sat, 6 Nov 2010 04:46:50 +0000 (23:46 -0500)]
use :strict to render markdown

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoadd initializer to install jsfonts automatically
David A. Cuadrado [Sat, 6 Nov 2010 04:36:35 +0000 (23:36 -0500)]
add initializer to install jsfonts automatically

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoadd jsmath fonts
David A. Cuadrado [Sat, 6 Nov 2010 04:26:26 +0000 (23:26 -0500)]
add jsmath fonts

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoupdate jsMath
David A. Cuadrado [Fri, 5 Nov 2010 06:14:47 +0000 (01:14 -0500)]
update jsMath

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoonly ask for location when focus on textarea
Patrick Aljord [Sat, 6 Nov 2010 01:18:04 +0000 (20:18 -0500)]
only ask for location when focus on textarea

7 years agoadded tab "Near you" to Users#index
Patrick Aljord [Sat, 6 Nov 2010 00:56:52 +0000 (19:56 -0500)]
added tab "Near you" to Users#index

7 years agoadd reloacte task to fixall
Patrick Aljord [Fri, 5 Nov 2010 23:31:40 +0000 (18:31 -0500)]
add reloacte task to fixall

7 years agoupdate user location on posting
Patrick Aljord [Fri, 5 Nov 2010 07:50:20 +0000 (02:50 -0500)]
update user location on posting

7 years agotask to update all posts positions and add geolocal to users too
Patrick Aljord [Fri, 5 Nov 2010 07:40:46 +0000 (02:40 -0500)]
task to update all posts positions and add geolocal to users too

Run: rake fixdb:relocate

7 years agoremove geoip
Patrick Aljord [Fri, 5 Nov 2010 05:28:16 +0000 (00:28 -0500)]
remove geoip

7 years agouse html5 geo and nominatim for geolocal
Patrick Aljord [Wed, 3 Nov 2010 07:32:08 +0000 (02:32 -0500)]
use html5 geo and nominatim for geolocal

7 years agoMerge branch 'master' of gitorious.org:shapado/shapado
Patrick Aljord [Fri, 5 Nov 2010 08:24:41 +0000 (03:24 -0500)]
Merge branch 'master' of gitorious.org:shapado/shapado

7 years agoFix typo in LaTeX.
Siebrand Mazeland [Fri, 5 Nov 2010 07:09:32 +0000 (08:09 +0100)]
Fix typo in LaTeX.

7 years agoignore js packages
David A. Cuadrado [Fri, 5 Nov 2010 05:43:55 +0000 (00:43 -0500)]
ignore js packages

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoMerge remote branch 'origin/fix-history-link' into next
David A. Cuadrado [Fri, 5 Nov 2010 05:22:48 +0000 (00:22 -0500)]
Merge remote branch 'origin/fix-history-link' into next

7 years agoload assets from main site on production
David A. Cuadrado [Thu, 4 Nov 2010 06:20:51 +0000 (01:20 -0500)]
load assets from main site on production

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoload assets from main site on production
David A. Cuadrado [Thu, 4 Nov 2010 06:00:49 +0000 (01:00 -0500)]
load assets from main site on production

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agobump version
David A. Cuadrado [Wed, 3 Nov 2010 07:38:14 +0000 (02:38 -0500)]
bump version

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoadd i18n strings
David A. Cuadrado [Wed, 3 Nov 2010 07:36:08 +0000 (02:36 -0500)]
add i18n strings

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
Conflicts:

app/controllers/groups_controller.rb

7 years agouse html_safe on Versionable#diff fix-history-link
Jorge H. Cuadrado [Wed, 3 Nov 2010 07:35:06 +0000 (02:35 -0500)]
use html_safe on Versionable#diff

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoFix history link
Jorge H. Cuadrado [Wed, 3 Nov 2010 07:29:55 +0000 (02:29 -0500)]
Fix history link

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoFix history link
Jorge H. Cuadrado [Wed, 3 Nov 2010 07:29:55 +0000 (02:29 -0500)]
Fix history link

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoMerge remote branch 'origin/backport'
David A. Cuadrado [Wed, 3 Nov 2010 07:30:40 +0000 (02:30 -0500)]
Merge remote branch 'origin/backport'

7 years agoFix history link backport
Jorge H. Cuadrado [Wed, 3 Nov 2010 07:29:55 +0000 (02:29 -0500)]
Fix history link

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoadd i18n strings
David A. Cuadrado [Wed, 3 Nov 2010 07:29:48 +0000 (02:29 -0500)]
add i18n strings

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agolatex is optional now
David A. Cuadrado [Wed, 3 Nov 2010 07:29:36 +0000 (02:29 -0500)]
latex is optional now

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
Conflicts:

app/views/pages/show.html.haml

7 years agofix mailer on custom domains
David A. Cuadrado [Mon, 1 Nov 2010 00:31:28 +0000 (19:31 -0500)]
fix mailer on custom domains

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoMerge remote branch 'origin/fix-subdomain-on-create' into next
David A. Cuadrado [Wed, 3 Nov 2010 06:52:00 +0000 (01:52 -0500)]
Merge remote branch 'origin/fix-subdomain-on-create' into next

7 years agofix reports
Patrick Aljord [Mon, 1 Nov 2010 04:51:58 +0000 (23:51 -0500)]
fix reports

7 years agofix /badges.json
Patrick Aljord [Mon, 1 Nov 2010 23:38:41 +0000 (18:38 -0500)]
fix /badges.json

7 years agoset subdomain before creatrion
Patrick Aljord [Wed, 3 Nov 2010 01:28:56 +0000 (20:28 -0500)]
set subdomain before creatrion

7 years agoset subdomain before creatrion fix-subdomain-on-create
Patrick Aljord [Wed, 3 Nov 2010 01:28:56 +0000 (20:28 -0500)]
set subdomain before creatrion

7 years agofollow/unfollow question
David A. Cuadrado [Tue, 2 Nov 2010 06:32:15 +0000 (01:32 -0500)]
follow/unfollow question

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agodo not escape html
David A. Cuadrado [Tue, 2 Nov 2010 05:47:55 +0000 (00:47 -0500)]
do not escape html

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agolatex is optional now
David A. Cuadrado [Tue, 2 Nov 2010 05:42:50 +0000 (00:42 -0500)]
latex is optional now

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoadd api to list comments
David A. Cuadrado [Tue, 2 Nov 2010 05:37:58 +0000 (00:37 -0500)]
add api to list comments

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoadd api to list answers
David A. Cuadrado [Tue, 2 Nov 2010 05:35:07 +0000 (00:35 -0500)]
add api to list answers

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agofix router
David A. Cuadrado [Tue, 2 Nov 2010 05:34:43 +0000 (00:34 -0500)]
fix router

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoadded missing coma to tasks list
Patrick Aljord [Tue, 2 Nov 2010 01:13:12 +0000 (20:13 -0500)]
added missing coma to tasks list

7 years agofix syntax error
David A. Cuadrado [Tue, 2 Nov 2010 01:05:30 +0000 (20:05 -0500)]
fix syntax error

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoMerge remote branch 'origin/badges-index-fix' into next
David A. Cuadrado [Tue, 2 Nov 2010 00:17:55 +0000 (19:17 -0500)]
Merge remote branch 'origin/badges-index-fix' into next

7 years agofix /badges.json badges-index-fix
Patrick Aljord [Mon, 1 Nov 2010 23:38:41 +0000 (18:38 -0500)]
fix /badges.json

7 years agoImprove moderate questions moderate-next
Jorge H. Cuadrado [Mon, 4 Oct 2010 06:47:34 +0000 (01:47 -0500)]
Improve moderate questions

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoSplit moderate controller in users, questions and answers controllers
Jorge H. Cuadrado [Sun, 3 Oct 2010 00:28:50 +0000 (19:28 -0500)]
Split moderate controller in users, questions and answers controllers

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agolanguage is required now
David A. Cuadrado [Mon, 1 Nov 2010 06:21:48 +0000 (01:21 -0500)]
language is required now

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agomake use of the group languages
David A. Cuadrado [Mon, 1 Nov 2010 06:20:38 +0000 (01:20 -0500)]
make use of the group languages

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agotask to update groups
David A. Cuadrado [Mon, 1 Nov 2010 06:12:05 +0000 (01:12 -0500)]
task to update groups

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agothe group should select the supported languages
David A. Cuadrado [Mon, 1 Nov 2010 05:53:56 +0000 (00:53 -0500)]
the group should select the supported languages

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agofix link
David A. Cuadrado [Mon, 1 Nov 2010 05:18:08 +0000 (00:18 -0500)]
fix link

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoMerge remote branch 'origin/notifiers-next' into next
David A. Cuadrado [Mon, 1 Nov 2010 04:56:17 +0000 (23:56 -0500)]
Merge remote branch 'origin/notifiers-next' into next

7 years agofix reports notifiers-next
Patrick Aljord [Mon, 1 Nov 2010 04:51:58 +0000 (23:51 -0500)]
fix reports

7 years agoMerge remote branch 'origin/notifiers-next' into next
David A. Cuadrado [Mon, 1 Nov 2010 04:40:45 +0000 (23:40 -0500)]
Merge remote branch 'origin/notifiers-next' into next

7 years agorenamed text plain email templates to new rails 3 format
Patrick Aljord [Mon, 1 Nov 2010 04:39:42 +0000 (23:39 -0500)]
renamed text plain email templates to new rails 3 format

7 years agoMerge remote branch 'origin/notifiers-next' into next
David A. Cuadrado [Mon, 1 Nov 2010 04:28:56 +0000 (23:28 -0500)]
Merge remote branch 'origin/notifiers-next' into next

7 years agoadded i18n_action_mailer plugin
Patrick Aljord [Mon, 1 Nov 2010 04:25:57 +0000 (23:25 -0500)]
added i18n_action_mailer plugin

7 years agomake notifiers again
Patrick Aljord [Mon, 1 Nov 2010 01:41:17 +0000 (20:41 -0500)]
make notifiers again

7 years agocode cleanup
David A. Cuadrado [Mon, 1 Nov 2010 04:19:06 +0000 (23:19 -0500)]
code cleanup

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agocleanup layout markup
David A. Cuadrado [Mon, 1 Nov 2010 04:16:49 +0000 (23:16 -0500)]
cleanup layout markup

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agowe don't need this plugin anymore
David A. Cuadrado [Mon, 1 Nov 2010 04:08:01 +0000 (23:08 -0500)]
we don't need this plugin anymore

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agorender tag cloud correctly
David A. Cuadrado [Mon, 1 Nov 2010 03:30:45 +0000 (22:30 -0500)]
render tag cloud correctly

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoescape strings by default
David A. Cuadrado [Mon, 1 Nov 2010 02:29:50 +0000 (21:29 -0500)]
escape strings by default

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agofix some views
David A. Cuadrado [Mon, 1 Nov 2010 01:50:51 +0000 (20:50 -0500)]
fix some views

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agofix routes on user profile
David A. Cuadrado [Mon, 1 Nov 2010 01:46:13 +0000 (20:46 -0500)]
fix routes on user profile

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agofix User#following?
David A. Cuadrado [Mon, 1 Nov 2010 01:38:59 +0000 (20:38 -0500)]
fix User#following?

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agomake latex work on custom pages
David A. Cuadrado [Mon, 1 Nov 2010 00:42:29 +0000 (19:42 -0500)]
make latex work on custom pages

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agodon't give badges to admin
David A. Cuadrado [Mon, 1 Nov 2010 00:39:15 +0000 (19:39 -0500)]
don't give badges to admin

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agofix mailer on custom domains
David A. Cuadrado [Mon, 1 Nov 2010 00:31:28 +0000 (19:31 -0500)]
fix mailer on custom domains

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agorefactor application controller
David A. Cuadrado [Sun, 31 Oct 2010 23:12:31 +0000 (18:12 -0500)]
refactor application controller

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoMerge remote branch 'origin/widgets' into next
David A. Cuadrado [Sun, 31 Oct 2010 18:08:01 +0000 (13:08 -0500)]
Merge remote branch 'origin/widgets' into next

7 years agoupdate deps
David A. Cuadrado [Sun, 31 Oct 2010 17:46:29 +0000 (12:46 -0500)]
update deps

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agomake widgets configurable
Patrick Aljord [Sun, 31 Oct 2010 04:05:03 +0000 (23:05 -0500)]
make widgets configurable

7 years agowebsocket example
David A. Cuadrado [Sun, 31 Oct 2010 04:49:02 +0000 (23:49 -0500)]
websocket example

Signed-off-by: David A. Cuadrado <krawek@gmail.com>