shapado:shapado.git
5 years agoi18n
Patrick Aljord [Sat, 25 Feb 2012 23:25:20 +0000 (18:25 -0500)]
i18n

5 years agofix styling of join and sign in notices
Patrick Aljord [Sat, 25 Feb 2012 05:55:46 +0000 (00:55 -0500)]
fix styling of join and sign in notices

5 years agoadded openid form to dropdown
Patrick Aljord [Sat, 25 Feb 2012 05:16:11 +0000 (00:16 -0500)]
added openid form to dropdown

5 years agoi18n
Patrick Aljord [Thu, 23 Feb 2012 01:59:52 +0000 (20:59 -0500)]
i18n

5 years agomake adsense 300px width add fit
Patrick Aljord [Thu, 23 Feb 2012 01:59:33 +0000 (20:59 -0500)]
make adsense 300px width add fit

5 years agofix styling for error message
Patrick Aljord [Wed, 22 Feb 2012 23:51:27 +0000 (18:51 -0500)]
fix styling for error message

5 years agocheck if user is connected
Patrick Aljord [Wed, 22 Feb 2012 07:41:04 +0000 (02:41 -0500)]
check if user is connected

5 years agomove reseting custom domain to groups controller
Patrick Aljord [Wed, 22 Feb 2012 20:05:36 +0000 (15:05 -0500)]
move reseting custom domain to groups controller
added checked for permissions

5 years agowhen a user changes the domain of a group, redirect to reset domain page
Patrick Aljord [Tue, 21 Feb 2012 00:25:20 +0000 (19:25 -0500)]
when a user changes the domain of a group, redirect to reset domain page

5 years agomake chosen autocomplete work in /settings
Patrick Aljord [Mon, 20 Feb 2012 07:44:05 +0000 (02:44 -0500)]
make chosen autocomplete work in /settings

5 years agodomain must be unique
David A. Cuadrado [Wed, 22 Feb 2012 15:15:52 +0000 (10:15 -0500)]
domain must be unique

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
5 years agoMerge remote-tracking branch 'origin/new-ui'
David A. Cuadrado [Wed, 22 Feb 2012 04:31:42 +0000 (23:31 -0500)]
Merge remote-tracking branch 'origin/new-ui'

5 years agoImprove default theme
Jorge Cuadrado [Wed, 22 Feb 2012 03:48:41 +0000 (22:48 -0500)]
Improve default theme

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoMerge remote-tracking branch 'origin/new-ui'
David A. Cuadrado [Tue, 21 Feb 2012 22:45:32 +0000 (17:45 -0500)]
Merge remote-tracking branch 'origin/new-ui'

5 years agoreposition login dropdown on clicking forms links
Patrick Aljord [Mon, 20 Feb 2012 06:40:59 +0000 (01:40 -0500)]
reposition login dropdown on clicking forms links

5 years agoshow languages tipsy at South
Patrick Aljord [Mon, 20 Feb 2012 06:38:30 +0000 (01:38 -0500)]
show languages tipsy at South

5 years agoMerge branch 'new-ui-pat' into new-ui-login
Patrick Aljord [Mon, 20 Feb 2012 06:35:54 +0000 (01:35 -0500)]
Merge branch 'new-ui-pat' into new-ui-login

5 years agoalign login dropdown on the left
Patrick Aljord [Mon, 20 Feb 2012 06:35:23 +0000 (01:35 -0500)]
align login dropdown on the left

5 years agoadd members.js to application.js and set 'list-style: none' rule to all ul and ol...
Jorge Cuadrado [Mon, 20 Feb 2012 04:33:06 +0000 (23:33 -0500)]
add members.js to application.js and set 'list-style: none' rule to all ul and ol tags

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoFix edit answer form
Jorge Cuadrado [Mon, 20 Feb 2012 03:53:17 +0000 (22:53 -0500)]
Fix edit answer form

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

Conflicts:
app/controllers/groups_controller.rb

5 years agoMerge remote-tracking branch 'gitorious-shapado/new-ui' into new-ui
Johanna Mantilla Duque [Mon, 20 Feb 2012 03:13:25 +0000 (22:13 -0500)]
Merge remote-tracking branch 'gitorious-shapado/new-ui' into new-ui

5 years agomake sure no group languages are blank
Jorge Cuadrado [Mon, 20 Feb 2012 03:11:30 +0000 (22:11 -0500)]
make sure no group languages are blank

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoMerge remote-tracking branch 'gitorious-shapado/new-ui-login' into new-ui
Johanna Mantilla Duque [Mon, 20 Feb 2012 02:54:41 +0000 (21:54 -0500)]
Merge remote-tracking branch 'gitorious-shapado/new-ui-login' into new-ui

5 years agomake sure no group languages are blank on save
Patrick Aljord [Mon, 20 Feb 2012 02:52:42 +0000 (21:52 -0500)]
make sure no group languages are blank on save

5 years agofix autocomplete in Groups#new
Patrick Aljord [Mon, 20 Feb 2012 02:52:25 +0000 (21:52 -0500)]
fix autocomplete in Groups#new

5 years agoMerge remote-tracking branch 'gitorious-shapado/new-ui' into new-ui
Johanna Mantilla Duque [Mon, 20 Feb 2012 02:50:18 +0000 (21:50 -0500)]
Merge remote-tracking branch 'gitorious-shapado/new-ui' into new-ui

5 years agoadd left border to sign in dropdown
Patrick Aljord [Mon, 20 Feb 2012 02:30:06 +0000 (21:30 -0500)]
add left border to sign in dropdown

5 years agomove dropdown css from layout.css to items.css
Patrick Aljord [Mon, 20 Feb 2012 02:29:31 +0000 (21:29 -0500)]
move dropdown css from layout.css to items.css

5 years agoremove devise helpers from application_helper
Patrick Aljord [Mon, 20 Feb 2012 02:27:24 +0000 (21:27 -0500)]
remove devise helpers from application_helper

5 years agoMerge branch 'new-ui' of git://gitorious.org/shapado/shapado into new-ui
Johanna Mantilla Duque [Mon, 20 Feb 2012 01:56:51 +0000 (20:56 -0500)]
Merge branch 'new-ui' of git://gitorious.org/shapado/shapado into new-ui

5 years agoembed sign in and sign up forms in drop down
Patrick Aljord [Thu, 16 Feb 2012 04:53:23 +0000 (23:53 -0500)]
embed sign in and sign up forms in drop down

5 years agohide tooltip on scroll
Patrick Aljord [Mon, 6 Feb 2012 01:04:16 +0000 (20:04 -0500)]
hide tooltip on scroll

5 years agoMerge branch 'new-ui' of gitorious.org:shapado/shapado into new-ui
Patrick Aljord [Mon, 20 Feb 2012 01:53:19 +0000 (20:53 -0500)]
Merge branch 'new-ui' of gitorious.org:shapado/shapado into new-ui

5 years agoMerge remote-tracking branch 'origin/new-ui-pat' into new-ui
Jorge Cuadrado [Mon, 20 Feb 2012 01:50:24 +0000 (20:50 -0500)]
Merge remote-tracking branch 'origin/new-ui-pat' into new-ui

5 years agoFix markdown when current_group is nil
Johanna Mantilla Duque [Mon, 20 Feb 2012 00:52:09 +0000 (19:52 -0500)]
Fix markdown when current_group is nil

Signed-off-by: Johanna Mantilla Duque <johanna1431@gmail.com>
5 years agofix Jobs::Answers#on_create_answer when the users does not have followers
Johanna Mantilla Duque [Mon, 20 Feb 2012 00:51:48 +0000 (19:51 -0500)]
fix Jobs::Answers#on_create_answer when the users does not have followers

Signed-off-by: Johanna Mantilla Duque <johanna1431@gmail.com>
5 years agoRemove _setAllowHash of googlean_script - This method is deprecated
Johanna Mantilla Duque [Sun, 12 Feb 2012 19:57:45 +0000 (14:57 -0500)]
Remove _setAllowHash of googlean_script - This method is deprecated

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, 12 Feb 2012 19:57:06 +0000 (14:57 -0500)]
Merge branch 'new-ui' of git://gitorious.org/shapado/shapado into new-ui

5 years agoMerge remote-tracking branch 'origin/new-ui'
David A. Cuadrado [Sun, 12 Feb 2012 19:00:56 +0000 (14:00 -0500)]
Merge remote-tracking branch 'origin/new-ui'

5 years agoMerge remote-tracking branch 'origin/rails32'
David A. Cuadrado [Sun, 12 Feb 2012 19:00:30 +0000 (14:00 -0500)]
Merge remote-tracking branch 'origin/rails32'

5 years agoadded missing icons for top tabs
Patrick Aljord [Thu, 9 Feb 2012 20:58:11 +0000 (15:58 -0500)]
added missing icons for top tabs

5 years agohide tooltip on scroll
Patrick Aljord [Mon, 6 Feb 2012 01:04:16 +0000 (20:04 -0500)]
hide tooltip on scroll

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 agoMerge remote-tracking branch 'gitorious-shapado/new-ui-pat' into new-ui
Johanna Mantilla Duque [Sun, 5 Feb 2012 17:31:32 +0000 (12:31 -0500)]
Merge remote-tracking branch 'gitorious-shapado/new-ui-pat' into new-ui

5 years agoMerge branch 'new-ui' of git://gitorious.org/shapado/shapado into new-ui
Johanna Mantilla Duque [Sun, 5 Feb 2012 17:31:16 +0000 (12:31 -0500)]
Merge branch 'new-ui' of git://gitorious.org/shapado/shapado into new-ui

5 years agoWorking in unit test of Jobs::Mailer
Johanna Mantilla Duque [Sun, 5 Feb 2012 07:30:56 +0000 (02:30 -0500)]
Working in unit test of Jobs::Mailer

Signed-off-by: Johanna Mantilla Duque <johanna1431@gmail.com>
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 agoFix cancel edit comment
Jorge Cuadrado [Sun, 5 Feb 2012 06:38:46 +0000 (01:38 -0500)]
Fix cancel edit comment

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoFixed route of chosen-sprite.png
Johanna Mantilla Duque [Sun, 5 Feb 2012 06:23:37 +0000 (01:23 -0500)]
Fixed route of chosen-sprite.png

Signed-off-by: Johanna Mantilla Duque <johanna1431@gmail.com>
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