Commit graph

12 commits

Author SHA1 Message Date
jakedt
0827e0fbac Merge remote-tracking branch 'origin/master' into ncc1701
Conflicts:
	endpoints/web.py
	static/directives/signup-form.html
	static/js/app.js
	static/js/controllers.js
	static/partials/landing.html
	static/partials/view-repo.html
	test/data/test.db
2014-04-14 19:37:22 -04:00
Joseph Schorr
0bd8a1bcbf Switch title to data-title to prevent the browser-default tooltip from displaying 2014-04-11 18:21:13 -04:00
Joseph Schorr
0e320c964f - Add support for super users
- Add a super user API
- Add a super user interface
2014-04-10 00:26:55 -04:00
Joseph Schorr
ebdeb33f82 Make the warning when a user/org is AT the number of private repos less scary 2014-02-18 17:52:58 -05:00
yackob03
19d7125253 Distinguish the discontinued plans. 2013-12-24 14:23:53 -05:00
Joseph Schorr
b5f1723adc Make deprecated plans show the cancel button 2013-12-23 16:43:45 -05:00
Joseph Schorr
3f062ee602 NOTE: The plans page is still broken
- Change the subscribe method to allow for subscribing to the free plan, even when an org
- Change the frontend to no longer have different plan groups
- Change the frontend to display the proper plans (i.e. hide the deprecated plans unless it is the current plan, etc)
2013-12-19 21:51:46 -05:00
Joseph Schorr
b2e4b8152e Add a loading bar and convert to using the new ApiService and resource-view (part #2) 2013-12-17 22:56:28 -05:00
Joseph Schorr
fe69ba5ec1 - Fix a bug with subscribing in the new repo view
- Have conversion to organization update its plan to a business plan
- Fix bug in the repo donut usage graph thingy where it had zero size when not in the default tab
2013-11-07 22:08:23 -05:00
Joseph Schorr
62d057d7aa Hide the cancel button on the free plans 2013-11-06 18:05:34 -05:00
Joseph Schorr
10db2884ac Redo user admin page to match the style of the org admin page 2013-11-06 17:59:16 -05:00
Joseph Schorr
a6a225dd5f Check in all new plan manager directive and add a nice donut chart for the repository usage by the user/org 2013-11-06 17:30:20 -05:00