shapado:dgfranciscos-shapado.git
7 years agoAdding new icons for main nav
dgfrancisco [Sun, 11 Sep 2011 18:17:39 +0000 (13:17 -0500)]
Adding new icons for main nav

Signed-off-by: dgfrancisco <dgfranciscorodriguez@gmail.com>
7 years agoMerge remote branch 'upstream/master' into css-improvements
dgfrancisco [Sun, 11 Sep 2011 17:41:58 +0000 (12:41 -0500)]
Merge remote branch 'upstream/master' into css-improvements

7 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 11 Sep 2011 14:34:14 +0000 (16:34 +0200)]
Localisation updates from translatewiki.net.

7 years agoMerge remote-tracking branch 'origin/fixes-patcito'
David A. Cuadrado [Sun, 11 Sep 2011 05:00:06 +0000 (00:00 -0500)]
Merge remote-tracking branch 'origin/fixes-patcito'

7 years agoMerge remote-tracking branch 'origin/fixes-kuadrosx'
David A. Cuadrado [Sun, 11 Sep 2011 05:00:02 +0000 (00:00 -0500)]
Merge remote-tracking branch 'origin/fixes-kuadrosx'

7 years agofix suggestion tags by suggested friend error
Patrick Aljord [Sun, 11 Sep 2011 04:03:47 +0000 (23:03 -0500)]
fix suggestion tags by suggested friend error

7 years agoshow correct number of answers
Patrick Aljord [Sun, 11 Sep 2011 02:30:49 +0000 (21:30 -0500)]
show correct number of answers

7 years agoImprove style for question stats
Jorge H. Cuadrado [Sun, 11 Sep 2011 01:29:29 +0000 (20:29 -0500)]
Improve style for question stats

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoMerge branch 'master' of gitorious.org:shapado/shapado
Patrick Aljord [Sun, 11 Sep 2011 01:27:52 +0000 (20:27 -0500)]
Merge branch 'master' of gitorious.org:shapado/shapado

7 years agoi18n
Patrick Aljord [Sun, 11 Sep 2011 01:27:37 +0000 (20:27 -0500)]
i18n

7 years agodo not hide if there are few comments
David A. Cuadrado [Sun, 11 Sep 2011 00:26:24 +0000 (19:26 -0500)]
do not hide if there are few comments

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoshow/hide comments that were already read
David A. Cuadrado [Sat, 10 Sep 2011 23:58:17 +0000 (18:58 -0500)]
show/hide comments that were already read

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoMerge remote-tracking branch 'origin/fixes-kuadrosx'
David A. Cuadrado [Sat, 10 Sep 2011 22:59:02 +0000 (17:59 -0500)]
Merge remote-tracking branch 'origin/fixes-kuadrosx'

7 years agoMerge remote-tracking branch 'origin/fixes-patcito'
David A. Cuadrado [Sat, 10 Sep 2011 22:58:59 +0000 (17:58 -0500)]
Merge remote-tracking branch 'origin/fixes-patcito'

7 years agotrack the last time a user read a question
David A. Cuadrado [Sat, 10 Sep 2011 22:58:03 +0000 (17:58 -0500)]
track the last time a user read a question

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoadd fallback to group.language for custom html
Jorge H. Cuadrado [Sat, 10 Sep 2011 21:24:51 +0000 (16:24 -0500)]
add fallback to group.language for custom html

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agodon't autofocus on extralanguage
Patrick Aljord [Sat, 10 Sep 2011 21:20:36 +0000 (16:20 -0500)]
don't autofocus on extralanguage

7 years agotask to convert questions votes to followers
Patrick Aljord [Sat, 10 Sep 2011 20:44:11 +0000 (15:44 -0500)]
task to convert questions votes to followers

7 years agoImprove custom html support
Jorge H. Cuadrado [Sat, 10 Sep 2011 20:31:46 +0000 (15:31 -0500)]
Improve custom html support

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoAdding fixes for css
dgfrancisco [Sat, 10 Sep 2011 03:51:41 +0000 (22:51 -0500)]
Adding fixes for css

Signed-off-by: dgfrancisco <dgfranciscorodriguez@gmail.com>
7 years agoMerge remote branch 'upstream/master' into css-improvements
dgfrancisco [Sat, 10 Sep 2011 02:27:03 +0000 (21:27 -0500)]
Merge remote branch 'upstream/master' into css-improvements

7 years agoMerge remote-tracking branch 'origin/fixes-patcito'
David A. Cuadrado [Sat, 10 Sep 2011 01:56:21 +0000 (20:56 -0500)]
Merge remote-tracking branch 'origin/fixes-patcito'

7 years agomove application.js from extra to base
Patrick Aljord [Sat, 10 Sep 2011 01:38:08 +0000 (20:38 -0500)]
move application.js from extra to base

7 years agoMerge remote-tracking branch 'origin/fixes-kuadrosx' into fixes-patcito
Patrick Aljord [Sat, 10 Sep 2011 01:33:23 +0000 (20:33 -0500)]
Merge remote-tracking branch 'origin/fixes-kuadrosx' into fixes-patcito

7 years agoAdd missing file
Jorge H. Cuadrado [Sat, 10 Sep 2011 01:32:35 +0000 (20:32 -0500)]
Add missing file

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoMerge remote-tracking branch 'origin/fixes-kuadrosx'
David A. Cuadrado [Sat, 10 Sep 2011 01:30:49 +0000 (20:30 -0500)]
Merge remote-tracking branch 'origin/fixes-kuadrosx'

7 years agoMerge remote-tracking branch 'origin/fixes-kuadrosx' into fixes-patcito
Patrick Aljord [Sat, 10 Sep 2011 01:27:57 +0000 (20:27 -0500)]
Merge remote-tracking branch 'origin/fixes-kuadrosx' into fixes-patcito

7 years agoRemane Uploader to Loader
Jorge H. Cuadrado [Sat, 10 Sep 2011 01:09:09 +0000 (20:09 -0500)]
Remane Uploader to Loader

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoCreate searches javascript module
Jorge H. Cuadrado [Sat, 10 Sep 2011 00:52:40 +0000 (19:52 -0500)]
Create searches javascript module

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoRemove show_question.js from config/assets.yml
Jorge H. Cuadrado [Sat, 10 Sep 2011 00:20:10 +0000 (19:20 -0500)]
Remove show_question.js from config/assets.yml

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoFix behavior of flag link in question index and hide the flag link when the user...
Jorge H. Cuadrado [Sat, 10 Sep 2011 00:06:00 +0000 (19:06 -0500)]
Fix behavior of flag link in question index and hide the flag link when the user is a group's moderator

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoMerge remote branch 'upstream/master' into css-improvements
dgfrancisco [Fri, 9 Sep 2011 23:57:25 +0000 (18:57 -0500)]
Merge remote branch 'upstream/master' into css-improvements

7 years agoAdding fixes for search results
dgfrancisco [Fri, 9 Sep 2011 23:55:39 +0000 (18:55 -0500)]
Adding fixes for search results

Signed-off-by: dgfrancisco <dgfranciscorodriguez@gmail.com>
7 years agoadd locale to cache key
David A. Cuadrado [Fri, 9 Sep 2011 23:53:40 +0000 (18:53 -0500)]
add locale to cache key

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoMerge remote-tracking branch 'origin/fixes-kuadrosx'
David A. Cuadrado [Fri, 9 Sep 2011 23:52:24 +0000 (18:52 -0500)]
Merge remote-tracking branch 'origin/fixes-kuadrosx'

7 years agoComment field networks for edit users
Jorge H. Cuadrado [Fri, 9 Sep 2011 23:31:46 +0000 (18:31 -0500)]
Comment field networks for edit users

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoFix typo.
Siebrand Mazeland [Fri, 9 Sep 2011 22:57:17 +0000 (00:57 +0200)]
Fix typo.

7 years agoSmall fix. Put key and string on one line.
Siebrand Mazeland [Fri, 9 Sep 2011 22:50:37 +0000 (00:50 +0200)]
Small fix. Put key and string on one line.

7 years agoi18n
Patrick Aljord [Fri, 9 Sep 2011 22:42:03 +0000 (17:42 -0500)]
i18n

7 years agoi18n
Patrick Aljord [Fri, 9 Sep 2011 22:23:37 +0000 (17:23 -0500)]
i18n

7 years agoads are now added trough widgets
Patrick Aljord [Fri, 9 Sep 2011 22:19:04 +0000 (17:19 -0500)]
ads are now added trough widgets

7 years agoMerge remote-tracking branch 'origin/fixes-patcito'
David A. Cuadrado [Fri, 9 Sep 2011 22:13:40 +0000 (17:13 -0500)]
Merge remote-tracking branch 'origin/fixes-patcito'

7 years agoshow markdown in groups description
Patrick Aljord [Fri, 9 Sep 2011 22:11:55 +0000 (17:11 -0500)]
show markdown in groups description

7 years agofix groups search
Patrick Aljord [Fri, 9 Sep 2011 22:09:17 +0000 (17:09 -0500)]
fix groups search

7 years agofixing forms into main question edit answer, comment, edits, etc
dgfrancisco [Fri, 9 Sep 2011 21:46:20 +0000 (16:46 -0500)]
fixing forms into main question edit answer, comment, edits, etc

Signed-off-by: dgfrancisco <dgfranciscorodriguez@gmail.com>
7 years agoMove more code from initialize to modules
Jorge H. Cuadrado [Fri, 9 Sep 2011 20:59:59 +0000 (15:59 -0500)]
Move more code from initialize to modules

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoMerge remote-tracking branch 'origin/kuadrosx-droppy'
David A. Cuadrado [Fri, 9 Sep 2011 20:03:20 +0000 (15:03 -0500)]
Merge remote-tracking branch 'origin/kuadrosx-droppy'

7 years agoMerge remote-tracking branch 'origin/fixes-patcito'
David A. Cuadrado [Fri, 9 Sep 2011 19:17:33 +0000 (14:17 -0500)]
Merge remote-tracking branch 'origin/fixes-patcito'

7 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Fri, 9 Sep 2011 14:03:16 +0000 (16:03 +0200)]
Localisation updates from translatewiki.net.

7 years agoAdd support for Hungarian and Polish.
Siebrand Mazeland [Fri, 9 Sep 2011 13:59:10 +0000 (15:59 +0200)]
Add support for Hungarian and Polish.
Sort codes alphabetically and remove a duplicate entry for "id".

7 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 21 Aug 2011 11:30:50 +0000 (13:30 +0200)]
Localisation updates from translatewiki.net.

7 years agoi18n
Patrick Aljord [Fri, 9 Sep 2011 08:16:55 +0000 (03:16 -0500)]
i18n

7 years agodon't show widget zones for widget context question
Jorge H. Cuadrado [Fri, 9 Sep 2011 00:47:46 +0000 (19:47 -0500)]
don't show widget zones for widget context question

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoFix question link on question index
Jorge H. Cuadrado [Thu, 8 Sep 2011 22:49:44 +0000 (17:49 -0500)]
Fix question link on question index

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoFix question's field description
Jorge H. Cuadrado [Thu, 8 Sep 2011 22:48:21 +0000 (17:48 -0500)]
Fix question's field description

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoFix dropdown for answer's toolbar
Jorge H. Cuadrado [Thu, 8 Sep 2011 22:36:10 +0000 (17:36 -0500)]
Fix dropdown for answer's toolbar

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoMove show_questions.js code to Questions and Answers modules
Jorge H. Cuadrado [Thu, 8 Sep 2011 21:57:26 +0000 (16:57 -0500)]
Move show_questions.js code to Questions and Answers modules

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoClean up code
Jorge H. Cuadrado [Thu, 8 Sep 2011 01:56:32 +0000 (20:56 -0500)]
Clean up code

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoMerge remote-tracking branch 'origin/kuadrosx-experimiental' into kuadrosx-droppy
Jorge H. Cuadrado [Thu, 8 Sep 2011 01:02:27 +0000 (20:02 -0500)]
Merge remote-tracking branch 'origin/kuadrosx-experimiental' into kuadrosx-droppy

7 years agoput theme version inside of the Theme model
Patrick Aljord [Wed, 7 Sep 2011 23:18:28 +0000 (18:18 -0500)]
put theme version inside of the Theme model

7 years agonow pjax links don't need data-page attribute
Jorge H. Cuadrado [Wed, 7 Sep 2011 22:23:56 +0000 (17:23 -0500)]
now pjax links don't need data-page attribute

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoSend body class using custom reponse headers for pjax responses
Jorge H. Cuadrado [Wed, 7 Sep 2011 21:35:04 +0000 (16:35 -0500)]
Send body class using custom reponse headers for pjax responses

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoFix drop-drop menus
Jorge H. Cuadrado [Wed, 7 Sep 2011 21:31:40 +0000 (16:31 -0500)]
Fix drop-drop menus

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoUse jquery.droppy instead of superfish
Jorge H. Cuadrado [Tue, 6 Sep 2011 23:14:15 +0000 (18:14 -0500)]
Use jquery.droppy instead of superfish

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoMove javascript code from initializers folder to theirs own modules
Jorge H. Cuadrado [Tue, 6 Sep 2011 21:54:33 +0000 (16:54 -0500)]
Move javascript code from initializers folder to theirs own modules

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoImproving pjax support
Jorge H. Cuadrado [Tue, 6 Sep 2011 00:10:46 +0000 (19:10 -0500)]
Improving pjax support

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoMerge remote-tracking branch 'origin/fixes-patcito'
David A. Cuadrado [Mon, 5 Sep 2011 17:45:22 +0000 (12:45 -0500)]
Merge remote-tracking branch 'origin/fixes-patcito'

7 years agoversion uploaded files for better caching
Patrick Aljord [Mon, 5 Sep 2011 08:12:31 +0000 (03:12 -0500)]
version uploaded files for better caching

7 years agoskip if the theme is already fixed
David A. Cuadrado [Sun, 4 Sep 2011 22:29:19 +0000 (17:29 -0500)]
skip if the theme is already fixed

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
7 years agoMerge remote-tracking branch 'ui/css-improvements'
David A. Cuadrado [Sun, 4 Sep 2011 17:00:33 +0000 (12:00 -0500)]
Merge remote-tracking branch 'ui/css-improvements'

7 years agoMerge remote-tracking branch 'origin/css-improvements'
David A. Cuadrado [Sun, 4 Sep 2011 08:48:45 +0000 (03:48 -0500)]
Merge remote-tracking branch 'origin/css-improvements'

7 years agoMerge remote branch 'upstream/css-improvements' into css-improvements
dgfrancisco [Sun, 4 Sep 2011 03:19:50 +0000 (22:19 -0500)]
Merge remote branch 'upstream/css-improvements' into css-improvements

7 years agocss improvements
dgfrancisco [Sun, 4 Sep 2011 03:19:25 +0000 (22:19 -0500)]
css improvements

Signed-off-by: dgfrancisco <dgfranciscorodriguez@gmail.com>
7 years agoMake a bit more ligth the
Jorge H. Cuadrado [Sun, 4 Sep 2011 02:44:29 +0000 (21:44 -0500)]
Make a bit more ligth the

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agocss improvements
dgfrancisco [Sun, 4 Sep 2011 02:10:21 +0000 (21:10 -0500)]
css improvements

Signed-off-by: dgfrancisco <dgfranciscorodriguez@gmail.com>
7 years agoMerge remote branch 'upstream/css-improvements' into css-improvements
dgfrancisco [Sun, 4 Sep 2011 01:42:10 +0000 (20:42 -0500)]
Merge remote branch 'upstream/css-improvements' into css-improvements

7 years agocss improvements
dgfrancisco [Sun, 4 Sep 2011 01:41:15 +0000 (20:41 -0500)]
css improvements

Signed-off-by: dgfrancisco <dgfranciscorodriguez@gmail.com>
7 years agoImprove the text color for top-bar
Jorge H. Cuadrado [Sun, 4 Sep 2011 01:23:46 +0000 (20:23 -0500)]
Improve the text color for top-bar

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoMerge remote branch 'upstream/css-improvements' into css-improvements
dgfrancisco [Sun, 4 Sep 2011 01:23:25 +0000 (20:23 -0500)]
Merge remote branch 'upstream/css-improvements' into css-improvements

7 years agocss improvements
dgfrancisco [Sun, 4 Sep 2011 01:22:49 +0000 (20:22 -0500)]
css improvements

Signed-off-by: dgfrancisco <dgfranciscorodriguez@gmail.com>
7 years agoAdd rake task to fix themes
Jorge H. Cuadrado [Sun, 4 Sep 2011 01:05:20 +0000 (20:05 -0500)]
Add rake task to fix themes

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoAdding css for themes
dgfrancisco [Sun, 4 Sep 2011 00:22:42 +0000 (19:22 -0500)]
Adding css for themes

Signed-off-by: dgfrancisco <dgfranciscorodriguez@gmail.com>
7 years agoMerge remote-tracking branch 'origin/css-improvements'
David A. Cuadrado [Sun, 4 Sep 2011 00:22:21 +0000 (19:22 -0500)]
Merge remote-tracking branch 'origin/css-improvements'

7 years agoMore fixes for theme template
Jorge H. Cuadrado [Sun, 4 Sep 2011 00:20:30 +0000 (19:20 -0500)]
More fixes for theme template

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoAdding css for themes
dgfrancisco [Sat, 3 Sep 2011 23:50:09 +0000 (18:50 -0500)]
Adding css for themes

Signed-off-by: dgfrancisco <dgfranciscorodriguez@gmail.com>
7 years agoMerge remote branch 'upstream/css-improvements' into css-improvements
dgfrancisco [Sat, 3 Sep 2011 23:40:13 +0000 (18:40 -0500)]
Merge remote branch 'upstream/css-improvements' into css-improvements

7 years agoAdding css for themes
dgfrancisco [Sat, 3 Sep 2011 23:37:41 +0000 (18:37 -0500)]
Adding css for themes

Signed-off-by: dgfrancisco <dgfranciscorodriguez@gmail.com>
7 years agoCleanup code
Jorge H. Cuadrado [Sat, 3 Sep 2011 22:37:16 +0000 (17:37 -0500)]
Cleanup code

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoImprove ftheme_template.scss
Jorge H. Cuadrado [Sat, 3 Sep 2011 22:32:01 +0000 (17:32 -0500)]
Improve ftheme_template.scss

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoReplace darkOrange with dark_brand_color
Jorge H. Cuadrado [Sat, 3 Sep 2011 21:04:52 +0000 (16:04 -0500)]
Replace darkOrange with dark_brand_color

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoFix errors compiling themes
Jorge H. Cuadrado [Sat, 3 Sep 2011 20:45:28 +0000 (15:45 -0500)]
Fix errors compiling themes

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoCopy colors to theme_template.scss
Jorge H. Cuadrado [Sat, 3 Sep 2011 20:14:51 +0000 (15:14 -0500)]
Copy colors to theme_template.scss

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoAdding colors to the theme :)
dgfrancisco [Sat, 3 Sep 2011 05:21:19 +0000 (00:21 -0500)]
Adding colors to the theme :)

Signed-off-by: dgfrancisco <dgfranciscorodriguez@gmail.com>
7 years agoonly create magent job if question has more than 1000 views
Patrick Aljord [Sat, 3 Sep 2011 04:18:57 +0000 (23:18 -0500)]
only create magent job if question has more than 1000 views
create famous and notable badges correctly

7 years agoAdd vars to colors
Jorge H. Cuadrado [Sat, 3 Sep 2011 02:11:27 +0000 (21:11 -0500)]
Add vars to colors

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoadding colors
Jorge H. Cuadrado [Sat, 3 Sep 2011 02:04:32 +0000 (21:04 -0500)]
adding colors

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agoAdding colors
dgfrancisco [Sat, 3 Sep 2011 01:43:13 +0000 (20:43 -0500)]
Adding colors

Signed-off-by: dgfrancisco <dgfranciscorodriguez@gmail.com>
7 years agoAdding colors
dgfrancisco [Sat, 3 Sep 2011 01:31:18 +0000 (20:31 -0500)]
Adding colors

Signed-off-by: dgfrancisco <dgfranciscorodriguez@gmail.com>
7 years agoMoving css color rules to colors.sass
Jorge H. Cuadrado [Sat, 3 Sep 2011 01:09:26 +0000 (20:09 -0500)]
Moving css color rules to colors.sass

Signed-off-by: Jorge H. Cuadrado <kuadrosxx@gmail.com>
7 years agochanges
dgfrancisco [Sat, 3 Sep 2011 01:06:53 +0000 (20:06 -0500)]
changes

Signed-off-by: dgfrancisco <dgfranciscorodriguez@gmail.com>