shapado:cantonics-shapado.git
5 years agomake sure no preferred languages are blank new-ui-pat
Patrick Aljord [Sun, 5 Feb 2012 23:40:24 +0000 (18:40 -0500)]
make sure no preferred languages are blank

5 years agosmooth scroll to top when clicking on topbar à la G+
Patrick Aljord [Sun, 5 Feb 2012 07:03:20 +0000 (02:03 -0500)]
smooth scroll to top when clicking on topbar à la G+

5 years agoi18n fix and tooltip fix to hide it better
Patrick Aljord [Sun, 5 Feb 2012 06:11:18 +0000 (01:11 -0500)]
i18n fix and tooltip fix to hide it better

5 years agomake sure tooltip closes on mouseleave
Patrick Aljord [Sun, 5 Feb 2012 01:04:15 +0000 (20:04 -0500)]
make sure tooltip closes on mouseleave

5 years agoMerge remote-tracking branch 'senekis/new-ui' into new-ui
Jorge Cuadrado [Sun, 5 Feb 2012 05:58:49 +0000 (00:58 -0500)]
Merge remote-tracking branch 'senekis/new-ui' into new-ui

5 years agoFixed xapit search in related_questions
Johanna Mantilla Duque [Sun, 5 Feb 2012 05:38:54 +0000 (00:38 -0500)]
Fixed xapit search in related_questions

Signed-off-by: Johanna Mantilla Duque <johanna1431@gmail.com>
5 years agodo not use ajax to post answers and hide the answer form when the user already answer...
Jorge Cuadrado [Sun, 5 Feb 2012 05:26:26 +0000 (00:26 -0500)]
do not use ajax to post answers and hide the answer form when the user already answered the question

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoadded class action for flag in answer_toolbar
Johanna Mantilla Duque [Sun, 5 Feb 2012 04:23:25 +0000 (23:23 -0500)]
added class action for flag in answer_toolbar

Signed-off-by: Johanna Mantilla Duque <johanna1431@gmail.com>
5 years agoi18n activity.destroyed
Johanna Mantilla Duque [Sun, 5 Feb 2012 04:22:45 +0000 (23:22 -0500)]
i18n activity.destroyed

Signed-off-by: Johanna Mantilla Duque <johanna1431@gmail.com>
5 years agoMerge branch 'new-ui' of git://gitorious.org/shapado/shapado into new-ui
Johanna Mantilla Duque [Sun, 5 Feb 2012 01:04:51 +0000 (20:04 -0500)]
Merge branch 'new-ui' of git://gitorious.org/shapado/shapado into new-ui

5 years agofix layout when the sidebar is empty and don't show the sidebar for users controllers...
Jorge Cuadrado [Sat, 4 Feb 2012 04:39:01 +0000 (23:39 -0500)]
fix layout when the sidebar is empty and don't show the sidebar for users controllers views

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoMerge remote-tracking branch 'origin/master' into new-ui
Jorge Cuadrado [Fri, 3 Feb 2012 22:20:45 +0000 (17:20 -0500)]
Merge remote-tracking branch 'origin/master' into new-ui

5 years agoMerge remote-tracking branch 'origin/rails32' into new-ui
Jorge Cuadrado [Fri, 3 Feb 2012 21:24:10 +0000 (16:24 -0500)]
Merge remote-tracking branch 'origin/rails32' into new-ui

Conflicts:
Gemfile
Gemfile.lock

5 years agoadded ajax tooltip to users +i18n
Patrick Aljord [Fri, 3 Feb 2012 01:18:10 +0000 (20:18 -0500)]
added ajax tooltip to users +i18n

5 years agoimproved tag tooltip style
Patrick Aljord [Thu, 2 Feb 2012 22:29:30 +0000 (17:29 -0500)]
improved tag tooltip style

5 years agoMerge remote-tracking branch 'origin/new-ui-pat' into new-ui
Jorge Cuadrado [Wed, 1 Feb 2012 05:27:18 +0000 (00:27 -0500)]
Merge remote-tracking branch 'origin/new-ui-pat' into new-ui

Conflicts:
app/assets/stylesheets/helper/items.css.sass

5 years agouse image-url
Patrick Aljord [Wed, 1 Feb 2012 05:25:04 +0000 (00:25 -0500)]
use image-url

5 years agomissing image
Patrick Aljord [Wed, 1 Feb 2012 05:23:36 +0000 (00:23 -0500)]
missing image

5 years agoFix flash message style
Jorge Cuadrado [Wed, 1 Feb 2012 03:41:39 +0000 (22:41 -0500)]
Fix flash message style

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoadd link to edit tag in tooltip
Patrick Aljord [Wed, 1 Feb 2012 00:16:06 +0000 (19:16 -0500)]
add link to edit tag in tooltip

5 years agoadded ajax tooltip for tags
Patrick Aljord [Wed, 1 Feb 2012 00:12:14 +0000 (19:12 -0500)]
added ajax tooltip for tags

5 years agoFix search view and improve empty message implementation
Jorge Cuadrado [Tue, 31 Jan 2012 23:03:40 +0000 (18:03 -0500)]
Fix search view and improve empty message implementation

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoImprove themes index style
Jorge Cuadrado [Tue, 31 Jan 2012 20:22:45 +0000 (15:22 -0500)]
Improve themes index style

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoAdd icons to question's toolbar
Jorge Cuadrado [Tue, 31 Jan 2012 18:00:13 +0000 (13:00 -0500)]
Add icons to question's toolbar

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoonly show friends that are group members on user's profile page
Jorge Cuadrado [Tue, 31 Jan 2012 06:12:21 +0000 (01:12 -0500)]
only show friends that are group members on user's profile page

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoFix deleting widgets
Jorge Cuadrado [Tue, 31 Jan 2012 04:09:14 +0000 (23:09 -0500)]
Fix deleting widgets

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Mon, 30 Jan 2012 19:21:27 +0000 (20:21 +0100)]
Localisation updates from translatewiki.net.

5 years agoFix modernizr inclusion
Jorge Cuadrado [Mon, 30 Jan 2012 04:35:37 +0000 (23:35 -0500)]
Fix modernizr inclusion

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoi18n and tooltips
Patrick Aljord [Mon, 30 Jan 2012 01:13:37 +0000 (20:13 -0500)]
i18n and tooltips

5 years agoImprove badges index
Jorge Cuadrado [Sun, 29 Jan 2012 23:22:19 +0000 (18:22 -0500)]
Improve badges index
- Show badges for tags
- Filter badges by type

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoImprove pages style
Jorge Cuadrado [Sun, 29 Jan 2012 06:32:02 +0000 (01:32 -0500)]
Improve pages style

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoUpdate rails version rails32
Jorge Cuadrado [Sun, 29 Jan 2012 03:51:23 +0000 (22:51 -0500)]
Update rails version

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoMerge remote-tracking branch 'gitorious-shapado/master' into new-ui
Johanna Mantilla Duque [Sun, 29 Jan 2012 03:25:53 +0000 (22:25 -0500)]
Merge remote-tracking branch 'gitorious-shapado/master' into new-ui

5 years agoMerge remote-tracking branch 'origin/new-ui-pat' into new-ui
Jorge Cuadrado [Sat, 28 Jan 2012 06:12:32 +0000 (01:12 -0500)]
Merge remote-tracking branch 'origin/new-ui-pat' into new-ui

5 years agoimprove badges style
Jorge Cuadrado [Sat, 28 Jan 2012 06:00:08 +0000 (01:00 -0500)]
improve badges style

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agowhen group only has one language, set language filter to that language
Patrick Aljord [Sat, 28 Jan 2012 01:41:08 +0000 (20:41 -0500)]
when group only has one language, set language filter to that language

5 years agoshow empty box when group has no questions at all
Patrick Aljord [Sat, 28 Jan 2012 01:40:34 +0000 (20:40 -0500)]
show empty box when group has no questions at all

5 years agofix bug that won't update groups when languages are empty
Patrick Aljord [Sat, 28 Jan 2012 01:31:35 +0000 (20:31 -0500)]
fix bug that won't update groups when languages are empty

5 years agoImprove style for toolbars
Jorge Cuadrado [Sat, 28 Jan 2012 00:09:45 +0000 (19:09 -0500)]
Improve style for toolbars

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agodon't show ask question message if language filter != any
Patrick Aljord [Fri, 27 Jan 2012 06:50:10 +0000 (01:50 -0500)]
don't show ask question message if language filter != any

5 years agofix invitation
Patrick Aljord [Fri, 27 Jan 2012 06:14:02 +0000 (01:14 -0500)]
fix invitation

5 years agoadded link to change language when index is empty
Patrick Aljord [Thu, 26 Jan 2012 01:18:07 +0000 (20:18 -0500)]
added link to change language when index is empty

5 years agotell user to switch language when questions index is empty
Patrick Aljord [Thu, 26 Jan 2012 00:34:53 +0000 (19:34 -0500)]
tell user to switch language when questions index is empty

5 years agoremove a console.log
Patrick Aljord [Wed, 25 Jan 2012 23:48:19 +0000 (18:48 -0500)]
remove a console.log

5 years agoImprove show question
Jorge Cuadrado [Fri, 27 Jan 2012 23:01:46 +0000 (18:01 -0500)]
Improve show question

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agofix invitation
Patrick Aljord [Fri, 27 Jan 2012 06:14:02 +0000 (01:14 -0500)]
fix invitation

5 years agoAdd topbar color attribute to themes
Jorge Cuadrado [Fri, 27 Jan 2012 04:56:43 +0000 (23:56 -0500)]
Add topbar color attribute to themes

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agosplit theme_template and improve some styles
Jorge Cuadrado [Fri, 27 Jan 2012 03:24:23 +0000 (22:24 -0500)]
split theme_template and improve some styles

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoAdd clearfix for retags form
Jorge Cuadrado [Thu, 26 Jan 2012 05:33:58 +0000 (00:33 -0500)]
Add clearfix for retags form

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoMove answer form to the page bottom
Jorge Cuadrado [Thu, 26 Jan 2012 02:29:29 +0000 (21:29 -0500)]
Move answer form to the page bottom

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoMerge remote-tracking branch 'origin/new-ui-pat' into new-ui
Jorge Cuadrado [Thu, 26 Jan 2012 00:04:16 +0000 (19:04 -0500)]
Merge remote-tracking branch 'origin/new-ui-pat' into new-ui

5 years agoremove unused css
Patrick Aljord [Wed, 25 Jan 2012 23:41:25 +0000 (18:41 -0500)]
remove unused css

5 years agomake language filter look more consistent
Patrick Aljord [Wed, 25 Jan 2012 23:40:22 +0000 (18:40 -0500)]
make language filter look more consistent

5 years agomake language filter work
Patrick Aljord [Mon, 23 Jan 2012 23:51:08 +0000 (18:51 -0500)]
make language filter work

5 years agoDon't show banned questions on Tags#show
Jorge Cuadrado [Tue, 24 Jan 2012 06:21:18 +0000 (01:21 -0500)]
Don't show banned questions on Tags#show

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoadd more margin to table tag list
Jorge Cuadrado [Tue, 24 Jan 2012 06:09:50 +0000 (01:09 -0500)]
add more margin to table tag list

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoMake badges index's html consistent
Jorge Cuadrado [Tue, 24 Jan 2012 06:07:25 +0000 (01:07 -0500)]
Make badges index's html consistent

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoImprove Tags#index style
Jorge Cuadrado [Tue, 24 Jan 2012 05:57:29 +0000 (00:57 -0500)]
Improve Tags#index style

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoUse .clearfix instead of .clear
Jorge Cuadrado [Tue, 24 Jan 2012 03:30:47 +0000 (22:30 -0500)]
Use .clearfix instead of .clear

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoFix widgets style
Jorge Cuadrado [Sun, 22 Jan 2012 03:57:37 +0000 (22:57 -0500)]
Fix widgets style

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoimplement commenting form à la google+/facebook
Jorge Cuadrado [Sun, 22 Jan 2012 01:36:58 +0000 (20:36 -0500)]
implement commenting form à la google+/facebook

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoMerge remote-tracking branch 'origin/new-ui-pat' into new-ui
Jorge Cuadrado [Sat, 21 Jan 2012 00:06:14 +0000 (19:06 -0500)]
Merge remote-tracking branch 'origin/new-ui-pat' into new-ui

5 years agoadd join dialog
Patrick Aljord [Fri, 20 Jan 2012 23:26:23 +0000 (18:26 -0500)]
add join dialog

5 years agoRemove share action from question's toolbar and promote both 'create reward' and...
Jorge Cuadrado [Fri, 20 Jan 2012 21:36:20 +0000 (16:36 -0500)]
Remove share action from question's toolbar and promote both 'create reward' and 'follow up' actions to main actions on question's toolbar

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoRevert "add user to group on answering, asking, commenting"
Patrick Aljord [Fri, 20 Jan 2012 02:50:50 +0000 (21:50 -0500)]
Revert "add user to group on answering, asking, commenting"

This reverts commit 405e96ef4f0c6a5b774b961d059be86ae7e9f1c7.

5 years agoadded options to turn off geolocation tracking
Patrick Aljord [Wed, 18 Jan 2012 23:53:42 +0000 (18:53 -0500)]
added options to turn off geolocation tracking
each owner of a group can now turn off this feature group wide

5 years agoadd user to group on answering, asking, commenting
Patrick Aljord [Wed, 18 Jan 2012 23:10:26 +0000 (18:10 -0500)]
add user to group on answering, asking, commenting
Before that, if you signed in from a group and then browsed to
another, it was impossible to do anything without signing out and
signing back in.

5 years agoGet back code for questins index
Jorge Cuadrado [Tue, 17 Jan 2012 07:06:04 +0000 (02:06 -0500)]
Get back code for questins index

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoFix show badge style
Jorge Cuadrado [Tue, 17 Jan 2012 06:54:31 +0000 (01:54 -0500)]
Fix show badge style

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoGet back stylesheet code for themes
Jorge Cuadrado [Tue, 17 Jan 2012 06:49:35 +0000 (01:49 -0500)]
Get back stylesheet code for themes

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoRemove logo from doc layout header and add stylesheet for plans page
Jorge Cuadrado [Tue, 17 Jan 2012 06:46:39 +0000 (01:46 -0500)]
Remove logo from doc layout header and add stylesheet for plans page

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoFix flash message style and get back stylesheet code for widgets, announcements,...
Jorge Cuadrado [Tue, 17 Jan 2012 06:41:19 +0000 (01:41 -0500)]
Fix flash message style and get back stylesheet code for widgets, announcements, invitations, manage and sessions modules

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoImprove application and manage layouts
Jorge Cuadrado [Tue, 17 Jan 2012 06:06:59 +0000 (01:06 -0500)]
Improve application and manage layouts
- Move primary nav to the header's top
- Remove group logo from the first column

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoFix filter questions routes
Jorge Cuadrado [Tue, 17 Jan 2012 05:34:12 +0000 (00:34 -0500)]
Fix filter questions routes

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agofix jpicker and codemirror
Jorge Cuadrado [Tue, 17 Jan 2012 01:28:47 +0000 (20:28 -0500)]
fix jpicker and codemirror

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoRemove old jquery.mobile files, move jquery-ui assets from public to vendor, and...
Jorge Cuadrado [Mon, 16 Jan 2012 22:26:26 +0000 (17:26 -0500)]
Remove old jquery.mobile files, move jquery-ui assets from public to vendor, and improve a bit users index and show questions structure

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoMerge remote-tracking branch 'senekis/new-ui' into new-ui
Jorge Cuadrado [Mon, 16 Jan 2012 21:32:30 +0000 (16:32 -0500)]
Merge remote-tracking branch 'senekis/new-ui' into new-ui

5 years agoadd retag back
Patrick Aljord [Mon, 16 Jan 2012 07:05:05 +0000 (02:05 -0500)]
add retag back

5 years agoUse session in the filters of questions
Johanna Mantilla Duque [Mon, 16 Jan 2012 05:24:52 +0000 (00:24 -0500)]
Use session in the filters of questions

Signed-off-by: Johanna Mantilla Duque <johanna1431@gmail.com>
5 years agoMerge remote-tracking branch 'gitorious-shapado/new-ui' into new-ui
Johanna Mantilla Duque [Mon, 16 Jan 2012 04:32:22 +0000 (23:32 -0500)]
Merge remote-tracking branch 'gitorious-shapado/new-ui' into new-ui

5 years agoMove group's logo to the topbar
Jorge Cuadrado [Mon, 16 Jan 2012 04:24:19 +0000 (23:24 -0500)]
Move group's logo to the topbar

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoadded filter in session
Johanna Mantilla Duque [Mon, 16 Jan 2012 02:55:53 +0000 (21:55 -0500)]
added filter in session

Signed-off-by: Johanna Mantilla Duque <johanna1431@gmail.com>
5 years agoMissing files
Johanna Mantilla Duque [Mon, 16 Jan 2012 02:52:29 +0000 (21:52 -0500)]
Missing files

Signed-off-by: Johanna Mantilla Duque <johanna1431@gmail.com>
5 years agoMoved filters: by_me, contributed, expertise, preferred and feed to questions
Johanna Mantilla Duque [Mon, 16 Jan 2012 02:25:06 +0000 (21:25 -0500)]
Moved filters: by_me, contributed, expertise, preferred and feed to questions

Signed-off-by: Johanna Mantilla Duque <johanna1431@gmail.com>
5 years agoMerge remote-tracking branch 'gitorious-shapado/new-ui' into new-ui
Johanna Mantilla Duque [Mon, 16 Jan 2012 01:21:50 +0000 (20:21 -0500)]
Merge remote-tracking branch 'gitorious-shapado/new-ui' into new-ui

5 years agoMerge remote-tracking branch 'origin/new-ui' into new-ui
Jorge Cuadrado [Mon, 16 Jan 2012 00:43:23 +0000 (19:43 -0500)]
Merge remote-tracking branch 'origin/new-ui' into new-ui

5 years agoImprove quick question box behavior
Jorge Cuadrado [Mon, 16 Jan 2012 00:42:03 +0000 (19:42 -0500)]
Improve quick question box behavior

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoMerge remote-tracking branch 'gitorious-shapado/new-ui' into new-ui
Johanna Mantilla Duque [Mon, 16 Jan 2012 00:16:24 +0000 (19:16 -0500)]
Merge remote-tracking branch 'gitorious-shapado/new-ui' into new-ui

5 years agoremove history of toolbar - show question
Johanna Mantilla Duque [Mon, 16 Jan 2012 00:13:04 +0000 (19:13 -0500)]
remove history of toolbar - show question

Signed-off-by: Johanna Mantilla Duque <johanna1431@gmail.com>
5 years agofix form's css
Patrick Aljord [Sun, 15 Jan 2012 23:46:37 +0000 (18:46 -0500)]
fix form's css

5 years agoimprove show question
Johanna Mantilla Duque [Sun, 15 Jan 2012 23:31:32 +0000 (18:31 -0500)]
improve show question

Signed-off-by: Johanna Mantilla Duque <johanna1431@gmail.com>
5 years agoforgot to git add those
Patrick Aljord [Sun, 15 Jan 2012 23:10:22 +0000 (18:10 -0500)]
forgot to git add those

5 years agofix chosen
Patrick Aljord [Sun, 15 Jan 2012 22:45:09 +0000 (17:45 -0500)]
fix  chosen

5 years agoUncompressed jqmobile css
Patrick Aljord [Sun, 15 Jan 2012 22:15:02 +0000 (17:15 -0500)]
Uncompressed jqmobile css

5 years agoMerge remote-tracking branch 'origin/new-ui-mobile' into new-ui
Jorge Cuadrado [Sun, 15 Jan 2012 22:12:34 +0000 (17:12 -0500)]
Merge remote-tracking branch 'origin/new-ui-mobile' into new-ui

5 years agocss -> scss new-ui-mobile
Patrick Aljord [Sun, 15 Jan 2012 22:08:25 +0000 (17:08 -0500)]
css -> scss

5 years agorefactor mobile assets
Patrick Aljord [Sun, 15 Jan 2012 21:31:01 +0000 (16:31 -0500)]
refactor mobile assets

5 years agoAdd Filter menu to navigation
Jorge Cuadrado [Sun, 15 Jan 2012 21:53:31 +0000 (16:53 -0500)]
Add Filter menu to navigation

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoRemove doble inclusion of javascript files
Jorge Cuadrado [Sun, 15 Jan 2012 20:39:02 +0000 (15:39 -0500)]
Remove doble inclusion of javascript files

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoFix 'a' style and add markdown style
Jorge Cuadrado [Sun, 15 Jan 2012 20:24:36 +0000 (15:24 -0500)]
Fix 'a' style and add markdown style

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>