dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,754 Commits 92 Branches 135 Tags 578 MiB
Commit Graph

1315 Commits

Author SHA1 Message Date
Caleb James DeLisle 1e56fa31c0 yay, they talk and they don't fight 2017-08-10 18:31:44 +02:00
ansuz 1c526feffb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-10 18:06:58 +02:00
Caleb James DeLisle b3d349bf80 Merge branch 'staging' into pad2 2017-08-10 14:53:12 +02:00
Caleb James DeLisle 8efac4e661 Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging 2017-08-10 14:49:41 +02:00
Caleb James DeLisle 0dde1d7507 wip 2017-08-10 14:49:21 +02:00
Pierre Bondoerffer baf64114a6
point to homepage in drive 2017-08-10 14:45:56 +02:00
Caleb James DeLisle c304071492 wip 2017-08-09 17:37:55 +02:00
Caleb James DeLisle e49a42db18 Merge branch 'staging' into pad2 2017-08-09 16:28:51 +02:00
Caleb James DeLisle 1f9bd866c3 Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging 2017-08-09 16:06:46 +02:00
Pierre Bondoerffer edad5deeac
fix logo not showing sometimes in chrome 2017-08-09 16:06:29 +02:00
Caleb James DeLisle 52565076b9 Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging 2017-08-09 14:48:06 +02:00
Caleb James DeLisle 4b25ab80d6 wip 2017-08-09 14:45:39 +02:00
ansuz 844967a880 continued refactoring 2017-08-09 14:20:37 +02:00
Pierre Bondoerffer a4aeada585
make the file dialog placeholder visible, center file list 2017-08-09 11:20:46 +02:00
Pierre Bondoerffer e08ed72653
generate the tooltip after the button 2017-08-09 11:11:53 +02:00
Pierre Bondoerffer 665e81912e
put the tooltip on the actual button to prevent tippy from popping when not intended 2017-08-09 11:06:06 +02:00
Pierre Bondoerffer 34ba673cd3
improve file upload UI 2017-08-09 10:54:20 +02:00
ansuz 34a5a32c44 lint compliance 2017-08-08 20:29:02 +02:00
ansuz cdf3cee9c8 split out message rendering into ui 2017-08-08 18:21:03 +02:00
ansuz fcdfa52aa9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-08 17:13:38 +02:00
ansuz 58b3b32cc3 big messaging refactor. split UI from logic 2017-08-08 17:13:10 +02:00
Pierre Bondoerffer 6ca6755d02
more missing titles in toolbar 2017-08-08 16:51:23 +02:00
Pierre Bondoerffer d3f2398865
bump tippy to 1.2.0, add dynamicTitle option 2017-08-08 16:19:44 +02:00
ansuz 8301bd44be Merge pull request #164 from pbondoer/staging 
UI improvements
 2017-08-08 14:46:25 +02:00
Pierre Bondoerffer f585ddccdf
fix image sizes in /slide/ 2017-08-08 11:44:01 +02:00
ansuz fc95f1b6a8 lint compliance 2017-08-08 10:32:25 +02:00
ansuz ba9696ba33 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-08 10:03:54 +02:00
Caleb James DeLisle a612f02be2 Merge branch 'staging' into pad2 2017-08-07 17:49:03 +02:00
ansuz c63807fd2b implement channel.send 2017-08-07 17:24:16 +02:00
Caleb James DeLisle 35a55a15ed wip 2017-08-07 17:23:28 +02:00
ansuz d835005905 simplify in-memory message format 2017-08-07 17:22:56 +02:00
Pierre Bondoerffer 8f285eba9f
make file picker ui even prettier 2017-08-07 17:22:54 +02:00
ansuz 797cc2b105 handle messages which fail to decrypt 2017-08-07 17:21:23 +02:00
Caleb James DeLisle 65dfd99171 major wip 2017-08-07 16:27:57 +02:00
Pierre Bondoerffer c53e738054
improve file picker ui 2017-08-07 16:27:29 +02:00
ansuz bad5160885 fix bad reference 2017-08-05 09:14:36 +02:00
ansuz 05aa5ed347 hide new feature until it is finished 2017-08-04 18:07:47 +02:00
ansuz 395f6e1b27 reset confirm text for alertify 2017-08-04 15:54:15 +02:00
ansuz 9865359bb0 don't tell users about new versions 2017-08-04 14:05:00 +02:00
ansuz c8c44d3bfc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-04 11:22:22 +02:00
Caleb James DeLisle 0d1f19f5d4 Big manual merge 2017-08-04 11:20:17 +02:00
Pierre Bondoerffer f6d45d05f6
use logo in toolbar 2017-08-04 11:01:26 +02:00
ansuz 11c72499a0 don't add duplicate messages to the history 2017-08-03 17:06:28 +02:00
ansuz 52854c5a8e ignore history range responses 2017-08-03 15:05:04 +02:00
ansuz e786117110 get new messages when reconnecting and WIP get more history 2017-08-03 15:04:29 +02:00
ansuz 2ce341fed6 disable input field when disconnected 2017-08-03 14:12:07 +02:00
ansuz 66d81429bd integrate file embed into code editor 2017-08-03 11:47:54 +02:00
ansuz 8b0831ac5d save images drawn with whiteboard to your CryptDrive 2017-08-02 16:51:41 +02:00
ansuz fe826133b3 make some markdown styles reusable 2017-08-02 11:03:06 +02:00
ansuz 35cf23ce2c clear tooltips when redrawing the userlist 2017-08-01 11:50:43 +02:00
ansuz 4c6f8d71e1 don't invoke spinner if it does not exist 2017-08-01 11:08:25 +02:00
ansuz 311f709dc4 lint compliance 2017-07-31 17:15:17 +02:00
ansuz c147d342a3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-31 15:45:50 +02:00
ansuz 542d0cd17f drop support for legacy pad list 2017-07-31 15:34:56 +02:00
Pierre Bondoerffer 93e007b52a
reduce png sizes 2017-07-31 15:11:35 +02:00
ansuz 3fa010027c implement clearTooltips 2017-07-31 12:29:41 +02:00
ansuz a68a225d79 fix read-only synchronization bug 2017-07-31 12:21:48 +02:00
CatalinScr 796bf89491 Update of the front-page 2017-07-24 17:56:54 +03:00
Nicolas Lemoine 658b00814b TodoApp - Style and translations 2017-07-23 16:08:49 +03:00
ansuz ae693ff5a7 lint compliance 2017-07-23 09:01:12 +02:00
ansuz 6622735db0 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-22 14:15:15 +02:00
ansuz 55cb0734e2 make bad state timeout configurable 2017-07-22 10:56:39 +02:00
yflory 469f49fc0a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-20 18:32:12 +02:00
yflory a80b00a765 Move the file picker in common 2017-07-20 18:32:03 +02:00
ansuz d44f0696af Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-20 18:24:53 +02:00
ansuz 2d0635a409 use custom version of tippy 2017-07-20 18:23:51 +02:00
yflory 09793e0d7d jshint 2017-07-20 18:21:10 +02:00
yflory 683769f30a Fix tooltips 2017-07-20 18:19:59 +02:00
yflory 9633025afe CSS for the removeHistory button in contacts 2017-07-20 17:26:33 +02:00
yflory 97f1bbedc5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-20 17:08:28 +02:00
yflory b9bba76b4e Make the delay for tooltips configurable 2017-07-20 17:08:11 +02:00
ansuz dd98e2222a WIP erase chat history button 2017-07-20 17:04:11 +02:00
ansuz 128d5b2c6d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-20 15:55:17 +02:00
ansuz b22127f10c add history removal 2017-07-20 15:55:04 +02:00
yflory a5a73ce326 Fix print button in slide 2017-07-20 14:41:51 +02:00
yflory 140964478e Enter + shift key to add a new line in chat 2017-07-20 09:54:44 +02:00
yflory e26e041a5b fix jshint errors 2017-07-19 17:24:35 +02:00
yflory c33d2a2db0 New tooltips 2017-07-19 17:14:10 +02:00
yflory b56a782f01 Store the userlist state when it is closed using the icon 2017-07-19 14:38:46 +02:00
yflory 82c87144cb Remove the friend request button when the request is sent 2017-07-19 14:14:34 +02:00
yflory 5ce49af57b Make CryptDrive fast again 2017-07-19 11:36:00 +02:00
yflory e2d031c76a Add support for markdown syntax in contacts 2017-07-19 10:29:59 +02:00
yflory cba113a2b0 Lint 2017-07-18 15:52:46 +02:00
yflory 91ebbdfdb4 View contact status 2017-07-18 15:50:21 +02:00
ansuz 39fd0d0f5f notify if you're focused on a conversation in a bacgkrounded tab 2017-07-18 10:57:37 +02:00
yflory f719b34e09 Add tab notification in contacts 2017-07-18 10:42:23 +02:00
yflory baf439648e Add the contacts app in the dropdown menu 2017-07-18 10:22:51 +02:00
yflory 36d792874a Fix initial text not removed in /contacts 2017-07-18 10:13:29 +02:00
ansuz df0442c2bf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-17 18:40:27 +02:00
ansuz eb4b5ca77c stub history removal. coming soon 2017-07-17 18:39:44 +02:00
yflory aa8181ab2b Contacts app translations 2017-07-17 18:34:46 +02:00
yflory 73e32f273e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-17 18:08:07 +02:00
yflory 009d01abde Fix friend removal and update user data 2017-07-17 18:07:58 +02:00
ansuz 1aecdeb075 fresh media tag build 2017-07-17 11:08:39 +02:00
ansuz 7114bfaa52 lint compliance 2017-07-13 21:09:29 +02:00
ansuz e2c17dbeb4 resolve conflicts 2017-07-13 17:52:00 +02:00
yflory 557f13f796 Unfriend and update username - beta 2017-07-13 17:32:57 +02:00
ansuz 96d2ff67e1 user-plus as icon for add-friend 2017-07-13 15:22:11 +02:00
ansuz c3ba7cd792 fix race condition 2017-07-13 12:55:08 +02:00
ansuz d0d38aa2a3 feedback on first visit 2017-07-13 11:03:56 +02:00
ansuz 9527a5def7 avoid a CSP error. silence pdfjs warnings 2017-07-13 10:58:45 +02:00
ansuz 9707433944 comment out debugging info 2017-07-13 10:57:51 +02:00
ansuz 575d4612f9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-12 18:56:12 +02:00
ansuz eda9908c3b prevent accessing attributes of null 2017-07-12 18:56:04 +02:00
ansuz eeb2ee2d17 add clear channel rpc 2017-07-12 18:55:29 +02:00
ansuz 89af8e4472 fix funny off-by-one thing 2017-07-12 18:49:33 +02:00
yflory ac684a8dc7 Use the APP toolbar in profile 2017-07-12 18:34:16 +02:00
yflory 2d509e3e25 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-12 14:34:57 +02:00
yflory b3e225cb3b Replace spinner by text and fix mobile UI 2017-07-12 14:33:28 +02:00
ansuz f450a28d11 improve logic for guessing titles within code documents 2017-07-12 11:09:53 +02:00
ansuz 0483d15b8f lint compliance 2017-07-12 10:55:42 +02:00
ansuz c0cb5c4263 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-12 10:46:15 +02:00
ansuz f4bca0f9c0 Modifications for latest media-tag 
* use latest built media-tag
* include pdfjs and configure its path for media-tag
* check whether decryption events affect an avatar. crop it if so
 2017-07-12 10:44:40 +02:00
ansuz 5b3cca58bd modifications to handle latest media-tag 2017-07-12 10:44:03 +02:00
yflory 7f5c301734 Add display name in the settings useradmin menu 2017-07-11 18:50:41 +02:00
yflory fb21a650ce Lint errors 2017-07-11 17:40:13 +02:00
yflory 159ccc2866 Fix mediatag flickering 2017-07-11 17:39:08 +02:00
yflory 16d0527e92 Add a page title in drive, settings and file 2017-07-11 15:13:39 +02:00
yflory a0b14faf89 Fix the font in settings and drive 2017-07-11 13:11:16 +02:00
yflory 8f5a244999 Replace mediatag markdown syntax by html. Enable file upload in /code. 2017-07-11 11:56:06 +02:00
yflory 438e7e6cf9 Fix display name in useradmin (friends app) 2017-07-10 13:04:33 +02:00
yflory e6188bfb63 Fix useradmin dropdown position 2017-07-10 12:38:54 +02:00
yflory 97d8d86395 Fix avatar in static pages 2017-07-10 12:03:44 +02:00
yflory e8f3df5a46 Clean less 2017-07-10 11:57:04 +02:00
yflory 159d72f33b Merge branch 'msg' into staging 2017-07-10 11:48:22 +02:00
yflory 8e2e8b1653 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-10 11:46:16 +02:00
yflory ff10c282d4 Avatar in the user admin button 2017-07-10 11:46:06 +02:00
yflory be6ee672d3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-10 11:16:52 +02:00
yflory f0523a0153 Avatar in the user admin menu 2017-07-10 11:16:44 +02:00
ansuz e10de1219b feedback on view hash usage 2017-07-10 11:13:56 +02:00
ansuz 52eb8e307c feedback for language used 2017-07-10 10:59:32 +02:00
yflory 1c531ccd47 Pin the chat channels 2017-07-10 10:39:57 +02:00
ansuz 4a37bc4a1c abort the realtime session if it does not synchronize for 30 seconds 2017-07-10 10:34:25 +02:00
ansuz c096872467 Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 2017-07-10 09:30:44 +02:00
ansuz 22fbc7e5d8 implement getter for public keys 2017-07-10 09:21:27 +02:00
yflory df103c4074 Messaging app 2017-07-07 18:53:21 +02:00
ansuz 1c462d5c4a use random token for feedback instead of date 2017-07-07 10:16:54 +02:00
yflory 21f1527c71 Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 2017-07-06 18:39:06 +02:00
yflory 5c7441f82c Display the friend list in the friend app 2017-07-06 18:38:58 +02:00
ansuz fac715dd09 Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 2017-07-06 18:35:21 +02:00
ansuz 4b23ef74d7 add support for curve message signing and curve validateKeys 2017-07-06 18:30:16 +02:00
yflory a5e8f6ae81 Add friend app and fix avatar size 2017-07-06 18:00:03 +02:00
yflory af31771e3a Share a channel id, not a hash 2017-07-06 14:47:02 +02:00
yflory 852b2eaf1d Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 2017-07-06 14:27:32 +02:00
yflory 26a83003b5 Create an owned channel 2017-07-06 14:27:13 +02:00
yflory 5b5a7ab286 Hide the friend button when the resquest is accepted 2017-07-06 12:31:31 +02:00
ansuz d3bbdc27c0 lint compliance 2017-07-06 10:33:31 +02:00
ansuz bce0b03ba4 Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 2017-07-06 10:25:53 +02:00
ansuz 909e00bbc3 create a listmap object using public key crypto 2017-07-06 10:25:43 +02:00
yflory 96fde4e5ed Add missing file 2017-07-06 10:24:28 +02:00
ansuz df53166b37 implement and use prototype curve encryptors 2017-07-06 10:22:20 +02:00
ansuz d293ba4d44 add support for invite hashes 2017-07-06 09:44:39 +02:00
yflory 37d5b0afb9 Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 2017-07-05 18:42:51 +02:00
yflory 95e2efab89 Add to friend list 2017-07-05 18:42:32 +02:00
ansuz e353627204 log users out if they do not have curve keys. add curve keys to object on registration and login. 2017-07-05 17:19:28 +02:00
ansuz 4016a95540 prototype invite app 2017-07-05 16:01:50 +02:00
yflory 465ef74f2b Fix rpc 2017-07-05 16:02:22 +02:00
yflory bf17ad3f1e Friend button in the userlist 2017-07-05 15:59:36 +02:00
yflory 8dc8aa27ab Lint 2017-07-05 12:27:40 +02:00
yflory 35e8c1a63b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-05 12:27:08 +02:00
yflory 43ac71603c Move pad attributes in pad data 2017-07-05 12:26:42 +02:00
ansuz 9f6ecea5d9 fix nacl reference error in media tag 2017-07-05 11:57:53 +02:00
yflory 69f4ce2abd Fix middle click on the drive button 2017-07-04 17:03:54 +02:00
ansuz cbd9fc4076 Merge branch 'staging' 2017-07-04 17:03:20 +02:00
ansuz 3fe0baa956 disable pin limit caching 2017-07-04 15:50:52 +02:00
ansuz 9c1eaf9c1a lint compliance 2017-07-04 15:48:20 +02:00
yflory cab595f959 Fix duplicate folders in the drive 2017-07-04 14:51:35 +02:00
ansuz ac8da0d52d load codemirror in the correct context. fix selection events 2017-07-04 12:37:24 +02:00
ansuz 43b877ad27 fix styling on media tag download button 2017-07-04 10:28:50 +02:00
ansuz 1fd0ba488a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-04 10:21:35 +02:00
ansuz 04a28433ae replace inner content of media tag download buttons 2017-07-04 10:21:29 +02:00
ansuz f85af7ef4c hide useless messages 2017-07-04 10:19:18 +02:00
ansuz a59853f9c2 use new media tag 2017-07-04 10:15:45 +02:00
yflory 8cf694bea6 Lint 2017-07-03 18:41:41 +02:00
yflory 47c6c64b8a Allow emojis in default avatars 2017-07-03 18:37:50 +02:00
yflory ffd184d50e Fix overflowing names in the new userlist 2017-07-03 17:41:34 +02:00
ansuz 92d88d1644 don't change allowed media types until we have media-tag scoping 2017-07-03 16:45:40 +02:00
yflory fa2d857d70 Fix css issues with Safari 2017-07-03 16:11:41 +02:00
yflory 81c8949aee Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-03 14:43:17 +02:00
ansuz 8b0210baf1 hide useless error 2017-07-03 12:26:34 +02:00
yflory 991cb896bd Fix avatar in /pad 2017-07-03 12:25:05 +02:00
ansuz 6ac056e314 make explicit file size RPCs unauthenticated 2017-07-03 11:38:39 +02:00
yflory 5694505719 Fix syntax highlighting 2017-07-03 11:16:28 +02:00
yflory 335898a4c7 Hack the drawer to close it when clicking outside 2017-06-30 18:23:23 +02:00
yflory 472a62730b Fix profile creation and add a link to the profile app 2017-06-30 17:24:22 +02:00
yflory b153dda6ff Add avatars in the user list 2017-06-30 16:57:23 +02:00
yflory 555d0a09f8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-30 12:36:34 +02:00
yflory 568ce70afd Add a spinner for the history and update history buttons 2017-06-30 12:36:21 +02:00
Caleb James DeLisle 2144587919 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-30 12:11:55 +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
yflory 7e69d051c4 Lint errors 2017-06-30 11:46:20 +02:00
yflory 26193aeaa7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-30 11:42:59 +02:00
yflory b9320e6005 Toolbar improvements 2017-06-30 11:42:54 +02:00
ansuz 75c2a1fd73 jshint compliance 2017-06-30 11:20:56 +02:00
ansuz b8934c0b97 smarter redraws of drive/settings usage bar 2017-06-30 11:20:40 +02:00
yflory cc5b7615ad Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-29 18:05:49 +02:00
yflory ed0121d172 Lint errors 2017-06-29 18:05:34 +02:00
ansuz b7cb1a8d5f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-29 17:54:29 +02:00
yflory 8279ef3130 Fix conflict between ckeditor toolbar and userlist on small screens 2017-06-29 17:51:30 +02:00
ansuz b037cfbfdb set usage tips relative to bottom of screen, not top 2017-06-29 17:25:06 +02:00
ansuz 1763cf72d1 tell anonymous users they can't upload 2017-06-29 16:28:58 +02:00
yflory 7a87775372 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-29 15:21:09 +02:00
ansuz 45f180955b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-29 15:20:46 +02:00
yflory 56a25e1036 Small fixes for the new toolbar 2017-06-29 15:15:40 +02:00
ansuz 1179992a90 update feedback key name 2017-06-29 14:48:33 +02:00
ansuz 39149a052b add new feedback keys 2017-06-29 14:16:20 +02:00
ansuz 9b8866ed72 handle RPC_NOT_READY error for logged out users 2017-06-29 11:13:48 +02:00
ansuz a9f8f42e3c use minified less compiler 2017-06-29 10:50:21 +02:00
yflory 877c5a8d0e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-28 17:15:42 +02:00
yflory 19ff8a345d Avatar upload in the profile app 2017-06-28 16:59:35 +02:00
ansuz 5e56ad912e remove the last bit of compiled css 2017-06-28 14:51:49 +02:00
ansuz 7a7307d560 fix logging when resetting 2017-06-28 12:08:16 +02:00
yflory 6c94605b9b File upload in the profile 2017-06-28 10:59:29 +02:00
ansuz 1c1869a22c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-27 18:26:10 +02:00
ansuz f232675cc9 create a favicon if it does not already exist 2017-06-27 18:07:03 +02:00
ansuz 3be6433fdf send feedback on name changes 2017-06-27 18:06:32 +02:00
ansuz bb74935b08 allow pin limit caching to occur at api level 2017-06-27 15:37:42 +02:00
yflory 00a554ca0d Fix the donate button style with the new toolbar 2017-06-27 14:36:49 +02:00
ansuz e9bfaa9a60 compile less clientside. remove compiled css 2017-06-27 14:25:02 +02:00
ansuz 67a096a8a4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-27 09:57:32 +02:00
ansuz 7b37146034 don't let spacebar keyups propagate outside of the title 2017-06-26 18:32:29 +02:00
ansuz 9195c0cd12 is isOverPinLimit in toolbar 2017-06-26 18:13:06 +02:00
ansuz fce0a37f50 cache pin data once retrieved from the server 2017-06-26 17:32:31 +02:00
yflory 33ea8cb183 Make sure we don't call both the yes and no handlers in prompts 2017-06-26 16:23:55 +02:00
ansuz 51e06e68a7 don't change slides when navigating through history 2017-06-26 14:40:48 +02:00
yflory 38f568635d Fix duplicate media-tag in slides when adding or removing a slide 2017-06-26 14:08:14 +02:00
yflory cc341ca6d4 Lint error 2017-06-23 17:57:29 +02:00
yflory 0d4d104e08 Mobile support for the new toolbar 2017-06-23 17:56:14 +02:00
ansuz b4b851959f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-22 17:42:32 +02:00
ansuz 61a891267f more feedback 2017-06-22 17:42:24 +02:00
yflory c1d2fa6b52 Unhack validateKey for the history mode 2017-06-22 17:35:54 +02:00
yflory 2710279904 Use the new share button in the file app 2017-06-22 17:03:51 +02:00
yflory 684269fdda Userlist in polls 2017-06-22 16:14:54 +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
ansuz eddfb936f2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-22 11:12:51 +02:00
ansuz 115813c191 Merge branch 'new-templates' into staging 2017-06-22 11:11:32 +02:00
ansuz ab54dcf84d make libs pass jshint 2017-06-22 10:03:58 +02:00
yflory 8d956c3de6 New toolbar 2017-06-21 18:04:35 +02:00
ansuz 48f9745619 clientside templating 2017-06-21 18:02:38 +02:00
yflory b7a0547b77 New toolbar colors 2017-06-20 17:59:11 +02:00
yflory 3052ec8abb Merge branch 'newCk' into staging 2017-06-20 14:57:19 +02:00
yflory c22f610d5c Fix the drive integrity check 2017-06-20 12:59:44 +02:00
yflory fb388f2610 Fix an issue with invalid drive before migration 2017-06-20 12:42:30 +02:00
yflory 59fb5bd8be One toolbar color per app 2017-06-20 12:33:50 +02:00
yflory 5a248db267 Merge branch 'staging' into newCk 2017-06-20 10:57:40 +02:00
yflory 728272d936 Fix undefined function 2017-06-20 10:29:03 +02:00
yflory a38819f5b9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-19 14:41:38 +02:00