174 Commits

Author	SHA1	Message	Date
ansuz	7de2683169	make all apps use clientside templates	2017-06-27 18:17:52 +02:00
ansuz	e9bfaa9a60	compile less clientside. remove compiled css	2017-06-27 14:25:02 +02:00
yflory	a11befaa0f	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-06-22 15:52:31 +02:00
yflory	13288ee18b	Update the userlist in code, slide and pad	2017-06-22 15:52:25 +02:00
ansuz	852c028822	don't allow editing if pad type is wrong	2017-06-22 14:31:55 +02:00
yflory	92b6e60573	Small improvements for the new toolbar	2017-06-22 11:13:53 +02:00
yflory	19cb920a7c	Don't redraw a media-tag everytime the content has changed	2017-06-13 17:21:22 +02:00
yflory	d1f4617419	Fix a race condition causing the preview part to be empty	2017-06-12 14:37:12 +02:00
yflory	5d6a0dcc1b	Fix width transition when dragging preview	2017-06-12 12:27:24 +02:00
ansuz	ec9a4dec5e	Merge branch 'soon' into staging	2017-06-05 11:43:26 +02:00
ansuz	77d4ffba86	animate preview mode sidebar	2017-06-02 17:39:45 +02:00
ansuz	76c530037b	enable donate button in all apps	2017-05-30 15:51:07 +02:00
ansuz	1240b864ef	fix misconfigured history	2017-05-29 17:25:06 +02:00
ansuz	cf658c1b3a	backport live changes	2017-05-26 12:41:30 +02:00
ansuz	dc2b0ae6b4	jshint compliance	2017-05-24 18:45:48 +02:00
ansuz	b32c329269	remember whether you were using preview mode for a pad	2017-05-24 18:41:19 +02:00
ansuz	3803f6a20f	only render preview if preview container is visible	2017-05-24 17:25:33 +02:00
ansuz	617e027f12	catch markdown preview errors	2017-05-24 15:50:35 +02:00
ansuz	c5bb830757	don't preview if hightlight mode is not markdown	2017-05-24 14:21:31 +02:00
ansuz	dc80b6b11f	throttle markdown preview	2017-05-24 11:27:16 +02:00
ansuz	6faca87e73	set preview content in read only mode	2017-05-23 15:54:04 +02:00
yflory	620f4dc512	Add translations for the markdown preview button title	2017-05-18 15:05:37 +02:00
yflory	0bd4caeb7e	Add the task list code to the markdown renderer	2017-05-18 14:57:04 +02:00
yflory	56bcdff890	Add a preview of the markdown content in the code editor	2017-05-18 12:16:26 +02:00
yflory	c00158d23a	Move code to common-history	2017-05-10 13:39:14 +02:00
yflory	50c8a859e6	Move the CodeMirror cursor code to common-codemirror	2017-05-09 17:57:27 +02:00
yflory	c79a6e3b2b	Move Metadata, CodeMirror and title functions in separate files	2017-05-09 17:47:47 +02:00
yflory	63710e1ccc	Move the code related to the title in another file	2017-05-09 14:32:41 +02:00
yflory	5a883d5a57	Use the new toolbar and move the userlist code in a separate file	2017-05-05 17:56:49 +02:00
yflory	6847906ac9	Move the userlist code in a separate file	2017-05-05 15:47:46 +02:00
ansuz	a0c420af8e	jshint compliance	2017-05-04 16:37:25 +02:00
yflory	a190c99426	Toolbar refactoring	2017-05-04 16:08:12 +02:00
yflory	bf7c7c45d0	Add the storage limit warning in the toolbar	2017-04-27 18:46:46 +02:00
ansuz	f7e96b4e8c	resolve merge conflicts and jquery errors	2017-04-24 13:43:18 +02:00
yflory	92ea03d7d9	View and restore the history of a pad	2017-04-21 17:31:47 +02:00
Caleb James DeLisle	c341fa8e94	Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter	2017-04-18 12:14:32 +02:00
yflory	43c045721c	Get the channel history	2017-04-14 18:36:36 +02:00
ansuz	50277cb0ae	don't rely on 'info' in onRemote so we can call it anywhere	2017-04-13 19:46:38 +02:00
yflory	2ad0a65b71	Remove shortcuts that override browser actions	2017-04-13 16:43:07 +02:00
ansuz	df4a250359	use feedback api instead of app=	2017-04-13 12:18:08 +02:00
yflory	84d8615cf1	Save and use templates in pad, code and slides	2017-04-07 18:20:03 +02:00
yflory	71c59d7ae2	Remove unnecessary TODOs	2017-03-27 11:53:13 +02:00
yflory	a8ffac5dcd	Remove old code	2017-03-27 11:30:09 +02:00
ansuz	912215185f	add uid to userdata for better notifications	2017-03-24 13:32:42 +01:00
yflory	15e9af77bb	Remove the langauge selector from toolbar and add it in settings	2017-03-15 17:14:49 +01:00
yflory	a286599f93	Fix fast reconnect, and add support for reconnecting ws in polls	2017-03-15 16:01:00 +01:00
yflory	cb88227e2b	Autocomplete on key press in some dropdown menus	2017-03-06 12:20:23 +01:00
yflory	2a1b241592	Display a button to open the editing link while in read-only mode if we know it	2017-03-03 18:14:53 +01:00
ansuz	868161a8a8	fix undefined reference in code	2017-03-02 17:59:59 +01:00
ansuz	7db0e14bc0	add 'force' flag to override removal of html elements	2017-03-01 17:05:57 +01:00