1587 commits

Author	SHA1	Message	Date
ansuz	212baeb3a6	better cookie schema. expire old sessions	2017-04-05 12:24:01 +02:00
yflory	54d271c4e7	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-04-05 12:04:18 +02:00
yflory	a9777ce560	Fix input losing focus in polls with Chrome 57	2017-04-05 12:04:01 +02:00
ansuz	3484515283	enable more tests	2017-04-05 10:44:14 +02:00
ansuz	3e47b8a38d	remove dead code	2017-04-05 10:42:24 +02:00
ansuz	31b178a306	use pinpad api	2017-04-04 12:25:34 +02:00
ansuz	182dbfc874	implement pinning logic in pinpad.js	2017-04-04 12:13:31 +02:00
ansuz	a5e5ddae08	rpc all the things	2017-04-03 19:24:57 +02:00
ansuz	4f7e25eeb9	show labels for brush width	2017-04-03 10:43:57 +02:00
ansuz	2a6de5163b	jshint compliance	2017-03-31 18:54:50 +02:00
ansuz	04069cc7f4	fix font size	2017-03-31 13:28:30 +02:00
ansuz	1e51f89096	wipe the userdoc when the canvas is cleared	2017-03-31 12:01:52 +02:00
ansuz	e2981c0223	try to make the color picker show the current color	2017-03-31 12:01:30 +02:00
ansuz	96dac80bd5	better color picker in whiteboard	2017-03-31 11:02:59 +02:00
ansuz	bd07b3a80f	less cramped styling on text inputs on /settings/	2017-03-31 09:36:22 +02:00
ansuz	6e9968f989	add 'lol' code theme	2017-03-31 09:19:45 +02:00
ansuz	b85324a29e	jshint compliance	2017-03-31 09:18:57 +02:00
ansuz	73d4fd1700	handle reconnection attempts	2017-03-30 18:52:43 +02:00
ansuz	b07248ad42	prompt with setName if name is unset	2017-03-30 18:52:20 +02:00
ansuz	9b4b642d4a	protect against subtly corrupted user objects	2017-03-30 17:19:49 +02:00
ansuz	18469edf18	extend list item rendering to support gfm task lists	2017-03-30 12:02:31 +02:00
ansuz	055bc03092	strip carriage return	2017-03-30 12:00:46 +02:00
ansuz	bca13ad5a5	add notifications to whiteboard	2017-03-29 18:57:46 +02:00
ansuz	233bb7a14f	reorganize some html tags for smaller diffs	2017-03-29 18:38:06 +02:00
ansuz	76471f7b90	add forget button to whiteboard and handle disconnection better	2017-03-29 18:35:52 +02:00
ansuz	d4ce3dc6b9	don't rewrite css rules. FOUC is too long	2017-03-29 16:02:04 +02:00
ansuz	3cfd0a4326	commit some garbage	2017-03-29 15:40:34 +02:00
ansuz	364dae2882	update templated html	2017-03-29 12:56:08 +02:00
ansuz	ed89a13fe6	progress on adding version string to some css	2017-03-29 12:55:36 +02:00
ansuz	4d5baa717d	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-03-29 11:56:13 +02:00
ansuz	76990ac1b2	version toolbar.css for cache-busting	2017-03-29 11:56:03 +02:00
ansuz	9d3f859657	add a contextMenu entry for the whiteboard app	2017-03-29 11:55:24 +02:00
yflory	7ede430db3	Fix 'search.oldLocation is undefined' error	2017-03-28 14:26:41 +02:00
ansuz	df7363f416	regenerate templated files for new footer	2017-03-28 11:50:42 +02:00
yflory	72fecb9549	Fix lint errors	2017-03-28 11:05:45 +02:00
yflory	af68e41fb6	Always set the focus to the search bar in the drive	2017-03-28 10:57:13 +02:00
yflory	67f4096396	Fix cursor in the drive search bar	2017-03-28 10:48:29 +02:00
yflory	12cc49b575	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-03-27 18:31:07 +02:00
yflory	72c60ec676	Add background to the whiteboard app	2017-03-27 18:30:48 +02:00
yflory	2732b7aa82	Fix module.onLocal not defined	2017-03-27 18:21:14 +02:00
ansuz	a0c17d7c9b	latest rpc code	2017-03-27 18:15:15 +02:00
yflory	4ddf9b4e04	Improve whiteboard UI	2017-03-27 18:12:11 +02:00
yflory	89877baa69	Fix read-only mode in canvas app	2017-03-27 17:15:54 +02:00
yflory	c2cb24c072	Add toolbar to the whiteboard app	2017-03-27 17:08:44 +02:00
ansuz	973aeba0da	remove bundled fabric.js	2017-03-27 12:48:54 +02:00
ansuz	6eab52c33d	use secure fabric.js	2017-03-27 12:45:39 +02:00
ansuz	59a80d5fde	remove silly TODO	2017-03-27 12:08:19 +02:00
ansuz	ce5dbaeafd	use alertify instead of browser prompt	2017-03-27 12:00:21 +02:00
yflory	71c59d7ae2	Remove unnecessary TODOs	2017-03-27 11:53:13 +02:00
yflory	d92a875ce5	Translate the 'wrong application' error message	2017-03-27 11:34:54 +02:00
yflory	a8ffac5dcd	Remove old code	2017-03-27 11:30:09 +02:00
yflory	5322eff607	Use the current values for the checkboxes in the print options dialog	2017-03-27 11:23:51 +02:00
yflory	53c60a31f6	Set the properties and backup inputs to read-only in the drive	2017-03-27 11:14:37 +02:00
yflory	0c5a930cb9	Fix an issue with the 'Properties' entry not always displayed in context menu	2017-03-27 10:58:23 +02:00
ansuz	3e9eb03e5a	display a user's public signing key in settings if it exists	2017-03-24 14:26:36 +01:00
ansuz	912215185f	add uid to userdata for better notifications	2017-03-24 13:32:42 +01:00
ansuz	fa9249ef29	don't notify for userlist changes if a user joins twice	2017-03-24 13:17:51 +01:00
ansuz	40f5e1706f	add a unique id to user objects, define a getter	2017-03-24 12:17:49 +01:00
ansuz	e2ee80d4e7	set icon for whiteboard app	2017-03-23 16:16:24 +01:00
ansuz	dbca94437e	rename canvas app to 'whiteboard'	2017-03-23 16:16:00 +01:00
yflory	994d640f8b	Fix an issue causing the lag icon to lose its color	2017-03-21 14:52:49 +01:00
yflory	819c7e3bae	Fix style issue with drag&drop in the active folder	2017-03-21 14:49:02 +01:00
yflory	6fbd1f0028	Store the dates as number and not strings to avoid ot issues	2017-03-21 14:46:40 +01:00
yflory	8556ce9d17	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-03-21 12:45:53 +01:00
yflory	8ce8401107	Fix issues with middle click in context menus	2017-03-21 12:45:39 +01:00
yflory	5f4990cc80	Display or hide the context menu in a more intuitive way with multiselect	2017-03-21 12:37:45 +01:00
yflory	51033ab70a	Remove useless links in the context menu and properties for readonly pads in the drive	2017-03-21 12:09:07 +01:00
ansuz	2b2e581779	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-03-21 11:47:27 +01:00
ansuz	2e8484ad4c	notes about what to improve. transform json on OT instead of just validating	2017-03-21 11:47:11 +01:00
yflory	7afde2309d	Add properties to the files not in the trash	2017-03-21 11:34:18 +01:00
yflory	61d33f2dd6	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into prop	2017-03-21 10:44:10 +01:00
yflory	66a80ea50c	Add properties for pads in the drive	2017-03-20 18:59:27 +01:00
ansuz	b542245086	fix lint error	2017-03-20 18:11:26 +01:00
ansuz	cc43bb8362	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-03-20 18:05:39 +01:00
ansuz	98027dad27	jshint compliance	2017-03-20 18:02:11 +01:00
ansuz	eeecb1baab	Make Canvas Work Again	2017-03-20 18:01:13 +01:00
ansuz	4a173e30dc	set user's cursor to either the beginning or end of the document	2017-03-20 17:51:56 +01:00
yflory	29174b2922	Update the lag icon	2017-03-20 16:39:33 +01:00
yflory	26edb77cf0	Fix style and usability issues in slides	2017-03-20 15:20:42 +01:00
yflory	85105a1382	Active folder in drive is not underlined anymore	2017-03-20 14:16:44 +01:00
yflory	cd77f50717	Fix transitions in slides, add swipe event handlers, and fix print in firefox	2017-03-20 12:50:46 +01:00
yflory	e139295d7e	Add transitions in present mode	2017-03-17 18:39:39 +01:00
yflory	45ac3e40a2	Copy print options to present mode	2017-03-17 18:03:00 +01:00
yflory	a5f11d0d0d	Uniform the slides rendering in present and print mode	2017-03-17 15:30:27 +01:00
ansuz	d422c7e165	support old hashes in getUserChannelList	2017-03-16 17:14:54 +01:00
ansuz	7d5ff27900	better rpc tests, sum up your channel usage	2017-03-16 17:03:45 +01:00
ansuz	5ed6223313	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-03-16 14:47:03 +01:00
ansuz	7f2f1f7191	correctly initialize RPC object	2017-03-16 14:46:55 +01:00
ansuz	c9c9dd0999	use userChannelList if a list is not supplied to pinpad	2017-03-16 14:46:17 +01:00
ansuz	e8c3cf6aa5	implement rpc message signing	2017-03-16 14:45:38 +01:00
ansuz	d85a42c776	include User_hash in user channel list	2017-03-16 14:43:57 +01:00
yflory	f98c825dc3	Fix keyboard shortcuts not working in CryptDrive	2017-03-16 14:43:00 +01:00
yflory	7b27f1dc2c	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-03-16 14:16:54 +01:00
yflory	7761aaa89f	Add search UI	2017-03-16 14:16:42 +01:00
ansuz	b578803136	clean up registration code a little bit	2017-03-16 10:37:16 +01:00
ansuz	c3c866fa2b	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-03-15 18:59:53 +01:00
yflory	d19bbcb001	Add support for search in the drive	2017-03-15 18:59:55 +01:00
ansuz	5eb32b33ee	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-03-15 18:59:38 +01:00
ansuz	298725b3c2	don't show usage tips on error screens	2017-03-15 18:58:39 +01:00
ansuz	0a6373852e	add signing keys to user object at login and register time	2017-03-15 18:57:13 +01:00
yflory	9a32fb1999	Fix sub-folders changing position in the tree when renaming them	2017-03-15 17:34:06 +01:00
yflory	931f7619c0	Keep the scroll position on redraw in drive	2017-03-15 17:30:52 +01:00
yflory	0607c3bbf3	Add a title to the 'new' button in drive	2017-03-15 17:20:08 +01:00
yflory	b9c64a526a	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-03-15 17:15:03 +01:00
yflory	15e9af77bb	Remove the langauge selector from toolbar and add it in settings	2017-03-15 17:14:49 +01:00
ansuz	8129b8cdc1	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-03-15 16:05:05 +01:00
ansuz	15a67afc75	jshint compliance	2017-03-15 16:04:52 +01:00
yflory	13d7b3cadc	Merge branch 'd' into staging	2017-03-15 16:01:29 +01:00
yflory	a286599f93	Fix fast reconnect, and add support for reconnecting ws in polls	2017-03-15 16:01:00 +01:00
ansuz	bd9efd7c04	provide examples of valid and invalid rpc calls	2017-03-15 15:56:32 +01:00
ansuz	7187d3c550	implement getUserChannelList	2017-03-15 15:55:55 +01:00
ansuz	306f6ce806	resolve merge-conflict with accounting branch	2017-03-14 15:52:04 +01:00
yflory	fe5e33a0ee	Fix loss of presentation position when updating slides	2017-03-14 15:42:42 +01:00
ansuz	805e26bc07	add a version footer to main pages	2017-03-14 14:34:13 +01:00
yflory	f10149db1c	Make sure the tip is always visible when the loading screen is removed	2017-03-14 12:49:22 +01:00
ansuz	71db08eac2	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-03-14 12:40:25 +01:00
ansuz	09afba80db	add support for logging in from register page	2017-03-14 12:39:50 +01:00
yflory	16e5788011	Call the callback if we can't parse the local Drive to import it	2017-03-14 12:09:52 +01:00
ansuz	413d9a6f0b	add a style-callback to confirm	2017-03-14 12:01:42 +01:00
ansuz	5d88c3a436	newer registration code	2017-03-14 12:00:23 +01:00
ansuz	10bb11bff6	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-03-13 19:32:15 +01:00
ansuz	803e57c958	add more parameters to confirm dialogs	2017-03-13 19:30:56 +01:00
yflory	ceaf757680	Allow right click on the CryptPad logo/link in the top left corner	2017-03-13 18:49:30 +01:00
ansuz	f2aa531f27	apply styles to confirm buttons if provided	2017-03-13 18:18:38 +01:00
ansuz	df6298eeb6	apply styles to confirm buttons if provided	2017-03-13 18:18:17 +01:00
yflory	84c16c00ad	Fix click events not working on inputs in the drive tree	2017-03-13 15:53:13 +01:00
ansuz	07a2d8e189	apply translations on feedback page	2017-03-13 12:56:49 +01:00
yflory	ca9faa0056	Fix wrong translation keys	2017-03-13 11:52:48 +01:00
yflory	b7986ff6b1	Replace the spinner code with a font awesome spinner	2017-03-13 11:52:39 +01:00
ansuz	6e733b1329	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-03-13 10:59:20 +01:00
ansuz	d9996cc874	current work for pinning	2017-03-13 10:56:08 +01:00
ansuz	a7d61aa562	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into accounting	2017-03-10 18:04:07 +01:00
ansuz	b3cc8da315	implement basic clientside RPC infrastructure ... and provide a basic example for testing it	2017-03-10 18:03:52 +01:00
yflory	f94db93897	Improve the slides layout in print mode	2017-03-10 16:46:36 +01:00
ansuz	81027b4200	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into accounting	2017-03-10 10:49:33 +01:00
yflory	2392167996	Export slides as PDF	2017-03-09 19:05:44 +01:00
yflory	4bac8ea0c7	Draw all the slides at once to allow reference links (fix #77)	2017-03-09 12:41:23 +01:00
yflory	459b18c97b	Add the loading screen in the HTML so that it is displayed before JS is loaded	2017-03-08 18:05:15 +01:00
yflory	404fa378e6	Move the store to the 'common' folder, it is not customizable anymore	2017-03-08 16:47:38 +01:00
yflory	a8d200ef2e	Don't redirect until realtime is synced when logging in	2017-03-08 16:15:31 +01:00
yflory	0c1efd361b	Make sure the href is updated everywhere when importing a stronger link	2017-03-08 15:49:02 +01:00
yflory	b701e3cc85	Fix lint errors	2017-03-08 14:59:51 +01:00
yflory	4206382865	Fix the settings app to allow backup for unregistered users	2017-03-08 14:45:39 +01:00
yflory	f62267f8a1	Ability to import local pads in the user object	2017-03-07 18:39:21 +01:00
ansuz	e2418a6be2	sketch of how pinning rpc will look	2017-03-07 17:33:31 +01:00
ansuz	dc567fa7f3	signing keys are stored in hex so encode and decode them	2017-03-07 17:30:32 +01:00
yflory	ce6cd1211e	Fix lint errors	2017-03-07 15:33:08 +01:00
ansuz	aa762e7d63	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-03-07 15:33:01 +01:00
ansuz	8a48612de2	add some notes for later	2017-03-07 14:40:06 +01:00
yflory	9ad33574e9	Fix the function returning the pads list in the drive	2017-03-07 14:30:07 +01:00
yflory	14938089ac	Keep the focus on the iframe window after canceling a deletion	2017-03-07 14:24:06 +01:00
yflory	3f7dea8f7e	Context menu support for multi-select options in drive	2017-03-07 12:22:02 +01:00
yflory	e1c02fd8a4	Drive rename: save pads and folders name on click, cancel with Esc.	2017-03-06 18:15:14 +01:00
yflory	d93a270336	Ability to display tips in the loading screen	2017-03-06 17:20:09 +01:00
yflory	77d09f64e1	Display anonymous users in the user list	2017-03-06 14:56:41 +01:00
yflory	cb88227e2b	Autocomplete on key press in some dropdown menus	2017-03-06 12:20:23 +01:00
ansuz	c04819538b	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-03-03 18:16:39 +01:00
ansuz	fcb9848b3a	hide toolbar when in read-only mode	2017-03-03 18:16:34 +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
yflory	27241488a5	Merge pull request #96 from pbondoer/css ... (CSS) Some improvements to drive	2017-03-03 16:33:20 +01:00
Pierre Bondoerffer	6c9da646e0	(CSS) Some improvements to drive	2017-03-03 16:26:08 +01:00
ansuz	08c862b271	add FIXME notes to poll	2017-03-03 16:13:32 +01:00
yflory	ed9bcca96f	Close the websocket network when CryptGet/CryptPut is done	2017-03-03 12:48:00 +01:00
yflory	a68acac13b	Only ask for a display name once in /poll	2017-03-03 12:07:16 +01:00
yflory	a978b51656	If display name is empty, use anonymous in the drive	2017-03-03 12:06:35 +01:00
yflory	153386a6e0	CSS improvements in the drive tree	2017-03-02 18:24:18 +01:00
yflory	6098f28260	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-03-02 18:16:20 +01:00
yflory	a852112808	Fix open folder from the tree context menu	2017-03-02 18:16:16 +01:00
ansuz	2c9deed381	Merge pull request #94 from pbondoer/staging ... Some CSS fixes	2017-03-02 18:15:30 +01:00
ansuz	868161a8a8	fix undefined reference in code	2017-03-02 17:59:59 +01:00
ansuz	0bb10a8a0a	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-03-02 17:59:35 +01:00
Pierre Bondoerffer	800db07077	Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging	2017-03-02 17:44:29 +01:00
ansuz	e1303a16da	add support for title attributes on dropdowns	2017-03-02 17:40:29 +01:00
yflory	52793385ea	Fix lint errors	2017-03-02 17:17:55 +01:00
Pierre Bondoerffer	e39fe1c0b7	Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging	2017-03-02 17:09:39 +01:00
ansuz	01c4d7d4a7	Merge branch 'maybe' into staging	2017-03-02 17:09:06 +01:00
ansuz	c884782d57	here are some changes	2017-03-02 17:08:50 +01:00
yflory	2b6e44189d	When trying to reset the drive, tell the user if the input text is invalid	2017-03-02 17:01:27 +01:00
yflory	9a7c2dd5e2	Add a 'settings' link to the user menu in static pages	2017-03-02 16:38:22 +01:00
yflory	370ae81106	Use the display name in the backup file name if not logged in	2017-03-02 16:29:17 +01:00
Pierre Bondoerffer	e0d972674f	Fix context menu in drive and rename textbox styling	2017-03-02 16:22:32 +01:00
yflory	c5f983ecd7	Convert read-only link to editing link in the drive	2017-03-02 16:01:34 +01:00
Pierre Bondoerffer	d26d8f53d9	(CSS) Fixed textarea being too large	2017-03-02 15:50:03 +01:00
ansuz	a9afa24428	return empty string instead of blowing up when fixing HTML	2017-03-02 11:38:20 +01:00
yflory	6b8d0c8bc7	Merge branch 'security2' of git.xwikisas.com:xwiki-labs/cryptpad into security2	2017-03-02 10:53:48 +01:00
yflory	b32d698291	Fix issue with present mode in slide (readonly)	2017-03-02 10:53:45 +01:00
yflory	8bdc8415ab	Find a pad in the drive	2017-03-02 10:15:13 +01:00
Caleb James DeLisle	91eda5fa83	Implement stronger content-security-policy except in /pad/ which does not allow it. ... Implement a "loader" which allows for applying a version number to everything. Added a cache control for anything which has a version.	2017-03-01 21:06:53 +01:00
ansuz	7db0e14bc0	add 'force' flag to override removal of html elements	2017-03-01 17:05:57 +01:00
yflory	53f4f8826e	Merge branch 'staging' into staging	2017-03-01 16:32:18 +01:00
yflory	55210f17eb	Clean the code to be less dependant on 'li'	2017-03-01 16:15:48 +01:00
Pierre Bondoerffer	3e9c4d0901	Add hover to file manager tree	2017-03-01 15:57:22 +01:00
Pierre Bondoerffer	cbdfae09a6	Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging	2017-03-01 15:53:48 +01:00
yflory	c6c3e1bbb5	Don't select subfolders in the tree when drag&drop	2017-03-01 15:53:31 +01:00
Pierre Bondoerffer	d605fc757b	Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging	2017-03-01 15:46:49 +01:00
yflory	a26b9d3240	Don't select subfolders in the tree when right-click on drag&drop	2017-03-01 15:46:10 +01:00
ansuz	cb5e01815c	validate all alertify strings by default. require 'force' argument to bypass	2017-03-01 15:07:34 +01:00
Pierre Bondoerffer	b0323f6fd9	Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging	2017-03-01 14:45:18 +01:00
yflory	a2b5200381	Add a container for the folders in the tree in the drive	2017-03-01 14:44:43 +01:00
yflory	412815b042	Merge branch 'security' of git.xwikisas.com:xwiki-labs/cryptpad into security	2017-03-01 13:10:55 +01:00
yflory	11d54256da	Make sure the display name is displayed in the same way everywhere	2017-03-01 13:10:06 +01:00
yflory	2c5c6da0d9	Fix XSS in alertify logs	2017-03-01 13:09:14 +01:00
yflory	5797aab3f2	Fix XSS with display names in the user list	2017-03-01 13:08:36 +01:00
yflory	26e3971482	Fix XSS in the user dropdown menu	2017-03-01 13:08:09 +01:00
ansuz	639376f1cb	don't use hyperjson.toString	2017-03-01 12:36:10 +01:00
Pierre Bondoerffer	eb9a39eb68	Add hover on elements in drive and make grid slightly prettier	2017-02-28 23:15:47 +01:00
yflory	f130fd0598	Fix horizontal scrollbar in edge	2017-02-28 18:02:12 +01:00
yflory	345d2faab2	Fix horizontal scrollbar in Edge #3	2017-02-28 17:13:51 +01:00
yflory	d683dc499a	Fix horizontal scrollbar in Edge #2	2017-02-28 17:03:23 +01:00
yflory	7a0a87bf6c	Fix horizontal scrollbar in Edge	2017-02-28 16:38:51 +01:00
yflory	f06196c261	Remove the context menu buttons when removing selection	2017-02-28 15:48:49 +01:00
yflory	c0278ba77f	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-02-28 13:12:53 +01:00
yflory	efb7380a12	Fix default pad not created after registration	2017-02-28 13:12:27 +01:00
ansuz	5d39125004	Make onSettle Async Again	2017-02-28 13:12:04 +01:00
yflory	4f4075ed6e	Make the settings app available to anonymous users	2017-02-28 11:23:50 +01:00
yflory	0224d6489b	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-02-28 11:06:50 +01:00
ansuz	12aec60a12	hack around onSettle not doing its job	2017-02-28 11:05:59 +01:00
yflory	0ae7f94184	Remove the pointer and text underline on icon:hover in drive	2017-02-28 10:50:52 +01:00
ansuz	69b6f80e4b	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-02-28 10:47:23 +01:00
ansuz	86adfbf27d	update cache-busting directive in all supported apps	2017-02-28 10:47:18 +01:00
ansuz	cfc9f2e622	remove code for 'user' app, now that we have login and register	2017-02-28 10:46:21 +01:00
yflory	ec7761eeb8	Make sure we don't use a wrong title for a new pad	2017-02-28 10:43:36 +01:00
yflory	8e7e1d336e	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-02-28 10:39:53 +01:00
yflory	96f6b5755d	Add the blog link in the header and footer	2017-02-28 10:39:48 +01:00
ansuz	d49a7d7ec4	fix undefined reference	2017-02-28 10:30:24 +01:00
ansuz	9a2ed5741a	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-02-27 20:11:26 +01:00
ansuz	a4913f2f4b	provide UI for disabling the user feedback api	2017-02-27 20:11:18 +01:00
ansuz	1a259bb3aa	check if user has disallowed feedback api	2017-02-27 20:02:54 +01:00
yflory	4f7a05ead2	Fix issue with the path for the trash in the drive's topbar	2017-02-27 18:37:44 +01:00
yflory	8741b50f5b	Set the file name as default title if a pad is created from the drive	2017-02-27 18:15:18 +01:00
yflory	e8c73f35ce	In the tree, display the rename input only once	2017-02-27 17:50:58 +01:00
yflory	e38df7ce47	Fix creation of new pads in /pad	2017-02-27 17:47:11 +01:00
yflory	20518a3e88	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-02-27 17:23:40 +01:00
yflory	f8d653406a	Add the new content for the default pad and add french translation	2017-02-27 17:23:28 +01:00
ansuz	d15a08830e	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-02-27 14:32:04 +01:00
ansuz	06f0891d21	add allowUserFeedback toggle to settigs page	2017-02-27 14:31:56 +01:00
yflory	498f4065cf	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-02-27 14:29:55 +01:00
yflory	95853debf9	Update the default pad #1	2017-02-27 14:29:48 +01:00
yflory	d4bf7cf9aa	Send the initial state only if it is a new pad in /pad	2017-02-27 14:29:38 +01:00
yflory	66dc166936	Make sure the realtime is synced with onSettle when using cryptget	2017-02-27 14:28:12 +01:00
yflory	fadddb297c	Readonly mode in /pad had contenteditable set to true	2017-02-27 12:41:29 +01:00
ansuz	de5a21fe57	add a simple feedback api and text explaining what it is	2017-02-27 12:06:49 +01:00
yflory	2ad9debe58	Remove the placeholders in /code and /slide	2017-02-27 11:45:23 +01:00
yflory	38893fb8e5	Remove the 'Bootstart tooltips require Tether' error	2017-02-27 11:19:29 +01:00
yflory	88b29e8bdd	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-02-24 18:55:48 +01:00
yflory	5303e76ece	Make sure the content is correctly applied in onReady	2017-02-24 18:55:41 +01:00
ansuz	cc829d51f8	jshint compliance	2017-02-24 18:23:43 +01:00
yflory	42b6cca18d	Fix new pad not working	2017-02-24 16:55:43 +01:00
yflory	3fd5669647	Hide the trash icon for read-only pads if we have the edit link in drive	2017-02-24 16:51:15 +01:00
yflory	02cc9c8344	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-02-24 16:18:54 +01:00
yflory	e040c00557	Fix blocker issue when creating an account without migrating	2017-02-24 16:18:41 +01:00
yflory	e15a6a347f	Fix the forget pad button	2017-02-24 15:22:26 +01:00
ansuz	89bee8cf6b	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-02-24 12:08:26 +01:00
ansuz	ba3e24b595	media tag experiments	2017-02-24 12:08:16 +01:00
yflory	54b0a86c2e	Make sure we redirect to the drive if we access the login page from the homepage	2017-02-24 11:44:47 +01:00
yflory	55fb0f03ae	Fix the path in the drive overriding the content area	2017-02-24 11:01:33 +01:00
yflory	d7d7165dc4	Login page was using a wrong translation key	2017-02-23 18:19:33 +01:00
yflory	ba0b314f5e	Fix the 'new' button in drive which was broken in non root categories	2017-02-23 18:15:44 +01:00
yflory	d8cc2903cc	Display context menu actions in the toolbar when an element is selected	2017-02-23 17:25:25 +01:00
yflory	a0340f1419	Open link in a new tab in /pad	2017-02-23 14:27:18 +01:00
yflory	2d30393243	Add support for updated translation key	2017-02-23 11:45:00 +01:00
yflory	cc174f3bee	Fix typo	2017-02-22 12:26:25 +01:00
yflory	bdc00a2413	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-02-22 12:25:48 +01:00
yflory	0ce17ebbad	CryptDrive usability improvements (new file in drive + context menu)	2017-02-22 12:25:29 +01:00
yflory	e73b4a1131	Don't display 'All files' in the menu	2017-02-22 11:15:29 +01:00
ansuz	89f3577058	remove old poll	2017-02-22 11:05:47 +01:00
ansuz	7e77c6828a	more correct pluralization	2017-02-21 18:55:48 +01:00
ansuz	3d0e7cb9a7	pull ckeditor config out of main.js	2017-02-21 18:21:30 +01:00
yflory	328e5c6f03	Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging	2017-02-21 17:43:05 +01:00
yflory	c72bbd4c37	Use the file name as initial title	2017-02-21 17:42:58 +01:00
Pierre Bondoerffer	4cbb3b2ed2	Ensure we use English for reference	2017-02-21 14:53:18 +01:00
Pierre Bondoerffer	ffe17a6bc9	Use JSON.stringify instead and fix linter	2017-02-21 14:37:08 +01:00
Pierre Bondoerffer	a84f8e2808	Assert translation now outputs JavaScript which is easier to edit for translators	2017-02-21 14:23:58 +01:00
yflory	47b8fefd9e	Load messages.js only once, in cryptpad-common	2017-02-21 14:16:23 +01:00
yflory	11d9c9e813	Merge branch 'master' into staging	2017-02-21 10:44:03 +01:00
yflory	2103f0afa8	Merge branch 'master' of github.com:xwiki-labs/cryptpad	2017-02-21 10:42:35 +01:00
yflory	0bdf59c1dd	Fix broken link in the 'New' button on cryptpad.fr	2017-02-21 10:42:06 +01:00
yflory	454d1c2052	Do not load all the translations anymore, only the needed one	2017-02-20 18:29:06 +01:00
yflory	434c3a220c	Remove old translation keys #2	2017-02-20 16:15:13 +01:00
yflory	d81d17b86c	Remove old translations keys no longer used	2017-02-17 17:39:27 +01:00
yflory	9702305abc	Use better translation keys in settings	2017-02-17 17:38:59 +01:00
yflory	a6497f7a52	Add a way to show the drive tips again	2017-02-17 16:56:59 +01:00
yflory	c17f28e5fe	Fix race condition #2	2017-02-17 15:39:34 +01:00
yflory	239e2bcc1f	Fix issue with null entries in Cryptpad_RECENTPADS	2017-02-17 15:18:09 +01:00
yflory	1540ae3f6f	Fix issue with null entries in Cryptpad_RECENTPADS	2017-02-17 15:16:30 +01:00
yflory	dd014f6ef2	Fix race conditon	2017-02-17 15:16:03 +01:00
ansuz	94417d9a8b	jshint compliance	2017-02-17 14:28:18 +01:00
ansuz	8167ed9048	implement cache-busting everywhere	2017-02-17 12:39:01 +01:00
ansuz	34b6507fa3	implement cache-busting everywhere	2017-02-17 12:38:58 +01:00
ansuz	c9b8889380	add cache-busting to chainpad-crypto	2017-02-17 11:26:43 +01:00
ansuz	09fade6127	add cache-busting to chainpad-crypto	2017-02-17 11:25:35 +01:00
yflory	2daa9f8658	Link to main page was opened in the inner iframe	2017-02-17 10:57:56 +01:00
yflory	deda40375a	Use the new onSettle from chainpad to determine if the realtime is synced	2017-02-17 10:31:07 +01:00
yflory	550c65aae0	Add a default pad in CryptDrive after signing up	2017-02-16 18:10:12 +01:00
yflory	92d50ded64	Merge branch 'soon' into staging	2017-02-16 16:48:12 +01:00
yflory	97762f9f9a	Make sure all the elements in RECENTPADS are non-null objects	2017-02-16 16:07:43 +01:00
yflory	e4dbe97d71	Update display name in realtime across tabs and remember 'anonymous' name	2017-02-16 15:35:03 +01:00
yflory	7762ffcbff	Ability to use Ctrl+click on the cryptpad logo in apps	2017-02-15 18:31:36 +01:00
yflory	7497e0d1c5	Add a dropdown user menu to the top bar in static pages	2017-02-15 17:57:42 +01:00
yflory	0e76b18278	Hide the links in the html topbar on small screens	2017-02-15 14:23:56 +01:00