shapado:cantonics-shapado.git
6 years agoadd .rvmrc to .gitignore master
Can Tonic [Mon, 10 Sep 2012 22:07:50 +0000 (00:07 +0200)]
add .rvmrc to .gitignore

6 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sat, 8 Sep 2012 11:56:41 +0000 (11:56 +0000)]
Localisation updates from translatewiki.net.

6 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sat, 1 Sep 2012 11:25:25 +0000 (11:25 +0000)]
Localisation updates from translatewiki.net.

6 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Tue, 28 Aug 2012 10:28:25 +0000 (10:28 +0000)]
Localisation updates from translatewiki.net.

6 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sat, 25 Aug 2012 21:25:56 +0000 (21:25 +0000)]
Localisation updates from translatewiki.net.

6 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 19 Aug 2012 16:20:14 +0000 (16:20 +0000)]
Localisation updates from translatewiki.net.

6 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Thu, 9 Aug 2012 14:06:43 +0000 (14:06 +0000)]
Localisation updates from translatewiki.net.

6 years agoFix capitalisation issues.
Siebrand Mazeland [Fri, 3 Aug 2012 09:19:18 +0000 (11:19 +0200)]
Fix capitalisation issues.

6 years agoCorrect spelling for Google Analytics.
Siebrand Mazeland [Fri, 3 Aug 2012 09:07:16 +0000 (11:07 +0200)]
Correct spelling for Google Analytics.

6 years agojquery -> jQuery
Siebrand Mazeland [Fri, 3 Aug 2012 09:04:49 +0000 (11:04 +0200)]
jquery -> jQuery

6 years agoJavascript -> JavaScript
Siebrand Mazeland [Fri, 3 Aug 2012 09:03:27 +0000 (11:03 +0200)]
Javascript -> JavaScript

6 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Thu, 2 Aug 2012 11:47:14 +0000 (11:47 +0000)]
Localisation updates from translatewiki.net.

6 years agouse memory cache
Patrick Aljord [Wed, 1 Aug 2012 18:59:19 +0000 (19:59 +0100)]
use memory cache

6 years agoturn off payments for now
Patrick Aljord [Wed, 1 Aug 2012 18:20:03 +0000 (19:20 +0100)]
turn off payments for now

6 years agodisable bughunter
Patrick Aljord [Wed, 1 Aug 2012 06:45:53 +0000 (07:45 +0100)]
disable bughunter

6 years agouse redis for cache
Patrick Aljord [Wed, 1 Aug 2012 06:18:15 +0000 (07:18 +0100)]
use redis for cache

6 years agochanged send_feedback url too
Patrick Aljord [Wed, 1 Aug 2012 06:08:49 +0000 (07:08 +0100)]
changed send_feedback url too

6 years agomore checks for spam
Patrick Aljord [Wed, 1 Aug 2012 06:01:34 +0000 (07:01 +0100)]
more checks for spam

6 years agoreturn 404 with minimum text on /feedback
Patrick Aljord [Wed, 1 Aug 2012 05:28:18 +0000 (06:28 +0100)]
return 404 with minimum text on /feedback

6 years agoupdate feedback routes
Patrick Aljord [Wed, 1 Aug 2012 05:00:02 +0000 (06:00 +0100)]
update feedback routes

6 years agofix mobile logout
Patrick Aljord [Thu, 19 Jul 2012 22:11:14 +0000 (23:11 +0100)]
fix mobile logout
fix missing partial

6 years agoadded missing mobile partials
Patrick Aljord [Thu, 19 Jul 2012 20:51:20 +0000 (21:51 +0100)]
added missing mobile partials

6 years agoprecompile all js files
Patrick Aljord [Thu, 19 Jul 2012 06:50:01 +0000 (07:50 +0100)]
precompile all js files

6 years agofix custom html i18n and style
Patrick Aljord [Thu, 19 Jul 2012 02:27:33 +0000 (03:27 +0100)]
fix custom html i18n and style

6 years agofix plans creations
Patrick Aljord [Thu, 19 Jul 2012 02:15:33 +0000 (03:15 +0100)]
fix plans creations

6 years agofix custom js
Patrick Aljord [Thu, 19 Jul 2012 01:19:09 +0000 (02:19 +0100)]
fix custom js

6 years agoi18n and style fixes for themes
Patrick Aljord [Thu, 19 Jul 2012 00:40:23 +0000 (01:40 +0100)]
i18n and style fixes for themes

6 years agofix color picker on chrome
Patrick Aljord [Thu, 19 Jul 2012 00:18:37 +0000 (01:18 +0100)]
fix color picker on chrome

6 years agoMerge branch 'master' of gitorious.org:shapado/shapado
Patrick Aljord [Wed, 18 Jul 2012 22:56:35 +0000 (23:56 +0100)]
Merge branch 'master' of gitorious.org:shapado/shapado

6 years agorequire yui compressor
Patrick Aljord [Wed, 18 Jul 2012 22:54:48 +0000 (23:54 +0100)]
require yui compressor

6 years agoupdate sass rails 41-fixes
Patrick Aljord [Wed, 18 Jul 2012 22:24:01 +0000 (23:24 +0100)]
update sass rails

6 years agovarious bug fixes
Patrick Aljord [Wed, 18 Jul 2012 21:27:37 +0000 (22:27 +0100)]
various bug fixes

6 years agoMerge remote-tracking branch 'origin/41-fixes'
David A. Cuadrado [Sat, 14 Jul 2012 23:35:47 +0000 (18:35 -0500)]
Merge remote-tracking branch 'origin/41-fixes'

6 years agouse AppConfig variable to force ssl
Patrick Aljord [Sat, 14 Jul 2012 23:03:54 +0000 (00:03 +0100)]
use AppConfig variable to force ssl

6 years agoadded link to /questions on frontpage
Patrick Aljord [Sat, 14 Jul 2012 22:54:31 +0000 (23:54 +0100)]
added link to /questions on frontpage

6 years agoforce ssl in prod only
Patrick Aljord [Sat, 14 Jul 2012 22:46:50 +0000 (23:46 +0100)]
force ssl in prod only

6 years agoupdate VERSION
David A. Cuadrado [Sat, 14 Jul 2012 22:39:03 +0000 (17:39 -0500)]
update VERSION

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agodon't try to reload the versions unless it's shapado.com
David A. Cuadrado [Sat, 14 Jul 2012 22:33:24 +0000 (17:33 -0500)]
don't try to reload the versions unless it's shapado.com

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoadd task to upgrade shapado 4.0 to 4.1
David A. Cuadrado [Sat, 14 Jul 2012 20:53:25 +0000 (15:53 -0500)]
add task to upgrade shapado 4.0 to 4.1

Signed-off-by: David A. Cuadrado <krawek@gmail.com>
6 years agoreload versions merge-js
Patrick Aljord [Sat, 14 Jul 2012 20:47:29 +0000 (21:47 +0100)]
reload versions

6 years agoset private plan to $2/user
Patrick Aljord [Sat, 14 Jul 2012 16:00:34 +0000 (17:00 +0100)]
set private plan to $2/user

6 years agoremove duplicate preview
Patrick Aljord [Fri, 13 Jul 2012 06:07:26 +0000 (07:07 +0100)]
remove duplicate preview

6 years agorevert to mongo-cache
Patrick Aljord [Fri, 13 Jul 2012 05:16:06 +0000 (06:16 +0100)]
revert to mongo-cache

6 years agomake webhook for private groups work
Patrick Aljord [Fri, 13 Jul 2012 00:03:03 +0000 (01:03 +0100)]
make webhook for private groups work
make success message work on updating card

6 years agomake sure custom domains use ssl on payment form
Patrick Aljord [Sat, 30 Jun 2012 01:35:52 +0000 (02:35 +0100)]
make sure custom domains use ssl on payment form

6 years agofix resetting custom domains
Patrick Aljord [Mon, 25 Jun 2012 00:30:56 +0000 (01:30 +0100)]
fix resetting custom domains

6 years agoforce ssl on /plans
Patrick Aljord [Sun, 24 Jun 2012 07:44:40 +0000 (08:44 +0100)]
force ssl on /plans

6 years agofix not loading assets with ssl
Patrick Aljord [Sun, 24 Jun 2012 07:25:28 +0000 (08:25 +0100)]
fix not loading assets with ssl

6 years agoupdate to rails 3.2.6
Patrick Aljord [Sun, 24 Jun 2012 07:19:52 +0000 (08:19 +0100)]
update to rails 3.2.6

6 years agouse redis store instead of mongo
Patrick Aljord [Sun, 24 Jun 2012 07:19:01 +0000 (08:19 +0100)]
use redis store instead of mongo

6 years agofixed notMember typo
Patrick Aljord [Sat, 23 Jun 2012 00:57:21 +0000 (01:57 +0100)]
fixed notMember typo

6 years agofix Ui.js missing }
Patrick Aljord [Sat, 23 Jun 2012 00:49:24 +0000 (01:49 +0100)]
fix Ui.js missing }

6 years agoImprove js for comments
Jorge Cuadrado [Fri, 22 Jun 2012 21:10:23 +0000 (16:10 -0500)]
Improve js for comments

Signed-off-by: Jorge Cuadrado <kuadrosxx@gmail.com>
6 years agomore landing stuff
Patrick Aljord [Fri, 22 Jun 2012 08:57:14 +0000 (09:57 +0100)]
more landing stuff

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

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

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

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

6 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

6 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

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

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

6 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

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

6 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

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

6 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

6 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

6 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

6 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

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

6 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

6 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

6 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

6 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

6 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

6 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

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

6 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

6 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

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

6 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

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

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

6 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

6 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

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

6 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>
6 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>
6 years agofix default group logo
Patrick Aljord [Thu, 15 Mar 2012 01:28:30 +0000 (20:28 -0500)]
fix default group logo

6 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

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

6 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

6 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

6 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

6 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

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

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

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

6 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