shapado:shapado.git
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 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 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/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 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>
7 years agowebsocket is ready
David A. Cuadrado [Sun, 31 Oct 2010 04:24:56 +0000 (23:24 -0500)]
websocket is ready

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoadd websocket server
David A. Cuadrado [Sun, 31 Oct 2010 04:12:57 +0000 (23:12 -0500)]
add websocket server

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoremove unused scripts
David A. Cuadrado [Sun, 31 Oct 2010 04:06:13 +0000 (23:06 -0500)]
remove unused scripts

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoadd jobs module
David A. Cuadrado [Sun, 31 Oct 2010 03:00:15 +0000 (22:00 -0500)]
add jobs module

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoport jobs to the new magent api
David A. Cuadrado [Sun, 31 Oct 2010 02:47:26 +0000 (21:47 -0500)]
port jobs to the new magent api

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoupdate magent dep
David A. Cuadrado [Sun, 31 Oct 2010 01:50:50 +0000 (20:50 -0500)]
update magent dep

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

7 years agoFix creating votes
Jorge H. Cuadrado [Sun, 31 Oct 2010 01:17:00 +0000 (20:17 -0500)]
Fix creating votes

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoadd missing route
David A. Cuadrado [Sun, 31 Oct 2010 01:04:37 +0000 (20:04 -0500)]
add missing route

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agofix twitter share link
David A. Cuadrado [Sun, 31 Oct 2010 00:59:05 +0000 (19:59 -0500)]
fix twitter share link

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agodisable notifiers
David A. Cuadrado [Sun, 31 Oct 2010 00:54:41 +0000 (19:54 -0500)]
disable notifiers

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agodisable goalie for now
David A. Cuadrado [Sun, 31 Oct 2010 00:47:52 +0000 (19:47 -0500)]
disable goalie for now

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoupdate goalie dep
David A. Cuadrado [Sun, 31 Oct 2010 00:46:10 +0000 (19:46 -0500)]
update goalie dep

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agofix model
David A. Cuadrado [Sun, 31 Oct 2010 00:40:26 +0000 (19:40 -0500)]
fix model

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

7 years agocode cleanup
David A. Cuadrado [Sun, 31 Oct 2010 00:28:21 +0000 (19:28 -0500)]
code cleanup

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoadd login_required method
David A. Cuadrado [Sun, 31 Oct 2010 00:25:48 +0000 (19:25 -0500)]
add login_required method

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

7 years agoFix routes
Jorge H. Cuadrado [Sun, 31 Oct 2010 00:13:53 +0000 (19:13 -0500)]
Fix routes

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agohandle twitter and facebook fields
David A. Cuadrado [Sun, 31 Oct 2010 00:13:20 +0000 (19:13 -0500)]
handle twitter and facebook fields

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoconvert Votes to EmbeddedDocument
Jorge H. Cuadrado [Sat, 30 Oct 2010 22:22:54 +0000 (17:22 -0500)]
convert Votes to EmbeddedDocument

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoauthentication is finally working
David A. Cuadrado [Sat, 30 Oct 2010 23:37:22 +0000 (18:37 -0500)]
authentication is finally working

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoupdate assets
David A. Cuadrado [Sat, 30 Oct 2010 21:47:25 +0000 (16:47 -0500)]
update assets

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agobasic auth is working now
David A. Cuadrado [Sat, 30 Oct 2010 21:43:25 +0000 (16:43 -0500)]
basic auth is working now

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agofix width issue for tag input
Patrick Aljord [Wed, 27 Oct 2010 07:33:52 +0000 (02:33 -0500)]
fix width issue for tag input

7 years agomerge tag instead of pushing it
Patrick Aljord [Tue, 26 Oct 2010 08:04:27 +0000 (03:04 -0500)]
merge tag instead of pushing it

7 years agouse input value if no tags are selected
Patrick Aljord [Mon, 25 Oct 2010 05:10:44 +0000 (00:10 -0500)]
use input value if no tags are selected

7 years agoremove all console.log
Patrick Aljord [Mon, 25 Oct 2010 04:59:03 +0000 (23:59 -0500)]
remove all console.log

7 years agomake use of jqueryui autocomplete for members and groups autocomplete
Patrick Aljord [Mon, 25 Oct 2010 04:37:39 +0000 (23:37 -0500)]
make use of jqueryui autocomplete for members and groups autocomplete

7 years agoremove unneeded option
Patrick Aljord [Tue, 19 Oct 2010 08:33:08 +0000 (03:33 -0500)]
remove unneeded option

7 years agosome more improvements for quick question style
Patrick Aljord [Tue, 19 Oct 2010 08:30:56 +0000 (03:30 -0500)]
some more improvements for quick question style

7 years agomake it look on quickquestion
Patrick Aljord [Tue, 19 Oct 2010 08:22:07 +0000 (03:22 -0500)]
make it look on quickquestion

7 years agoadd new tag if user hits space or a comma
Patrick Aljord [Mon, 18 Oct 2010 19:26:52 +0000 (14:26 -0500)]
add new tag if user hits space or a comma

7 years agomake use of jqueryui for our autocomplete
Patrick Aljord [Wed, 13 Oct 2010 08:42:30 +0000 (03:42 -0500)]
make use of jqueryui for our autocomplete
introducing ricodigoComplete plugin that makes use of jqueryui for autocomplete, inspired by facebook autocomplete.

7 years agoMerge remote branch 'origin/master' into next
David A. Cuadrado [Sat, 30 Oct 2010 17:52:03 +0000 (12:52 -0500)]
Merge remote branch 'origin/master' into next

7 years agointegrating devise-omniauth
David A. Cuadrado [Sat, 30 Oct 2010 17:51:41 +0000 (12:51 -0500)]
integrating devise-omniauth

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agocleaning up the authentication code
David A. Cuadrado [Sat, 30 Oct 2010 17:05:14 +0000 (12:05 -0500)]
cleaning up the authentication code

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoLocalisation updates from http://translatewiki.net
Siebrand Mazeland [Thu, 28 Oct 2010 23:37:08 +0000 (01:37 +0200)]
Localisation updates from http://translatewiki.net

7 years agoMerge remote branch 'i18n/master'
Patrick Aljord [Tue, 26 Oct 2010 06:11:04 +0000 (01:11 -0500)]
Merge remote branch 'i18n/master'

7 years agoupdate deps
David A. Cuadrado [Tue, 26 Oct 2010 03:11:42 +0000 (22:11 -0500)]
update deps

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoMerge branch 'master' into next
David A. Cuadrado [Tue, 26 Oct 2010 02:52:48 +0000 (21:52 -0500)]
Merge branch 'master' into next

Conflicts:
app/controllers/application_controller.rb
config/environment.rb
config/locales/devise/devise.en.yml
lib/authenticated_system.rb
public/javascripts/openid/js/jquery.openid.min.js

7 years agoFix report email
Jorge H. Cuadrado [Mon, 25 Oct 2010 00:27:45 +0000 (19:27 -0500)]
Fix report email

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoAttemp to fix the error 'Missing layout layouts/.erb in view path' that we are gettin...
Jorge H. Cuadrado [Sat, 23 Oct 2010 07:22:50 +0000 (02:22 -0500)]
Attemp to fix the error 'Missing layout layouts/.erb in view path' that we are getting in production

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoLocalisation updates from http://translatewiki.net
Siebrand Mazeland [Mon, 18 Oct 2010 22:17:03 +0000 (00:17 +0200)]
Localisation updates from http://translatewiki.net

7 years agoLocalisation updates from http://translatewiki.net
Siebrand Mazeland [Mon, 18 Oct 2010 19:11:38 +0000 (21:11 +0200)]
Localisation updates from http://translatewiki.net
* support for Danish (da) added

7 years agodon't capitalize automatically as that's not compatible with languages such as German
Patrick Aljord [Mon, 18 Oct 2010 18:18:37 +0000 (13:18 -0500)]
don't capitalize automatically as that's not compatible with languages such as German

See: http://translatewiki.net/wiki/Translating_talk:Shapado#Messages_are_case-sensitive,_at_least_in_German_8012

7 years agoMerge remote branch 'i18n/master'
Patrick Aljord [Mon, 18 Oct 2010 18:02:51 +0000 (13:02 -0500)]
Merge remote branch 'i18n/master'

7 years ago* fixed inconsistent "actived" to "confirmed". Spotted by kgh.
Siebrand Mazeland [Sun, 17 Oct 2010 08:53:27 +0000 (10:53 +0200)]
* fixed inconsistent "actived" to "confirmed". Spotted by kgh.
* remove annoying "successfully". Not needed to get meaning of the message through.
* fix punctuation/grammar in facebook_timeout.

7 years agoRemove untranslated files.
Siebrand Mazeland [Sat, 16 Oct 2010 18:05:14 +0000 (20:05 +0200)]
Remove untranslated files.