2366 Commits (8f03919fd708ae13ed5d9224c829cd004cf7ea86)

Author SHA1 Message Date
ansuz e2c17dbeb4 resolve conflicts 8 years ago
ansuz 0340b45f2c migrate profile to include edKey. don't propose connecting to users with whom you are already friends 8 years ago
yflory 557f13f796 Unfriend and update username - beta 8 years ago
ansuz 7be1e249e1 add fa-share-alt to pad initialText 8 years ago
ansuz 96d2ff67e1 user-plus as icon for add-friend 8 years ago
ansuz c3ba7cd792 fix race condition 8 years ago
ansuz d0d38aa2a3 feedback on first visit 8 years ago
ansuz 9527a5def7 avoid a CSP error. silence pdfjs warnings 8 years ago
ansuz 9707433944 comment out debugging info 8 years ago
ansuz 7a225af11e fix some minor slide navigation bugs 8 years ago
ansuz 575d4612f9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz eda9908c3b prevent accessing attributes of null 8 years ago
ansuz eeb2ee2d17 add clear channel rpc 8 years ago
yflory 8fb5762eea Lint errors 8 years ago
ansuz 89af8e4472 fix funny off-by-one thing 8 years ago
yflory ac684a8dc7 Use the APP toolbar in profile 8 years ago
yflory 2d509e3e25 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory b3e225cb3b Replace spinner by text and fix mobile UI 8 years ago
ansuz f450a28d11 improve logic for guessing titles within code documents 8 years ago
ansuz 0483d15b8f lint compliance 8 years ago
ansuz c0cb5c4263 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
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
8 years ago
ansuz 5b3cca58bd modifications to handle latest media-tag 8 years ago
yflory 7f5c301734 Add display name in the settings useradmin menu 8 years ago
yflory fb21a650ce Lint errors 8 years ago
yflory d09f5b70c7 Fix slides CSS 8 years ago
yflory 159ccc2866 Fix mediatag flickering 8 years ago
yflory ce50dbf3ca Hide the 'templates' list header if the category is empty 8 years ago
yflory 42075e4b5f Make everything 16px and 32px 8 years ago
yflory 16d0527e92 Add a page title in drive, settings and file 8 years ago
yflory 5d5f936682 Hide the upload table in code 8 years ago
yflory a0b14faf89 Fix the font in settings and drive 8 years ago
yflory e732284845 Lint 8 years ago
yflory 112c4c85e5 Left menu in drive 8 years ago
yflory 8f5a244999 Replace mediatag markdown syntax by html. Enable file upload in /code. 8 years ago
yflory 9f9e593e0f Lint 8 years ago
yflory 560671ae7d Make avatars circle 8 years ago
yflory 125018c8c3 New settings page 8 years ago
yflory c02fa39524 Make drive search bar blue 8 years ago
yflory 438e7e6cf9 Fix display name in useradmin (friends app) 8 years ago
yflory e6188bfb63 Fix useradmin dropdown position 8 years ago
yflory 97d8d86395 Fix avatar in static pages 8 years ago
yflory e8f3df5a46 Clean less 8 years ago
yflory 159d72f33b Merge branch 'msg' into staging 8 years ago
yflory 8e2e8b1653 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory ff10c282d4 Avatar in the user admin button 8 years ago
yflory be6ee672d3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory f0523a0153 Avatar in the user admin menu 8 years ago
ansuz e10de1219b feedback on view hash usage 8 years ago
ansuz 52eb8e307c feedback for language used 8 years ago
ansuz 086e5909dd Merge branch 'soon' into staging 8 years ago
ansuz 781974ec7c center 'Create a profile' button 8 years ago
yflory 1c531ccd47 Pin the chat channels 8 years ago
ansuz 4a37bc4a1c abort the realtime session if it does not synchronize for 30 seconds 8 years ago
ansuz 29c6ed6e9b hide slide arrows when there are no more slides in that direction 8 years ago
ansuz c096872467 Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 8 years ago
ansuz eff27ff6c5 focus username button 8 years ago
ansuz c60a71e210 add connect button and view profile button 8 years ago
ansuz 94f8e4b8a3 use validateKeys when instantiating object 8 years ago
ansuz 22fbc7e5d8 implement getter for public keys 8 years ago
ansuz ecef970250 float connect button right because flex styles messed up the pencil icon 8 years ago
yflory df103c4074 Messaging app 8 years ago
ansuz f9a43d6570 select everything before file extensions in drive when renaming 8 years ago
ansuz 1c462d5c4a use random token for feedback instead of date 8 years ago
yflory 21f1527c71 Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 8 years ago
yflory 5c7441f82c Display the friend list in the friend app 8 years ago
ansuz fac715dd09 Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 8 years ago
ansuz 4b23ef74d7 add support for curve message signing and curve validateKeys 8 years ago
yflory a5e8f6ae81 Add friend app and fix avatar size 8 years ago
yflory af31771e3a Share a channel id, not a hash 8 years ago
yflory 852b2eaf1d Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 8 years ago
yflory 26a83003b5 Create an owned channel 8 years ago
yflory 5b5a7ab286 Hide the friend button when the resquest is accepted 8 years ago
ansuz f02285d103 fix lowercased p 8 years ago
ansuz 5d96c68ad7 fix profile app display on chrome 8 years ago
yflory de420de021 Fix the folder's path in the search results page 8 years ago
ansuz d3bbdc27c0 lint compliance 8 years ago
ansuz bce0b03ba4 Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 8 years ago
ansuz 909e00bbc3 create a listmap object using public key crypto 8 years ago
yflory 96fde4e5ed Add missing file 8 years ago
ansuz df53166b37 implement and use prototype curve encryptors 8 years ago
ansuz d293ba4d44 add support for invite hashes 8 years ago
yflory 37d5b0afb9 Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 8 years ago
yflory 95e2efab89 Add to friend list 8 years ago
ansuz e353627204 log users out if they do not have curve keys. add curve keys to object on registration and login. 8 years ago
ansuz 4016a95540 prototype invite app 8 years ago
yflory 465ef74f2b Fix rpc 8 years ago
yflory bf17ad3f1e Friend button in the userlist 8 years ago
yflory 8dc8aa27ab Lint 8 years ago
yflory 35e8c1a63b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 43ac71603c Move pad attributes in pad data 8 years ago
ansuz 9f6ecea5d9 fix nacl reference error in media tag 8 years ago
yflory 3e802c2443 Fix overflowing content in profile 8 years ago
ansuz dfad622b76 Merge branch 'soon' into staging 8 years ago
yflory 69f4ce2abd Fix middle click on the drive button 8 years ago
ansuz cbd9fc4076 Merge branch 'staging' 8 years ago
ansuz 3fe0baa956 disable pin limit caching 8 years ago
ansuz 9c1eaf9c1a lint compliance 8 years ago
ansuz fa06f9d413 fix minor bugs in poll 8 years ago
ansuz 90bcadd87b Merge branch 'soon' into staging 8 years ago
ansuz be7e7fec43 don't bypass warnings when registering 8 years ago
yflory cab595f959 Fix duplicate folders in the drive 8 years ago
ansuz 42375190e6 style buttons for long titles 8 years ago
ansuz c27c140130 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz ac8da0d52d load codemirror in the correct context. fix selection events 8 years ago
yflory 789274fd4f Fix font-size in slides 8 years ago
ansuz 7377d39b39 hide print button 8 years ago
ansuz 43b877ad27 fix styling on media tag download button 8 years ago
ansuz 1fd0ba488a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 04a28433ae replace inner content of media tag download buttons 8 years ago
ansuz f85af7ef4c hide useless messages 8 years ago
ansuz a59853f9c2 use new media tag 8 years ago
yflory 8cf694bea6 Lint 8 years ago
yflory 47c6c64b8a Allow emojis in default avatars 8 years ago
yflory ffd184d50e Fix overflowing names in the new userlist 8 years ago
ansuz 92d88d1644 don't change allowed media types until we have media-tag scoping 8 years ago
ansuz 678986dac4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory fa2d857d70 Fix css issues with Safari 8 years ago
ansuz efedfe0667 show preview pane by default in /slide/ 8 years ago
yflory 81c8949aee Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 1df5e6e855 Fix toolbar buttons for Safari 8 years ago
ansuz 8b0210baf1 hide useless error 8 years ago
yflory 991cb896bd Fix avatar in /pad 8 years ago
yflory 70c9f3df75 Fix avatar size 8 years ago
ansuz f09ae9b19c jshint compliance 8 years ago
ansuz 4a9a564913 don't try to handle error thta never happens anymore 8 years ago
ansuz b15aa3360a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 6ac056e314 make explicit file size RPCs unauthenticated 8 years ago
yflory 9b131dc49c Fix CSS in the slide app 8 years ago
yflory 5694505719 Fix syntax highlighting 8 years ago
yflory 335898a4c7 Hack the drawer to close it when clicking outside 8 years ago
yflory 472a62730b Fix profile creation and add a link to the profile app 8 years ago
yflory f357ec32c2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory b153dda6ff Add avatars in the user list 8 years ago
ansuz c2e153e8ed more fouc fixes 8 years ago
yflory 555d0a09f8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 568ce70afd Add a spinner for the history and update history buttons 8 years ago
Caleb James DeLisle 2144587919 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
Caleb James DeLisle c25f2df721 Added caching versions to some of the images which are loaded by js 8 years ago
yflory 4ab82710ab Remove the background color from the text-color button in the slide app 8 years ago
yflory 7e69d051c4 Lint errors 8 years ago
yflory 26193aeaa7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory b9320e6005 Toolbar improvements 8 years ago
ansuz 9e91739044 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz ecff05425f feedback for slide printing 8 years ago
ansuz 75c2a1fd73 jshint compliance 8 years ago
ansuz b8934c0b97 smarter redraws of drive/settings usage bar 8 years ago
yflory 5a3e9c785c Fix ckeditor toolbar 8 years ago
yflory cc5b7615ad Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory ed0121d172 Lint errors 8 years ago
yflory 8abc94d37b Replace folder images in the drive 8 years ago
ansuz b7cb1a8d5f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 8279ef3130 Fix conflict between ckeditor toolbar and userlist on small screens 8 years ago
ansuz b037cfbfdb set usage tips relative to bottom of screen, not top 8 years ago
ansuz 1763cf72d1 tell anonymous users they can't upload 8 years ago
yflory 7a87775372 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 45f180955b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 56a25e1036 Small fixes for the new toolbar 8 years ago
ansuz 1179992a90 update feedback key name 8 years ago
ansuz 4a5f5de78c restore missing stylesheet for poll 8 years ago
ansuz bbf9916a91 fixes for file app 8 years ago
ansuz 39149a052b add new feedback keys 8 years ago
ansuz 7a5c5ce0a3 load scripts asynchronously 8 years ago
ansuz 9b8866ed72 handle RPC_NOT_READY error for logged out users 8 years ago
ansuz a9f8f42e3c use minified less compiler 8 years ago
ansuz fca1ef4d36 hide unstyled content until the loading screen is displayed 8 years ago
yflory 877c5a8d0e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 19ff8a345d Avatar upload in the profile app 8 years ago
ansuz 5e56ad912e remove the last bit of compiled css 8 years ago
ansuz 7a7307d560 fix logging when resetting 8 years ago
yflory 6c94605b9b File upload in the profile 8 years ago
ansuz 7439bbaba2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz ed45814020 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz cfc5907237 remove unnecessary style rules 8 years ago
yflory 85d8eda847 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 176e47f394 Add the profile app 8 years ago
ansuz 1c1869a22c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 7de2683169 make all apps use clientside templates 8 years ago
ansuz f232675cc9 create a favicon if it does not already exist 8 years ago
ansuz 3be6433fdf send feedback on name changes 8 years ago
ansuz bdca6b10c2 use templates in poll.js 8 years ago
ansuz bb74935b08 allow pin limit caching to occur at api level 8 years ago
yflory 00a554ca0d Fix the donate button style with the new toolbar 8 years ago
ansuz e9bfaa9a60 compile less clientside. remove compiled css 8 years ago
ansuz 67a096a8a4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 7b37146034 don't let spacebar keyups propagate outside of the title 8 years ago
ansuz 9195c0cd12 is isOverPinLimit in toolbar 8 years ago
ansuz fce0a37f50 cache pin data once retrieved from the server 8 years ago
yflory 8f2db44793 Remove getTitle from the file app 8 years ago
yflory 33ea8cb183 Make sure we don't call both the yes and no handlers in prompts 8 years ago
yflory 3076ade23a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 36ef4178dc Remove the editable title from the file app 8 years ago
ansuz 51e06e68a7 don't change slides when navigating through history 8 years ago
ansuz ffcbde4325 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 48ece55ed5 style fixes, and dynamic less compilation 8 years ago
yflory 38f568635d Fix duplicate media-tag in slides when adding or removing a slide 8 years ago
yflory ce44a8d351 Fix the backup button in anonymous drive 8 years ago
yflory 06a0590f73 New folder icons 8 years ago
yflory cc341ca6d4 Lint error 8 years ago
yflory 0d4d104e08 Mobile support for the new toolbar 8 years ago
ansuz b4b851959f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 61a891267f more feedback 8 years ago
yflory c1d2fa6b52 Unhack validateKey for the history mode 8 years ago
yflory 90cc3e6a5e New userlist in the whiteboard app 8 years ago
yflory 2710279904 Use the new share button in the file app 8 years ago
yflory 5a48cba999 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 684269fdda Userlist in polls 8 years ago
ansuz 35bfa1dce4 test client-side templates in whiteboard app 8 years ago
yflory a11befaa0f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 13288ee18b Update the userlist in code, slide and pad 8 years ago
ansuz 852c028822 don't allow editing if pad type is wrong 8 years ago
yflory 92b6e60573 Small improvements for the new toolbar 8 years ago
ansuz eddfb936f2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 115813c191 Merge branch 'new-templates' into staging 8 years ago
ansuz 3657e978fd give main2.js a more sensible name 8 years ago
ansuz 118b83c420 make register and login user clientside templates 8 years ago
ansuz ab54dcf84d make libs pass jshint 8 years ago
yflory 8d956c3de6 New toolbar 8 years ago
ansuz 48f9745619 clientside templating 8 years ago
yflory 503e9de07c Lint errors 8 years ago
yflory b7a0547b77 New toolbar colors 8 years ago
yflory 3052ec8abb Merge branch 'newCk' into staging 8 years ago
yflory c3f636851a Fix path size width in drive 8 years ago
yflory c22f610d5c Fix the drive integrity check 8 years ago
yflory fb388f2610 Fix an issue with invalid drive before migration 8 years ago
yflory 59fb5bd8be One toolbar color per app 8 years ago
yflory 5a248db267 Merge branch 'staging' into newCk 8 years ago
yflory 728272d936 Fix undefined function 8 years ago
yflory f13d23241c Upgrade CkEditor to version 4.7 8 years ago
ansuz d822dfe37a add forget button to file app 8 years ago
ansuz 7fd36a72f3 re-add download button for file app 8 years ago
ansuz f02a381e32 avoid horizontal scrollbars 8 years ago
ansuz cc5d5d4f1d make pdfs in file app big 8 years ago
yflory dbfad9d227 Lint 8 years ago
yflory 91d46cdee4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory d3b9ac2511 Update the preview and present content on Ready in slides 8 years ago
ansuz 5fd4870b8b Merge pull request #138 from pbondoer/staging
Fix poll auto-focus inputs
8 years ago
Pierre Bondoerffer 626e54d7b5
Fix poll auto-focus inputs 8 years ago
yflory 54adb680e7 Hide the slide number in the title outside of present mode 8 years ago
ansuz 17838f1d70 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 1b66383bac don't create color-picker if readonly 8 years ago
yflory a38819f5b9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 1ad1b78c64 Fix the history mode with readOnly and old URLs 8 years ago
ansuz b2a70f86d3 disallow concurrent logins 8 years ago
ansuz 35e0de463b disallow concurrent scrypt cycles 8 years ago
ansuz 06ca70d11e lint compliance 8 years ago
ansuz f29f430e7c better handling of non-rpc messages 8 years ago
yflory f1aef66fc9 Fix the drive history 8 years ago
yflory 008c417111 Context menu was not hidden after a click in the drive 8 years ago
yflory 377a90961b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago