shapado:cantonics-shapado.git
7 years agoFix move widgets networks
Jorge H. Cuadrado [Fri, 1 Jul 2011 07:18:40 +0000 (02:18 -0500)]
Fix move widgets

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoImplement share widget
Jorge H. Cuadrado [Fri, 1 Jul 2011 05:28:12 +0000 (00:28 -0500)]
Implement share widget

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agofix js length error
Patrick Aljord [Thu, 30 Jun 2011 23:26:26 +0000 (18:26 -0500)]
fix js length error

7 years agoonly load geolocation when needed
Patrick Aljord [Thu, 30 Jun 2011 22:26:22 +0000 (17:26 -0500)]
only load geolocation when needed

7 years agofix jqmath
Patrick Aljord [Thu, 30 Jun 2011 22:08:41 +0000 (17:08 -0500)]
fix jqmath

7 years agoMerge remote-tracking branch 'origin/master' into networks
Jorge H. Cuadrado [Thu, 30 Jun 2011 21:44:04 +0000 (16:44 -0500)]
Merge remote-tracking branch 'origin/master' into networks

Conflicts:
Gemfile.lock

7 years agoImplement group's networks widget
Jorge H. Cuadrado [Thu, 30 Jun 2011 21:38:12 +0000 (16:38 -0500)]
Implement group's networks widget

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoMerge remote-tracking branch 'liuqiang/master'
David A. Cuadrado [Thu, 30 Jun 2011 17:11:55 +0000 (12:11 -0500)]
Merge remote-tracking branch 'liuqiang/master'

7 years agoMerge remote-tracking branch 'origin/networks'
David A. Cuadrado [Thu, 30 Jun 2011 17:10:53 +0000 (12:10 -0500)]
Merge remote-tracking branch 'origin/networks'

Conflicts:
Gemfile.lock
public/javascripts/app/initializers/assets_dev.js

7 years agoMerge remote-tracking branch 'origin/fixes-patcito'
David A. Cuadrado [Thu, 30 Jun 2011 17:08:07 +0000 (12:08 -0500)]
Merge remote-tracking branch 'origin/fixes-patcito'

7 years agoMerge remote-tracking branch 'origin/fixes-jc'
David A. Cuadrado [Thu, 30 Jun 2011 17:07:48 +0000 (12:07 -0500)]
Merge remote-tracking branch 'origin/fixes-jc'

7 years agoadded polyfill for geolocation
Patrick Aljord [Thu, 30 Jun 2011 06:39:38 +0000 (01:39 -0500)]
added polyfill for geolocation

7 years agofix members list
David A. Cuadrado [Thu, 30 Jun 2011 06:34:22 +0000 (01:34 -0500)]
fix members list

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agomove memberships to standalone documents. type rake fidb:memberships to update the db
David A. Cuadrado [Thu, 30 Jun 2011 06:29:31 +0000 (01:29 -0500)]
move memberships to standalone documents. type rake fidb:memberships to update the db

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agofix theme id error when creating group
sharp [Thu, 30 Jun 2011 06:17:15 +0000 (14:17 +0800)]
fix theme id error when creating group

7 years agoMerge remote-tracking branch 'origin/master' into networks
Jorge H. Cuadrado [Thu, 30 Jun 2011 05:42:37 +0000 (00:42 -0500)]
Merge remote-tracking branch 'origin/master' into networks

7 years agofix undefined method fb_active for Group
sharp [Thu, 30 Jun 2011 03:49:50 +0000 (11:49 +0800)]
fix undefined method fb_active for Group

7 years agoMerge remote-tracking branch 'origin/master' into networks
Jorge H. Cuadrado [Thu, 30 Jun 2011 01:22:18 +0000 (20:22 -0500)]
Merge remote-tracking branch 'origin/master' into networks

Conflicts:
Gemfile.lock

7 years agofix authentication
David A. Cuadrado [Thu, 30 Jun 2011 01:18:59 +0000 (20:18 -0500)]
fix authentication

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoremove debugging statement
David A. Cuadrado [Thu, 30 Jun 2011 01:11:20 +0000 (20:11 -0500)]
remove debugging statement

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoupdate multiauth
David A. Cuadrado [Thu, 30 Jun 2011 01:05:37 +0000 (20:05 -0500)]
update multiauth

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoMerge remote-tracking branch 'origin/fix-bootstrap' into networks
Jorge H. Cuadrado [Wed, 29 Jun 2011 22:45:59 +0000 (17:45 -0500)]
Merge remote-tracking branch 'origin/fix-bootstrap' into networks

Conflicts:
Gemfile.lock

7 years agoFix html structure for recent groups widget and recent user widget fix-bootstrap
Jorge H. Cuadrado [Wed, 29 Jun 2011 22:26:19 +0000 (17:26 -0500)]
Fix html structure for recent groups widget and recent user widget

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoFix bootstrap task
Jorge H. Cuadrado [Wed, 29 Jun 2011 22:02:17 +0000 (17:02 -0500)]
Fix bootstrap task

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoImplement social networks widgets for user's profile
Jorge H. Cuadrado [Wed, 29 Jun 2011 20:47:38 +0000 (15:47 -0500)]
Implement social networks widgets for user's profile

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoMerge remote-tracking branch 'origin/master' into networks
Jorge H. Cuadrado [Wed, 29 Jun 2011 20:27:45 +0000 (15:27 -0500)]
Merge remote-tracking branch 'origin/master' into networks

7 years agouse pjax for badges and pages
David A. Cuadrado [Wed, 29 Jun 2011 15:56:37 +0000 (10:56 -0500)]
use pjax for badges and pages

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoremember user
David A. Cuadrado [Wed, 29 Jun 2011 15:56:01 +0000 (10:56 -0500)]
remember user

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoupdate deploy script
David A. Cuadrado [Wed, 29 Jun 2011 00:57:07 +0000 (19:57 -0500)]
update deploy script

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agouse pjax for user links
David A. Cuadrado [Wed, 29 Jun 2011 00:55:42 +0000 (19:55 -0500)]
use pjax for user links

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoMerge remote-tracking branch 'origin/fixes-patcito'
David A. Cuadrado [Wed, 29 Jun 2011 00:38:49 +0000 (19:38 -0500)]
Merge remote-tracking branch 'origin/fixes-patcito'

7 years agoMerge branch 'master' into next
David A. Cuadrado [Wed, 29 Jun 2011 00:35:47 +0000 (19:35 -0500)]
Merge branch 'master' into next

Conflicts:
app/controllers/answers_controller.rb
app/controllers/application_controller.rb
app/controllers/questions_controller.rb
app/controllers/users_controller.rb
app/models/export.rb
app/models/question.rb
app/models/user.rb
app/stylesheets/application.sass
app/views/comments/_comment.html.haml
app/views/members/_form.html.haml
app/views/notifier/favorited.html.haml
app/views/notifier/follow.html.haml
app/views/shared/_dlvr_link.html.haml
app/views/users/show.html.haml
config/boot.rb
config/environment.rb
config/initializers/01_locales.rb
config/initializers/mongo.rb
config/locales/welcome/en.yml
lib/tasks/fixdb.rake
public/javascripts/application.js
script/export
script/import
script/server

7 years agofix answering anonymously
Jorge H. Cuadrado [Tue, 28 Jun 2011 22:36:30 +0000 (17:36 -0500)]
fix answering anonymously

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoFix hide save button of language filter from in show question view
Jorge H. Cuadrado [Tue, 28 Jun 2011 21:42:07 +0000 (16:42 -0500)]
Fix hide save button of language filter from in show question view

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoescape user login js-link-master 3.10.8
Patrick Aljord [Tue, 28 Jun 2011 20:55:09 +0000 (15:55 -0500)]
escape user login

7 years agoprevent users from adding javascript links to their profile
Patrick Aljord [Tue, 28 Jun 2011 20:25:19 +0000 (15:25 -0500)]
prevent users from adding javascript links to their profile

7 years agoimprove pjax updater next
David A. Cuadrado [Tue, 28 Jun 2011 18:45:09 +0000 (13:45 -0500)]
improve pjax updater

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agorefactor modernizr js code
Patrick Aljord [Tue, 28 Jun 2011 09:04:13 +0000 (04:04 -0500)]
refactor modernizr js code
merged bare_minimum_questions and bare_minimum_show into base.js and renamed old base to extra.js

7 years agoonly load jpicker when needed
Patrick Aljord [Sun, 26 Jun 2011 23:28:40 +0000 (18:28 -0500)]
only load jpicker when needed

7 years agofix typo, don't use evalJSON
Patrick Aljord [Sun, 26 Jun 2011 23:28:05 +0000 (18:28 -0500)]
fix typo, don't use evalJSON

7 years agoMerge remote-tracking branch 'origin/themes' into next
David A. Cuadrado [Sun, 26 Jun 2011 17:19:29 +0000 (12:19 -0500)]
Merge remote-tracking branch 'origin/themes' into next

7 years agoMerge remote-tracking branch 'origin/fixes-patcito' into next
David A. Cuadrado [Sun, 26 Jun 2011 17:19:21 +0000 (12:19 -0500)]
Merge remote-tracking branch 'origin/fixes-patcito' into next

7 years agoregenerate assets dev
David A. Cuadrado [Sun, 26 Jun 2011 17:19:10 +0000 (12:19 -0500)]
regenerate assets dev

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agofix comments style
Patrick Aljord [Sun, 26 Jun 2011 07:48:53 +0000 (02:48 -0500)]
fix comments style

7 years agoupdate Questions#show using websocket when creating updating a comment
Patrick Aljord [Sun, 26 Jun 2011 07:29:33 +0000 (02:29 -0500)]
update Questions#show using websocket when creating updating a comment

7 years agoremoved log
Patrick Aljord [Sun, 26 Jun 2011 04:43:20 +0000 (23:43 -0500)]
removed log

7 years agomoved modernizr code for Questions#show to Questions.initialize_on_show
Patrick Aljord [Sun, 26 Jun 2011 04:41:53 +0000 (23:41 -0500)]
moved modernizr code for Questions#show to Questions.initialize_on_show

7 years agoseparate rewards in its own module
David A. Cuadrado [Sun, 26 Jun 2011 03:47:09 +0000 (22:47 -0500)]
separate rewards in its own module

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoimprove pjax support
David A. Cuadrado [Sun, 26 Jun 2011 03:24:18 +0000 (22:24 -0500)]
improve pjax support

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoFix answers vote box style and fix html structure for questions badgets widget and...
Jorge H. Cuadrado [Sat, 25 Jun 2011 21:00:48 +0000 (16:00 -0500)]
Fix answers vote box style and fix html structure for questions badgets widget and question tags

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoMerge remote-tracking branch 'origin/themes' into next
David A. Cuadrado [Sat, 25 Jun 2011 20:16:06 +0000 (15:16 -0500)]
Merge remote-tracking branch 'origin/themes' into next

7 years agoFix article tag style
Jorge H. Cuadrado [Sat, 25 Jun 2011 19:39:25 +0000 (14:39 -0500)]
Fix article tag style

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoupdate Questions#show using websocket when creating a new comment
Patrick Aljord [Sat, 25 Jun 2011 08:54:58 +0000 (03:54 -0500)]
update Questions#show using websocket when creating a new comment

7 years agoMerge remote-tracking branch 'origin/themes' into next
David A. Cuadrado [Sat, 25 Jun 2011 06:31:46 +0000 (01:31 -0500)]
Merge remote-tracking branch 'origin/themes' into next

7 years agouse back-site.gif image in default theme and show community themes and group themes...
Jorge H. Cuadrado [Sat, 25 Jun 2011 06:28:44 +0000 (01:28 -0500)]
use back-site.gif image in default theme and show community themes and group themes in manage appearence form

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoadd pjax and loading box
David A. Cuadrado [Sat, 25 Jun 2011 06:23:43 +0000 (01:23 -0500)]
add pjax and loading box

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoImplement support for image background in themes
Jorge H. Cuadrado [Sat, 25 Jun 2011 05:48:24 +0000 (00:48 -0500)]
Implement support for image background in themes

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoMerge remote-tracking branch 'origin/next' into themes
Jorge H. Cuadrado [Sat, 25 Jun 2011 00:28:12 +0000 (19:28 -0500)]
Merge remote-tracking branch 'origin/next' into themes

7 years agoremove windows chars from this file
David A. Cuadrado [Sat, 25 Jun 2011 00:27:03 +0000 (19:27 -0500)]
remove windows chars from this file

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoMove theme's stylesheet generation to a magent job
Jorge H. Cuadrado [Fri, 24 Jun 2011 20:16:28 +0000 (15:16 -0500)]
Move theme's stylesheet generation to a magent job

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agofix editing comments with ajax
Patrick Aljord [Fri, 24 Jun 2011 05:25:12 +0000 (00:25 -0500)]
fix editing comments with ajax

7 years agofix adding comments with ajax
Patrick Aljord [Fri, 24 Jun 2011 00:05:21 +0000 (19:05 -0500)]
fix adding comments with ajax

7 years agoremoved share links on /
Patrick Aljord [Thu, 23 Jun 2011 00:09:59 +0000 (19:09 -0500)]
removed share links on /

7 years agoMerge remote-tracking branch 'origin/themes' into next
David A. Cuadrado [Fri, 24 Jun 2011 02:51:23 +0000 (21:51 -0500)]
Merge remote-tracking branch 'origin/themes' into next

7 years agosweep widgets
David A. Cuadrado [Fri, 24 Jun 2011 02:51:06 +0000 (21:51 -0500)]
sweep widgets

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoImprove theme template
Jorge H. Cuadrado [Thu, 23 Jun 2011 23:22:20 +0000 (18:22 -0500)]
Improve theme template

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoUse theme's properties as sass var for the theme's template
Jorge H. Cuadrado [Thu, 23 Jun 2011 21:43:24 +0000 (16:43 -0500)]
Use theme's properties as sass var for the theme's template

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoAdd rake tasks to generate the default theme
Jorge H. Cuadrado [Thu, 23 Jun 2011 20:59:25 +0000 (15:59 -0500)]
Add rake tasks to generate the default theme

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoMove css rules for color to lib/sass/theme_template.scss
Jorge H. Cuadrado [Thu, 23 Jun 2011 18:25:11 +0000 (13:25 -0500)]
Move css rules for color to lib/sass/theme_template.scss
- lib/sass/theme_template.scss will be the template to define the theme's css

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agofix typo
Patrick Aljord [Wed, 22 Jun 2011 23:50:19 +0000 (18:50 -0500)]
fix typo

7 years agoshow comment's html correctly
Patrick Aljord [Wed, 22 Jun 2011 02:09:10 +0000 (21:09 -0500)]
show comment's html correctly

7 years agoreduce the content panel width a bit, makes it easier to read long answers
Patrick Aljord [Wed, 22 Jun 2011 00:03:31 +0000 (19:03 -0500)]
reduce the content panel width a bit, makes it easier to read long answers

7 years agorework and improve cache
David A. Cuadrado [Wed, 22 Jun 2011 16:37:48 +0000 (11:37 -0500)]
rework and improve cache

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoMerge remote-tracking branch 'origin/fixes-patcito' into next
David A. Cuadrado [Tue, 21 Jun 2011 15:57:46 +0000 (10:57 -0500)]
Merge remote-tracking branch 'origin/fixes-patcito' into next

7 years agoexperimental method to update the page via ajax
David A. Cuadrado [Tue, 21 Jun 2011 05:36:14 +0000 (00:36 -0500)]
experimental method to update the page via ajax

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoadded ajax for following questions
Patrick Aljord [Tue, 21 Jun 2011 05:38:39 +0000 (00:38 -0500)]
added ajax for following questions

7 years agoMerge remote-tracking branch 'origin/themes' into next
David A. Cuadrado [Tue, 21 Jun 2011 00:01:54 +0000 (19:01 -0500)]
Merge remote-tracking branch 'origin/themes' into next

7 years agoFix error in Theme#index and fix link to group's appearance in admin menu
Jorge H. Cuadrado [Mon, 20 Jun 2011 23:23:00 +0000 (18:23 -0500)]
Fix error in Theme#index and fix link to group's appearance in admin menu

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoMerge remote-tracking branch 'origin/themes' into next
David A. Cuadrado [Mon, 20 Jun 2011 22:49:00 +0000 (17:49 -0500)]
Merge remote-tracking branch 'origin/themes' into next

7 years agoupdate facebook app
David A. Cuadrado [Mon, 20 Jun 2011 22:25:31 +0000 (17:25 -0500)]
update facebook app

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoMerge remote-tracking branch 'origin/next' into themes
Jorge H. Cuadrado [Mon, 20 Jun 2011 22:16:15 +0000 (17:16 -0500)]
Merge remote-tracking branch 'origin/next' into themes

Conflicts:
public/javascripts/app/initializers/assets_dev.js

7 years agoMerge remote-tracking branch 'origin/fixes-patcito' into next
David A. Cuadrado [Mon, 20 Jun 2011 22:10:26 +0000 (17:10 -0500)]
Merge remote-tracking branch 'origin/fixes-patcito' into next

7 years agoMove group appearance options to its own action in manage controller
Jorge H. Cuadrado [Mon, 20 Jun 2011 21:58:33 +0000 (16:58 -0500)]
Move group appearance options to its own action in manage controller

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoFix jpicker inclusion
Jorge H. Cuadrado [Mon, 20 Jun 2011 18:55:50 +0000 (13:55 -0500)]
Fix jpicker inclusion

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agofix ads widget styling
Patrick Aljord [Sat, 18 Jun 2011 07:50:13 +0000 (02:50 -0500)]
fix ads widget styling

7 years agotrailing whitespace
Patrick Aljord [Sat, 18 Jun 2011 07:46:08 +0000 (02:46 -0500)]
trailing whitespace

7 years agoshow login dialog instead of redirection when user is not signed in
Patrick Aljord [Sat, 18 Jun 2011 03:44:38 +0000 (22:44 -0500)]
show login dialog instead of redirection when user is not signed in
needs better styling

7 years agoremove trailing white spaces and old comments
Patrick Aljord [Sat, 18 Jun 2011 03:36:20 +0000 (22:36 -0500)]
remove trailing white spaces and old comments

7 years agoImplement edit theme, load theme's stylesheet and add more theme propieties
Jorge H. Cuadrado [Wed, 15 Jun 2011 01:24:17 +0000 (20:24 -0500)]
Implement edit theme, load theme's stylesheet and add more theme propieties

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoImplement themes controller
Jorge H. Cuadrado [Tue, 14 Jun 2011 20:17:23 +0000 (15:17 -0500)]
Implement themes controller

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoMerge remote-tracking branch 'origin/custom-widget' into next
David A. Cuadrado [Sat, 18 Jun 2011 00:30:56 +0000 (19:30 -0500)]
Merge remote-tracking branch 'origin/custom-widget' into next

7 years agosimplify the custom html widget custom-widget
Jorge H. Cuadrado [Wed, 15 Jun 2011 02:23:35 +0000 (21:23 -0500)]
simplify the custom html widget

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agodo not use the same db for magent
David A. Cuadrado [Thu, 16 Jun 2011 23:37:18 +0000 (18:37 -0500)]
do not use the same db for magent

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoupdate dependencies
David A. Cuadrado [Wed, 15 Jun 2011 04:32:26 +0000 (23:32 -0500)]
update dependencies

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agotypo
David A. Cuadrado [Wed, 15 Jun 2011 03:43:32 +0000 (22:43 -0500)]
typo

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agomake follow link work
David A. Cuadrado [Wed, 15 Jun 2011 03:42:27 +0000 (22:42 -0500)]
make follow link work

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoallow to answer the question
David A. Cuadrado [Wed, 15 Jun 2011 01:31:27 +0000 (20:31 -0500)]
allow to answer the question

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoadd facebox to render user data
David A. Cuadrado [Tue, 14 Jun 2011 17:59:40 +0000 (12:59 -0500)]
add facebox to render user data

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agorespond to format=js
David A. Cuadrado [Tue, 14 Jun 2011 17:59:19 +0000 (12:59 -0500)]
respond to format=js

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoadd some useful methods
David A. Cuadrado [Tue, 14 Jun 2011 17:00:33 +0000 (12:00 -0500)]
add some useful methods

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