Commit Graph

1900 Commits

Author SHA1 Message Date
ansuz b176426213 increase default ckeditor font size to 16px 2017-03-24 14:55:29 +01:00
ansuz 3e9eb03e5a display a user's public signing key in settings if it exists 2017-03-24 14:26:36 +01:00
ansuz ba53b50e0b update path for whiteboard app 2017-03-24 13:33:29 +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 d1c32ea1f8 define english, french, and spanish labels for whiteboard app 2017-03-23 16:50:37 +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
ansuz acc094654d remove funny file 2017-03-21 10:18:50 +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 f301592a83 Merge branch 'spanish' of github.com:pbondoer/cryptpad into spanish 2017-03-20 18:08:08 +01:00
ansuz cc43bb8362 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-20 18:05:39 +01:00
ansuz ef0e1d7aa0 add a non-breaking space to pad initialState 2017-03-20 18:05:07 +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
Pierre Bondoerffer 0efb3c993c
fixed lint :( 2017-03-17 18:10:37 +01:00
yflory 45ac3e40a2 Copy print options to present mode 2017-03-17 18:03:00 +01:00
Pierre Bondoerffer 3c60ebcc97
Update Spanish 2017-03-17 18:02:48 +01:00
yflory a5f11d0d0d Uniform the slides rendering in present and print mode 2017-03-17 15:30:27 +01:00
ansuz 2add39ee40 fix default config 2017-03-16 17:29:12 +01:00
ansuz 25a2215846 reconcile merge conflict from master 2017-03-16 17:24:36 +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 7ab65367c5 don't try to verify messages if you can't decode base64 2017-03-16 17:01:53 +01:00
yflory ecd3f68265 Add chainpad-server to the npm dependencies 2017-03-16 16:24:30 +01:00
yflory 646ed8f6b1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into newServer 2017-03-16 15:57:26 +01:00
yflory 7c9adfbcb6 Replace the websocket server by the one in the chainpad-server repo 2017-03-16 15:57:13 +01:00
ansuz e8fbbf9984 fix default config to be very permissive with CSP headers 2017-03-16 15:40:16 +01:00
ansuz 3185e2a4cc comment out config lines which break local usage of cryptpad 2017-03-16 15:18:57 +01:00
ansuz 737ffe8430 comment out config lines which break local usage of cryptpad 2017-03-16 15:18:29 +01:00
ansuz e207895ffc Merge branch 'master' of github.com:xwiki-labs/cryptpad 2017-03-16 15:17:49 +01:00