shapado:shapado-esd.git
5 years agomore landing stuff wip-invoices
Patrick Aljord [Fri, 22 Jun 2012 08:57:14 +0000 (09:57 +0100)]
more landing stuff

5 years agomore landing stuff
Patrick Aljord [Fri, 22 Jun 2012 08:45:51 +0000 (09:45 +0100)]
more landing stuff

5 years agofix retag callback
Patrick Aljord [Fri, 22 Jun 2012 06:25:03 +0000 (07:25 +0100)]
fix retag callback

5 years agoi18n
Patrick Aljord [Fri, 22 Jun 2012 05:46:53 +0000 (06:46 +0100)]
i18n

5 years agoi18n
Patrick Aljord [Fri, 22 Jun 2012 05:39:38 +0000 (06:39 +0100)]
i18n

5 years agohide more actions menu when user is signed out
Patrick Aljord [Fri, 22 Jun 2012 04:31:02 +0000 (05:31 +0100)]
hide more actions menu when user is signed out

5 years agoadded details text to landing page
Patrick Aljord [Fri, 22 Jun 2012 01:51:02 +0000 (02:51 +0100)]
added details text to landing page

5 years agoadded landing page assets
Patrick Aljord [Fri, 22 Jun 2012 01:02:55 +0000 (02:02 +0100)]
added landing page assets

5 years agomore improvements to landing page
Patrick Aljord [Fri, 22 Jun 2012 01:02:13 +0000 (02:02 +0100)]
more improvements to landing page

5 years agoadded product landing page for shapado.com
Patrick Aljord [Fri, 22 Jun 2012 00:54:22 +0000 (01:54 +0100)]
added product landing page for shapado.com

5 years agoremove plans js
Patrick Aljord [Thu, 21 Jun 2012 19:54:52 +0000 (20:54 +0100)]
remove plans js

5 years agodon't show domain tab in manage
Patrick Aljord [Thu, 21 Jun 2012 07:31:19 +0000 (08:31 +0100)]
don't show domain tab in manage

5 years agocheck for versions permissions
Patrick Aljord [Thu, 21 Jun 2012 07:08:52 +0000 (08:08 +0100)]
check for versions permissions

5 years agocheck for custom ads using shapado version
Patrick Aljord [Thu, 21 Jun 2012 06:19:03 +0000 (07:19 +0100)]
check for custom ads using shapado version

5 years agoshow warning when user is late on payment
Patrick Aljord [Thu, 21 Jun 2012 05:50:11 +0000 (06:50 +0100)]
show warning when user is late on payment

5 years agoadded feature to update credit card
Patrick Aljord [Mon, 18 Jun 2012 02:18:12 +0000 (03:18 +0100)]
added feature to update credit card

5 years agoadded legacy free plans for pre-stripe groups
Patrick Aljord [Sun, 17 Jun 2012 23:32:35 +0000 (00:32 +0100)]
added legacy free plans for pre-stripe groups

5 years agoi18n
Patrick Aljord [Sun, 17 Jun 2012 23:21:11 +0000 (00:21 +0100)]
i18n

5 years agoadded special plan with all options for free
Patrick Aljord [Sat, 16 Jun 2012 07:32:24 +0000 (08:32 +0100)]
added special plan with all options for free

5 years agomanage failed payments
Patrick Aljord [Tue, 12 Jun 2012 20:08:51 +0000 (21:08 +0100)]
manage failed payments
if payment fail, make the webhook update the group as having a failed payment

5 years agoallow signing up to free sites when signed out
Patrick Aljord [Tue, 12 Jun 2012 07:31:31 +0000 (08:31 +0100)]
allow signing up to free sites when signed out

5 years agocreate user, group and invoice on same the form
Patrick Aljord [Sun, 10 Jun 2012 07:44:02 +0000 (08:44 +0100)]
create user, group and invoice on same the form

5 years agoadded possibility to downgrade to free plan
Patrick Aljord [Fri, 8 Jun 2012 08:03:19 +0000 (09:03 +0100)]
added possibility to downgrade to free plan

5 years agoadded link to upgrade plan from Invoices#index
Patrick Aljord [Fri, 8 Jun 2012 02:13:46 +0000 (03:13 +0100)]
added link to upgrade plan from Invoices#index

5 years agoi18n
Patrick Aljord [Wed, 6 Jun 2012 07:25:26 +0000 (08:25 +0100)]
i18n

5 years agomake webhook work for private groups
Patrick Aljord [Wed, 6 Jun 2012 06:36:28 +0000 (07:36 +0100)]
make webhook work for private groups

5 years agoadded number input to show private plan price
Patrick Aljord [Wed, 16 May 2012 22:51:41 +0000 (23:51 +0100)]
added number input to show private plan price

5 years agoupdated webhook
Patrick Aljord [Wed, 16 May 2012 22:51:27 +0000 (23:51 +0100)]
updated webhook

5 years agoshow last 4 number on invoice
Patrick Aljord [Tue, 1 May 2012 06:59:57 +0000 (07:59 +0100)]
show last 4 number on invoice

5 years agoadded link to upcoming invoice
Patrick Aljord [Tue, 1 May 2012 06:48:21 +0000 (07:48 +0100)]
added link to upcoming invoice

5 years agoadded upcoming invoice view
Patrick Aljord [Tue, 1 May 2012 06:38:14 +0000 (07:38 +0100)]
added upcoming invoice view

5 years agosave whole strip invoice inside the Invoice model
Patrick Aljord [Wed, 25 Apr 2012 07:43:04 +0000 (02:43 -0500)]
save whole strip invoice inside the Invoice model
save upcoming invoice inside Group model

5 years agoupdated to rails 3.2.3
Patrick Aljord [Wed, 25 Apr 2012 07:42:25 +0000 (02:42 -0500)]
updated to rails 3.2.3

5 years agowip invoices
Patrick Aljord [Tue, 17 Apr 2012 00:03:22 +0000 (19:03 -0500)]
wip invoices

5 years agofix pages tracking:
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 agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 17 Jun 2012 23:30:24 +0000 (23:30 +0000)]
Localisation updates from translatewiki.net.

5 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 10 Jun 2012 23:48:18 +0000 (23:48 +0000)]
Localisation updates from translatewiki.net.

5 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Mon, 4 Jun 2012 15:05:55 +0000 (15:05 +0000)]
Localisation updates from translatewiki.net.

6 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sat, 26 May 2012 21:23:07 +0000 (21:23 +0000)]
Localisation updates from translatewiki.net.

6 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 20 May 2012 11:13:54 +0000 (11:13 +0000)]
Localisation updates from translatewiki.net.

6 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sat, 12 May 2012 18:49:20 +0000 (18:49 +0000)]
Localisation updates from translatewiki.net.

6 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 6 May 2012 17:14:48 +0000 (17:14 +0000)]
Localisation updates from translatewiki.net.

6 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 29 Apr 2012 23:09:29 +0000 (23:09 +0000)]
Localisation updates from translatewiki.net.

6 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sat, 21 Apr 2012 10:27:50 +0000 (10:27 +0000)]
Localisation updates from translatewiki.net.

6 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 15 Apr 2012 12:44:58 +0000 (12:44 +0000)]
Localisation updates from translatewiki.net.

6 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 8 Apr 2012 23:05:19 +0000 (01:05 +0200)]
Localisation updates from translatewiki.net.

6 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>
6 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>
6 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>
6 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>
6 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.

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

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

6 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

6 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

6 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'

6 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>
6 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>