26 commits

Author	SHA1	Message	Date
Caleb James DeLisle	c274a27dfb	Fix a merge conflict which I accidentally let through and then fix a few unused variables in template.js	2017-08-04 11:33:28 +02:00
Caleb James DeLisle	0d1f19f5d4	Big manual merge	2017-08-04 11:20:17 +02:00
CatalinScr	69c470330f	updated the favicons, changed the menu ... PLEASE ENTER A COMMIT MESSAGE TO EXPLAIN WHY THIS MERGE IS NECESSAry,	2017-08-01 15:21:07 +03:00
CatalinScr	e609950977	Changed the favicon, added the boostrap js file, reconfigure the top menu	2017-08-01 15:20:29 +03:00
Caleb James DeLisle	cd2b41f51e	Fix up some less for supporting the info-pages	2017-08-01 11:53:06 +02:00
ansuz	777dea2014	Merge branch 'staging' into todo	2017-07-31 11:43:56 +02:00
ansuz	a458d7fa46	bump to latest version	2017-07-31 10:24:35 +02:00
ansuz	dcf5719eaf	handle most of the boilerplate stuff	2017-07-23 14:27:47 +02:00
Caleb James DeLisle	8404017af1	wip	2017-07-22 16:43:53 +02:00
ansuz	f2320190b8	change friends url to /contacts/	2017-07-17 17:18:28 +02:00
yflory	ac684a8dc7	Use the APP toolbar in profile	2017-07-12 18:34:16 +02:00
ansuz	3453e54357	bump footer and package.json for upcoming version	2017-07-12 10:49:05 +02:00
yflory	125018c8c3	New settings page	2017-07-10 18:29:23 +02:00
yflory	a5e8f6ae81	Add friend app and fix avatar size	2017-07-06 18:00:03 +02:00
ansuz	4016a95540	prototype invite app	2017-07-05 16:01:50 +02:00
ansuz	c2e153e8ed	more fouc fixes	2017-06-30 16:20:10 +02:00
ansuz	8ffad5ece6	FOUC fixes	2017-06-30 16:10:42 +02:00
Caleb James DeLisle	c25f2df721	Added caching versions to some of the images which are loaded by js	2017-06-30 12:11:44 +02:00
ansuz	7de2683169	make all apps use clientside templates	2017-06-27 18:17:52 +02:00
ansuz	bdca6b10c2	use templates in poll.js	2017-06-27 15:38:12 +02:00
ansuz	3a9b480e4e	resolve merge conflicts in template.js	2017-06-27 14:28:28 +02:00
yflory	40f4fc2682	Add the profile app in template.js	2017-06-27 14:27:54 +02:00
ansuz	e9bfaa9a60	compile less clientside. remove compiled css	2017-06-27 14:25:02 +02:00
ansuz	bd1db735dd	jshint compliance	2017-06-22 16:02:20 +02:00
ansuz	35bfa1dce4	test client-side templates in whiteboard app	2017-06-22 16:01:33 +02:00
ansuz	3657e978fd	give main2.js a more sensible name	2017-06-22 11:06:11 +02:00

Renamed from customize.dist/main2.js (Browse further)