Commit Graph

568 Commits (f0836f745ec535c4686372fbbffec96fe5879cb3)

Author SHA1 Message Date
ansuz 05a50b1f4c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-10 17:42:43 +02:00
ansuz a14bb1480a progress for implicit pinning 2017-04-10 17:42:35 +02:00
ansuz f82278a25c handle return of undefined hash 2017-04-10 17:38:25 +02:00
ansuz 1d933be5a6 make reset return the hash, not an array with containing it 2017-04-10 15:57:38 +02:00
yflory f34492be94 Remove duplicates uid in the user list 2017-04-10 15:27:01 +02:00
yflory cfc5d634f4 Merge branch 'templates' into staging 2017-04-10 14:19:48 +02:00
yflory bd16e0f0e7 Templates in polls and canvas, and ability to disable templates 2017-04-10 14:19:15 +02:00
yflory 84d8615cf1 Save and use templates in pad, code and slides 2017-04-07 18:20:03 +02:00
ansuz bd2034c47b prepare rpc before 'ready' if pinning is enabled 2017-04-07 17:24:25 +02:00
ansuz a70388284d disable unnecessary messages 2017-04-07 17:21:04 +02:00
ansuz abd87e1322 jshint compliance 2017-04-07 16:33:14 +02:00
ansuz e4b15bc616 implement 'getCanonicalChannelList' 2017-04-07 15:52:34 +02:00
ansuz a2f692b9a3 clean up serverside and clientside pinning logic 2017-04-07 15:20:30 +02:00
ansuz fdede0d1fd remove some dead code 2017-04-07 12:18:03 +02:00
ansuz e87992c7ec implement atomic pin reset rpc 2017-04-07 11:37:19 +02:00
ansuz 3380cf0348 implement getTotalSize rpc 2017-04-07 10:09:59 +02:00
ansuz 5c292fb1fa jshint compliance 2017-04-06 08:32:31 +02:00
ansuz 64089c5f6b implement pad pinning 2017-04-05 17:28:04 +02:00
yflory 13514dff63 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-05 15:00:10 +02:00
yflory 46a5eee597 Display the spinner in the toolbar for local changes 2017-04-05 14:57:07 +02:00
ansuz 6c7cdc90a9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-05 12:24:17 +02:00
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 3e47b8a38d remove dead code 2017-04-05 10:42:24 +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 04069cc7f4 fix font size 2017-03-31 13:28:30 +02:00
ansuz 6e9968f989 add 'lol' code theme 2017-03-31 09:19:45 +02:00
ansuz 9b4b642d4a protect against subtly corrupted user objects 2017-03-30 17:19:49 +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 ed89a13fe6 progress on adding version string to some css 2017-03-29 12:55:36 +02:00
ansuz 76990ac1b2 version toolbar.css for cache-busting 2017-03-29 11:56:03 +02:00
ansuz a0c17d7c9b latest rpc code 2017-03-27 18:15:15 +02:00
ansuz 59a80d5fde remove silly TODO 2017-03-27 12:08:19 +02:00
yflory a8ffac5dcd Remove old code 2017-03-27 11:30:09 +02: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
yflory 994d640f8b Fix an issue causing the lag icon to lose its color 2017-03-21 14:52:49 +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 51033ab70a Remove useless links in the context menu and properties for readonly pads in the drive 2017-03-21 12:09:07 +01:00
yflory 7afde2309d Add properties to the files not in the trash 2017-03-21 11:34:18 +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 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
ansuz d422c7e165 support old hashes in getUserChannelList 2017-03-16 17:14:54 +01:00