shapado:shapado.git
5 years agofix pages tracking: fixes-patcito
Jorge Cuadrado [Fri, 30 Mar 2012 00:21:52 +0000 (19:21 -0500)]
fix pages tracking:
- pageviews are for the user space and only for get request

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoImplement pageviews stats
Jorge Cuadrado [Thu, 29 Mar 2012 17:22:38 +0000 (12:22 -0500)]
Implement pageviews stats

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agofix default group logo
Patrick Aljord [Thu, 15 Mar 2012 01:28:30 +0000 (20:28 -0500)]
fix default group logo

5 years agoadded missing route to new_password
Patrick Aljord [Thu, 15 Mar 2012 01:17:58 +0000 (20:17 -0500)]
added missing route to new_password

5 years agofix default ads helper
Patrick Aljord [Thu, 15 Mar 2012 01:17:30 +0000 (20:17 -0500)]
fix default ads helper

5 years agodon't show default ads on old groups for now
Patrick Aljord [Thu, 15 Mar 2012 01:15:11 +0000 (20:15 -0500)]
don't show default ads on old groups for now

5 years agomake default adsense sidebar 300px width
Patrick Aljord [Thu, 15 Mar 2012 01:06:52 +0000 (20:06 -0500)]
make default adsense sidebar 300px width

5 years agodon't show ad widget when group doesn't have custom ads
Patrick Aljord [Thu, 15 Mar 2012 01:05:55 +0000 (20:05 -0500)]
don't show ad widget when group doesn't have custom ads

5 years agoonly position signin dropdown when user is signed out
Patrick Aljord [Thu, 15 Mar 2012 01:04:14 +0000 (20:04 -0500)]
only position signin dropdown when user is signed out

5 years agofix rebase commit
Patrick Aljord [Thu, 15 Mar 2012 01:03:19 +0000 (20:03 -0500)]
fix rebase commit

5 years agofix default avatar sizes
Patrick Aljord [Wed, 7 Mar 2012 20:01:24 +0000 (15:01 -0500)]
fix default avatar sizes

5 years agofix avatar sizes
Patrick Aljord [Tue, 6 Mar 2012 17:43:01 +0000 (12:43 -0500)]
fix avatar sizes

5 years agoalways show password inputs fields in /settings
Patrick Aljord [Tue, 6 Mar 2012 02:30:34 +0000 (21:30 -0500)]
always show password inputs fields in /settings
added a link to reset password in /settings

5 years agoi18n
Patrick Aljord [Mon, 5 Mar 2012 20:35:45 +0000 (15:35 -0500)]
i18n

5 years agoadded tooltips, i18n and styling to /plans
Patrick Aljord [Sun, 4 Mar 2012 03:42:03 +0000 (22:42 -0500)]
added tooltips, i18n and styling to /plans

5 years agoi18n for invoices
Patrick Aljord [Sun, 4 Mar 2012 00:01:15 +0000 (19:01 -0500)]
i18n for invoices

5 years agoadd default avatar from the noun project
Patrick Aljord [Sat, 3 Mar 2012 09:11:19 +0000 (04:11 -0500)]
add default avatar from the noun project

5 years agofix merge_user bug and add better styling
Patrick Aljord [Fri, 2 Mar 2012 01:36:33 +0000 (20:36 -0500)]
fix merge_user bug and add better styling

5 years agoput connect openid back
Patrick Aljord [Thu, 1 Mar 2012 22:28:33 +0000 (17:28 -0500)]
put connect openid back

5 years agomake sure to update activities on merging users
Patrick Aljord [Thu, 1 Mar 2012 22:20:06 +0000 (17:20 -0500)]
make sure to update activities on merging users

5 years agomake sure no embedded docs gets lost when merging two users
Patrick Aljord [Thu, 1 Mar 2012 07:18:59 +0000 (02:18 -0500)]
make sure no embedded docs gets lost when merging two users

5 years agoimprove merging accounts
David A. Cuadrado [Wed, 29 Feb 2012 17:44:25 +0000 (12:44 -0500)]
improve merging accounts

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
5 years agowip merge openid, just a link for now in /connect
Patrick Aljord [Wed, 29 Feb 2012 07:49:51 +0000 (02:49 -0500)]
wip merge openid, just a link for now in /connect

5 years agoadded missing template
Patrick Aljord [Tue, 28 Feb 2012 08:31:26 +0000 (03:31 -0500)]
added missing template

5 years agostyling
Patrick Aljord [Tue, 28 Feb 2012 08:29:08 +0000 (03:29 -0500)]
styling

5 years agodon't show custom domain section if user doesn't own any such groups
Patrick Aljord [Tue, 28 Feb 2012 08:28:46 +0000 (03:28 -0500)]
don't show custom domain section if user doesn't own any such groups

5 years agofix unchecking desktop notifications settings
Patrick Aljord [Tue, 28 Feb 2012 08:25:55 +0000 (03:25 -0500)]
fix unchecking desktop notifications settings

5 years agodon't sanitize using auto_link
Patrick Aljord [Sun, 4 Mar 2012 06:57:09 +0000 (01:57 -0500)]
don't sanitize using auto_link

5 years agofix mobile partial error
Patrick Aljord [Tue, 28 Feb 2012 20:56:51 +0000 (15:56 -0500)]
fix mobile partial error

5 years agoadd missing partial
David A. Cuadrado [Tue, 28 Feb 2012 18:25:00 +0000 (13:25 -0500)]
add missing partial

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
5 years agocheck if user is valid
David A. Cuadrado [Tue, 28 Feb 2012 18:13:15 +0000 (13:13 -0500)]
check if user is valid

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
5 years agomake sure the cache key is unique
David A. Cuadrado [Tue, 28 Feb 2012 17:43:08 +0000 (12:43 -0500)]
make sure the cache key is unique

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
5 years agoadd missing template
David A. Cuadrado [Tue, 28 Feb 2012 17:37:15 +0000 (12:37 -0500)]
add missing template

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
5 years agocaching key algorithm
David A. Cuadrado [Tue, 28 Feb 2012 17:34:04 +0000 (12:34 -0500)]
caching key algorithm

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
5 years agocache user's group list
David A. Cuadrado [Tue, 28 Feb 2012 17:03:32 +0000 (12:03 -0500)]
cache user's group list

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
5 years agochange cache key
David A. Cuadrado [Tue, 28 Feb 2012 16:49:05 +0000 (11:49 -0500)]
change cache key

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
5 years agoadd more indexes
David A. Cuadrado [Tue, 28 Feb 2012 16:23:06 +0000 (11:23 -0500)]
add more indexes

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
5 years agopass question to partials
David A. Cuadrado [Tue, 28 Feb 2012 07:54:12 +0000 (02:54 -0500)]
pass question to partials

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
5 years agoadd missing template
David A. Cuadrado [Tue, 28 Feb 2012 07:50:55 +0000 (02:50 -0500)]
add missing template

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
5 years agodo not raise find errors
David A. Cuadrado [Tue, 28 Feb 2012 07:36:17 +0000 (02:36 -0500)]
do not raise find errors

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
5 years agofix related questions widget
David A. Cuadrado [Tue, 28 Feb 2012 07:16:08 +0000 (02:16 -0500)]
fix related questions widget

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
5 years agointegrate with newrelic
Patrick Aljord [Mon, 27 Feb 2012 19:41:24 +0000 (14:41 -0500)]
integrate with newrelic

Conflicts:

Gemfile.lock

5 years agoFix some broken specs
Jorge Cuadrado [Thu, 1 Mar 2012 01:17:59 +0000 (20:17 -0500)]
Fix some broken specs

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agorename methods
David Cuadrado [Wed, 28 Mar 2012 02:00:02 +0000 (21:00 -0500)]
rename methods

Signed-off-by: David Cuadrado <krawek@gmail.com>
5 years agoadd a method to get the current version
David Cuadrado [Wed, 28 Mar 2012 01:53:52 +0000 (20:53 -0500)]
add a method to get the current version

Signed-off-by: David Cuadrado <krawek@gmail.com>
5 years agoadd helper methods to check versions
David Cuadrado [Wed, 28 Mar 2012 01:35:37 +0000 (20:35 -0500)]
add helper methods to check versions

Signed-off-by: David Cuadrado <krawek@gmail.com>
5 years agobundle update
David Cuadrado [Sat, 24 Mar 2012 23:09:35 +0000 (18:09 -0500)]
bundle update

Signed-off-by: David Cuadrado <krawek@gmail.com>
5 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 11 Mar 2012 21:05:32 +0000 (22:05 +0100)]
Localisation updates from translatewiki.net.

5 years agoConsistency update.
Siebrand Mazeland [Mon, 5 Mar 2012 19:38:51 +0000 (20:38 +0100)]
Consistency update.

5 years agoFix typo.
Siebrand Mazeland [Mon, 5 Mar 2012 19:36:07 +0000 (20:36 +0100)]
Fix typo.

5 years agoMerge remote-tracking branch 'origin/fabrication'
David A. Cuadrado [Tue, 28 Feb 2012 06:56:16 +0000 (01:56 -0500)]
Merge remote-tracking branch 'origin/fabrication'

Conflicts:
Gemfile.lock

5 years agoMerge remote-tracking branch 'origin/fixes-patcito'
David A. Cuadrado [Tue, 28 Feb 2012 06:55:23 +0000 (01:55 -0500)]
Merge remote-tracking branch 'origin/fixes-patcito'

Conflicts:
app/models/group.rb

5 years agoMerge remote-tracking branch 'origin/new-ui'
David A. Cuadrado [Tue, 28 Feb 2012 06:54:11 +0000 (01:54 -0500)]
Merge remote-tracking branch 'origin/new-ui'

5 years agoUpdate bug hunter
Jorge Cuadrado [Tue, 28 Feb 2012 02:13:56 +0000 (21:13 -0500)]
Update bug hunter

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoUpadate mongoid and mongoid_ext
Jorge Cuadrado [Tue, 28 Feb 2012 00:32:59 +0000 (19:32 -0500)]
Upadate mongoid and mongoid_ext

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoFix some broken specs
Jorge Cuadrado [Mon, 27 Feb 2012 20:17:24 +0000 (15:17 -0500)]
Fix some broken specs

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agointegrate with newrelic
Patrick Aljord [Mon, 27 Feb 2012 01:52:53 +0000 (20:52 -0500)]
integrate with newrelic

5 years agoimplement invoices for private users
David A. Cuadrado [Mon, 27 Feb 2012 02:48:24 +0000 (21:48 -0500)]
implement invoices for private users

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
5 years agoreimplement payments system using stripe
David A. Cuadrado [Mon, 27 Feb 2012 02:16:17 +0000 (21:16 -0500)]
reimplement payments system using stripe

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
5 years agoFix some broken specs
Jorge Cuadrado [Mon, 27 Feb 2012 00:07:50 +0000 (19:07 -0500)]
Fix some broken specs

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoFinish port to fabrication
Jorge Cuadrado [Sun, 26 Feb 2012 20:41:30 +0000 (15:41 -0500)]
Finish port to fabrication

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoStart porting factories from machinist_mongoid to fabrication
Jorge Cuadrado [Sun, 26 Feb 2012 05:35:20 +0000 (00:35 -0500)]
Start porting factories from machinist_mongoid to fabrication

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoFix some broken specs new-ui
Jorge Cuadrado [Sun, 26 Feb 2012 04:09:08 +0000 (23:09 -0500)]
Fix some broken specs

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoMerge remote-tracking branch 'senekis/new-ui' into new-ui
Jorge Cuadrado [Sun, 26 Feb 2012 03:00:05 +0000 (22:00 -0500)]
Merge remote-tracking branch 'senekis/new-ui' into new-ui

5 years agoImprove theme style and fix toggle comments behavior
Jorge Cuadrado [Sun, 26 Feb 2012 02:19:20 +0000 (21:19 -0500)]
Improve theme style and fix toggle comments behavior

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
5 years agoadd :validate => false to all references/has_many/one
Patrick Aljord [Sun, 26 Feb 2012 00:35:06 +0000 (19:35 -0500)]
add :validate => false to all references/has_many/one

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 agoUnit test User#followers
Johanna Mantilla Duque [Mon, 20 Feb 2012 04:17:02 +0000 (23:17 -0500)]
Unit test User#followers

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