shapado:dgfranciscos-shapado.git
7 years agoMerge remote branch 'origin/mongoid-specs' into mongoid mongoid
David A. Cuadrado [Tue, 9 Nov 2010 05:07:32 +0000 (00:07 -0500)]
Merge remote branch 'origin/mongoid-specs' into mongoid

7 years agodo not use Boolean.to_mongo
David A. Cuadrado [Tue, 9 Nov 2010 04:58:21 +0000 (23:58 -0500)]
do not use Boolean.to_mongo

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoAdd more specs for questions
Jorge H. Cuadrado [Mon, 8 Nov 2010 02:06:43 +0000 (21:06 -0500)]
Add more specs for questions

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoFix broken specs
Jorge H. Cuadrado [Sun, 7 Nov 2010 08:23:40 +0000 (03:23 -0500)]
Fix broken specs

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoAdd specs some for question model
Jorge H. Cuadrado [Sun, 7 Nov 2010 08:01:07 +0000 (03:01 -0500)]
Add specs some for question model

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agofix unanswered index
David A. Cuadrado [Sun, 7 Nov 2010 07:55:05 +0000 (02:55 -0500)]
fix unanswered index

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agofix badges index
David A. Cuadrado [Sun, 7 Nov 2010 07:53:28 +0000 (02:53 -0500)]
fix badges index

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agofix users index
David A. Cuadrado [Sun, 7 Nov 2010 07:52:13 +0000 (02:52 -0500)]
fix users index

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoresolve a couple of issues with mongoid
David A. Cuadrado [Sun, 7 Nov 2010 06:50:26 +0000 (01:50 -0500)]
resolve a couple of issues with mongoid

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoadd monkey patch to exclude the given fields
David A. Cuadrado [Sun, 7 Nov 2010 06:46:08 +0000 (01:46 -0500)]
add monkey patch to exclude the given fields

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agofix logo
David A. Cuadrado [Sun, 7 Nov 2010 05:37:03 +0000 (00:37 -0500)]
fix logo

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agofix widget settings
David A. Cuadrado [Sun, 7 Nov 2010 05:29:26 +0000 (00:29 -0500)]
fix widget settings

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoshow question is now working
David A. Cuadrado [Sun, 7 Nov 2010 05:08:14 +0000 (00:08 -0500)]
show question is now working

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

7 years agoadd factory for answers
Jorge H. Cuadrado [Sun, 7 Nov 2010 04:56:00 +0000 (23:56 -0500)]
add factory for answers

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agowelcolme is working now
David A. Cuadrado [Sun, 7 Nov 2010 04:49:49 +0000 (23:49 -0500)]
welcolme is working now

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoAdd factories for user, group and question models
Jorge H. Cuadrado [Sun, 7 Nov 2010 04:26:04 +0000 (23:26 -0500)]
Add factories for user, group and question models

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoinitialize the memberships list automatically
David A. Cuadrado [Sun, 7 Nov 2010 04:19:46 +0000 (23:19 -0500)]
initialize the memberships list automatically

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agofix many things in users and groups
David A. Cuadrado [Sun, 7 Nov 2010 04:15:44 +0000 (23:15 -0500)]
fix many things in users and groups

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agofix user keys
David A. Cuadrado [Sun, 7 Nov 2010 02:54:52 +0000 (21:54 -0500)]
fix user keys

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoadd some extensions for rspec and mongoid
David A. Cuadrado [Sun, 7 Nov 2010 01:58:58 +0000 (20:58 -0500)]
add some extensions for rspec and mongoid

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoremove old specs
David A. Cuadrado [Sun, 7 Nov 2010 01:50:01 +0000 (20:50 -0500)]
remove old specs

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoconfigure rspec
David A. Cuadrado [Sun, 7 Nov 2010 01:40:59 +0000 (20:40 -0500)]
configure rspec

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoadd rspec 2
David A. Cuadrado [Sun, 7 Nov 2010 01:38:18 +0000 (20:38 -0500)]
add rspec 2

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoMerge remote branch 'origin/kdrx-mongoid' into mongoid
David A. Cuadrado [Sun, 7 Nov 2010 01:35:33 +0000 (20:35 -0500)]
Merge remote branch 'origin/kdrx-mongoid' into mongoid

7 years agobugfixes
David A. Cuadrado [Sun, 7 Nov 2010 01:35:22 +0000 (20:35 -0500)]
bugfixes

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agorename set modifier to overwrite #mongoid kdrx-mongoid
Jorge H. Cuadrado [Sun, 7 Nov 2010 01:34:46 +0000 (20:34 -0500)]
rename set modifier to overwrite #mongoid

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agobugfixes
David A. Cuadrado [Sun, 7 Nov 2010 01:07:40 +0000 (20:07 -0500)]
bugfixes

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoFix some validations mongoid-merged
Jorge H. Cuadrado [Sun, 7 Nov 2010 00:59:16 +0000 (19:59 -0500)]
Fix some validations

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoport answers and comments
Jorge H. Cuadrado [Sun, 7 Nov 2010 00:51:15 +0000 (19:51 -0500)]
port answers and comments

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoMerge remote branch 'origin/next' into mongoid mongid-merged
Jorge H. Cuadrado [Sun, 7 Nov 2010 00:34:49 +0000 (19:34 -0500)]
Merge remote branch 'origin/next' into mongoid

Conflicts:
app/models/answer.rb
app/models/comment.rb
app/models/question.rb

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 agoupdate validations
David A. Cuadrado [Sat, 6 Nov 2010 23:32:15 +0000 (18:32 -0500)]
update validations

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoport group model
David A. Cuadrado [Sat, 6 Nov 2010 23:31:28 +0000 (18:31 -0500)]
port group model

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoport memberships model and fix some validations
David A. Cuadrado [Sat, 6 Nov 2010 23:23:43 +0000 (18:23 -0500)]
port memberships model and fix some validations

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agobelongs_to => referenced_in
David A. Cuadrado [Sat, 6 Nov 2010 23:06:04 +0000 (18:06 -0500)]
belongs_to => referenced_in

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoport more models to mongoid
David A. Cuadrado [Sat, 6 Nov 2010 23:01:56 +0000 (18:01 -0500)]
port more models to mongoid

Signed-off-by: David A. Cuadrado <krawek@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 agoMerge remote branch 'origin/kdrx-mongoid' into mongoid
David A. Cuadrado [Sat, 6 Nov 2010 22:39:29 +0000 (17:39 -0500)]
Merge remote branch 'origin/kdrx-mongoid' into mongoid

7 years agoport questions
Jorge H. Cuadrado [Sat, 6 Nov 2010 22:39:01 +0000 (17:39 -0500)]
port questions

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoporting more models WIP
David A. Cuadrado [Sat, 6 Nov 2010 22:37:33 +0000 (17:37 -0500)]
porting more models WIP

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoupdate more models
David A. Cuadrado [Sat, 6 Nov 2010 22:29:16 +0000 (17:29 -0500)]
update more models

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoconvert all pks
David A. Cuadrado [Sat, 6 Nov 2010 22:21:20 +0000 (17:21 -0500)]
convert all pks

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoport all widgets
David A. Cuadrado [Sat, 6 Nov 2010 22:05:49 +0000 (17:05 -0500)]
port all widgets

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoported UserStat and Ad models
David A. Cuadrado [Sat, 6 Nov 2010 21:48:21 +0000 (16:48 -0500)]
ported UserStat and Ad models

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agocode cleanup. EmbeddedDocument -> Document
David A. Cuadrado [Sat, 6 Nov 2010 21:41:39 +0000 (16:41 -0500)]
code cleanup. EmbeddedDocument -> Document

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agostart port to mongoid
David A. Cuadrado [Sat, 6 Nov 2010 21:39:01 +0000 (16:39 -0500)]
start port to mongoid

Signed-off-by: David A. Cuadrado <krawek@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 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 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>