19 Commits

Author SHA1 Message Date
Remy Sharp
1374d6e4cd Fixed default jshint 2014-06-20 16:51:51 +01:00
Remy Sharp
5f278a8db6 Merge branch 'master' into feature/upgrade
Conflicts:
	lib/features.js
2014-06-20 16:10:38 +01:00
Remy Sharp
da39f2b6b6 Tweaks 2014-06-20 15:57:06 +01:00
Giulia Alfonsi
8a1e725515 Changed twitter column title and tweets format 2014-06-13 16:34:08 +01:00
Giulia Alfonsi
4647c6a26e Changed panel height to 200px 2014-06-12 16:02:56 +01:00
electricg
47e671d334 Real content 2014-06-09 15:49:18 +01:00
Fabien O'Carroll
fe5c50ed16 fix merge and use array as top level data structure 2014-06-09 12:03:00 +01:00
Fabien O'Carroll
5595564dd4 Merge branch 'feature/upgrade' of https://github.com/jsbin/jsbin into feature/upgrade
* 'feature/upgrade' of https://github.com/jsbin/jsbin: (44 commits)
  add cachebust to view context
  cachebust resources
  center librato image
  remove microsoft and google from backers
  Backers -> Supporters
  typo
  bring table inline with h1
  remove client side feature rendering
  style ticks with :after
  render feature list server side
  dont send feature list down to client
  add upgrade button to top of table
  adjust fonts
  pass actuall object into template context
  use strings over ints
  Tweaks to upgrade page
  Fixed #1446 & save feedback indicator
  Fixed #1448
  Fixed #1447
  Add basic styling for "link to" buttons
  ...

Conflicts:
	lib/data/backers.json
	lib/routes.js
	public/css/upgrade.css
	views/upgrade.html
2014-06-09 11:05:01 +01:00
electricg
ddcad7be5c Renamed module 2014-06-09 10:31:03 +01:00
Giulia Alfonsi
8cea6a2536 Moved toppanel to its own module and renamed it to information 2014-06-06 14:49:52 +01:00
Giulia Alfonsi
3a1098917b Content template and json structure 2014-06-06 11:58:55 +01:00
Fabien O'Carroll
94fbbdaa5c remove microsoft and google from backers 2014-05-23 17:15:56 +01:00
Fabien O'Carroll
df7f4bff79 typo 2014-05-23 17:09:24 +01:00
Fabien O'Carroll
bea0993fae use strings over ints 2014-05-23 15:55:05 +01:00
Remy Sharp
dd52699708 Tweaks to upgrade page 2014-05-15 09:11:28 +01:00
Fabien O'Carroll
fbed2e1af8 add backers data 2014-05-06 15:10:59 +01:00
Fabien O'Carroll
9c7f6790a3 add backers data 2014-05-02 17:07:18 +01:00
Fabien O'Carroll
99678eba23 Add more features 2014-05-02 17:05:29 +01:00
Fabien O'Carroll
e9bead2b53 Add initial upgrade page and data 2014-05-02 17:05:28 +01:00