4664 Commits

Author SHA1 Message Date
Remy Sharp
72653332f5 Simplify the new upgrade page
This way we're able to put the features and the upgrade process together, but benefit from all the error handling that's already in the login & reg pages without a complete rewrite.

This is not proposed as the final solution, but a mid-way point to allow us to test.
2014-08-13 17:41:44 +01:00
Remy Sharp
9fc8850624 Register + sign up (without errors) works 2014-08-13 17:17:27 +01:00
Remy Sharp
2af114e3d0 New upgrade: login + upgrade working 2014-08-13 15:51:48 +01:00
Remy Sharp
8c3f1ff406 Visual tweaks 2014-08-13 15:51:47 +01:00
Remy Sharp
9a6c9598ed Only use CORS for bin pages - not edit
Also remove the csrf from the edit page - though the impact of this is unknown...
2014-08-13 15:51:05 +01:00
Giulia Alfonsi
ec9e441e6e Merge branches 'feature/1770-new-upgrade-page' and 'feature/1770-new-upgrade-page' of https://github.com/jsbin/jsbin into feature/1770-new-upgrade-page 2014-08-13 15:28:51 +01:00
Giulia Alfonsi
30c017d78f Two step layout improved 2014-08-13 15:28:21 +01:00
Remy Sharp
981c747bd4 Use partial for payment
And tweak CSS in grid+payment page
2014-08-13 14:58:28 +01:00
Remy Sharp
d442dfcbf7 Merge branch 'master' into feature/1770-new-upgrade-page
Conflicts:
	views/upgrade.html
2014-08-13 14:45:17 +01:00
Remy Sharp
6f7d97ac77 fix position of errors 2014-08-13 14:42:05 +01:00
Remy Sharp
8b69d10b95 Merge pull request #1836 from jzaefferer/update-jquery-ui-1-11-1
Update to jQuery UI 1.11.1
2014-08-13 14:33:43 +01:00
Giulia Alfonsi
30a2e573a7 A/B test cases for new upgrade/payment page 2014-08-13 14:29:47 +01:00
Jörn Zaefferer
c764b5a514 Update to jQuery UI 1.11.1 2014-08-13 15:25:50 +02:00
Remy Sharp
7fd9af79d9 3.18.6 v3.18.6 2014-08-12 19:54:02 +01:00
Remy Sharp
d624541f6d Merge pull request #1831 from jsbin/feature/reported-source
Allow reported bins to have their source viewed
2014-08-12 19:52:35 +01:00
Remy Sharp
d3ff57321f Allow reported bins to have their source viewed 2014-08-12 19:49:36 +01:00
Remy Sharp
8961e304f7 Merge pull request #1830 from jsbin/feature/upgrade-with-ids
Feature/upgrade with ids
2014-08-12 17:24:30 +01:00
Remy Sharp
ea0773dc9c Closes #1784 2014-08-12 17:18:37 +01:00
Remy Sharp
8486a62ec0 Capture email on upgrade 2014-08-12 17:17:36 +01:00
Remy Sharp
0de9a94067 Merge branch 'master' into feature/upgrade-with-ids
Conflicts:
	lib/handlers/session.js
2014-08-12 17:13:25 +01:00
Remy Sharp
afb0a6722d Add /history to reserved 2014-08-12 17:11:27 +01:00
Remy Sharp
a63479be95 Merge pull request #1829 from jsbin/feature/default-avatar
Default avatar
2014-08-12 17:10:05 +01:00
Remy Sharp
66281092b9 Add id to metadata going to stripe 2014-08-12 16:40:52 +01:00
Remy Sharp
f41b040ab6 Show admin tool + strip more from cookie 2014-08-12 16:40:31 +01:00
Giulia Alfonsi
a09628a0e2 Fix the logged in check 2014-08-12 15:29:18 +01:00
Remy Sharp
5d87282640 Add a sane default 2014-08-12 15:12:04 +01:00
Remy Sharp
a20e6e60ab GAHAHAHAH
I want to kick gravatar in the nuts (lack of svg support and all sorts of other things), so instead we're using a hot combo of gravatar with our default image hosting service (since transparent + hue effect = non transparent image), and the large image has the scripted SVG object behind a gravatar that defaults to transparent.

BASICALLY CONFUNKSION.
2014-08-12 15:09:24 +01:00
Remy Sharp
8c40ab5821 Large & small default avatar support 2014-08-12 13:56:09 +01:00
Remy Sharp
2c71b26490 Add /history to reserved 2014-08-12 12:39:13 +01:00
Giulia Alfonsi
4b8dc55a83 Not showing login/register if already logged in 2014-08-12 11:26:03 +01:00
Remy Sharp
4d4c27e380 3.18.5 v3.18.5 2014-08-12 10:50:37 +01:00
Remy Sharp
3a6f5ff383 Merge pull request #1827 from jsbin/feature/forbidden-whitelist
Forbidden typo
2014-08-12 10:49:22 +01:00
Remy Sharp
9858172b69 Redirect reported bins to new repo 2014-08-12 10:45:58 +01:00
Remy Sharp
c49c6d9f51 Typo 2014-08-11 22:04:11 +01:00
Remy Sharp
96f412939c 3.18.4 v3.18.4 2014-08-11 22:00:04 +01:00
Remy Sharp
9445975e29 For fucky fucks fuckity fuck.
Missed the cache bust...AGAIN.
2014-08-11 21:59:44 +01:00
Remy Sharp
4c23631831 3.18.3 v3.18.3 2014-08-11 21:56:21 +01:00
Remy Sharp
cc78796823 Fixed reported pages
God knows how I didn't actually get to test this end to end...
2014-08-11 21:55:59 +01:00
Remy Sharp
0187f99cfc 3.18.2 v3.18.2 2014-08-11 20:28:08 +01:00
Remy Sharp
c675cc06ba CACHE-FUCK-BUST
Poop.
2014-08-11 20:27:50 +01:00
Remy Sharp
ff12ab5e41 3.18.1 v3.18.1 2014-08-11 18:14:27 +01:00
Remy Sharp
4c37518ad8 Merge pull request #1816 from jsbin/fix/1272
Fixed #1272
2014-08-11 18:11:51 +01:00
Remy Sharp
72ff870726 Fixed #1272
Show actual error and show contents of gist
2014-08-11 17:27:01 +01:00
Remy Sharp
2c80933cfa Fixed ssl embeds 2014-08-11 17:12:34 +01:00
Remy Sharp
91dabd0d09 3.18.0 v3.18.0 2014-08-11 17:00:58 +01:00
Remy Sharp
e51e3998ff Merge pull request #1815 from jsbin/feature/embed-analytics
Track /embed on rendered analytics instead of main
2014-08-11 17:00:39 +01:00
Remy Sharp
9e9e45c817 Merge pull request #1802 from jsbin/fix/404-nuking
Add <base> to rendered frame.
2014-08-11 16:59:36 +01:00
Remy Sharp
f15329022c Merge pull request #1811 from jsbin/feature/better-gists
Better gists
2014-08-11 16:59:06 +01:00
Remy Sharp
a19f032f2d Merge pull request #1814 from jsbin/fix/1813
Fixed #1813
2014-08-11 16:58:40 +01:00
Remy Sharp
53e152c46a Track /embed on rendered analytics instead of main 2014-08-11 16:52:11 +01:00