Commit Graph

3186 Commits (a018b7db9e7ff319fe14236cff3440eac02cbb2e)

Author SHA1 Message Date
ansuz 3f892e04a5 fix codemirror overflow css 2017-11-30 17:24:43 +01:00
yflory 5c3237e093 Fix issues with the async store 2017-11-30 17:21:58 +01:00
yflory b3688db202 Use async store 2017-11-30 15:01:17 +01:00
yflory 0840570fbf Async store part 1 2017-11-30 10:33:09 +01:00
ansuz 96cf83af34 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-27 18:26:11 +01:00
ansuz 385ac9607c pass 'self' into common-util instead of using window 2017-11-27 18:26:04 +01:00
yflory acd8ab7446 Add the markdown toolbar in profile 2017-11-27 18:10:37 +01:00
yflory b0a384e8e0 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-27 17:55:48 +01:00
yflory 74e59a513a Add the markdown toolbar to the slide and poll apps 2017-11-27 17:55:20 +01:00
ansuz 22c5ff757b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-27 15:05:07 +01:00
ansuz 650d26afea use unified listmap in profile app 2017-11-27 15:04:59 +01:00
yflory 68d602f74a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-27 14:44:57 +01:00
yflory 644f6e9985 Use the bounce app to open links from inner 2017-11-27 14:44:44 +01:00
ansuz 5eacc158d9 make tests pass again 2017-11-27 13:45:40 +01:00
ansuz 812df7de6f Merge branch 'merge-staging' into staging 2017-11-27 12:18:34 +01:00
ansuz be5c5831dd lint compliance 2017-11-27 12:18:04 +01:00
yflory 444ba91287 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-27 12:17:46 +01:00
yflory b0f553e9ea Add a markdown toolbar to help with the markdown syntax 2017-11-27 12:17:35 +01:00
ansuz 77c81f2426 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into merge-staging 2017-11-27 12:16:47 +01:00
ansuz 4ff4ccd1d3 use faster and more correct 'find' implementation 2017-11-27 11:30:50 +01:00
ansuz e3f04ef076 Merge branch 'soon' into staging 2017-11-27 11:11:49 +01:00
ansuz 71cf3a4ddf fix creation of personal todo list 2017-11-27 11:09:28 +01:00
ansuz 701af29192 fix broken register/login process 2017-11-24 15:12:00 +01:00
ansuz a3c093838c merge latest staging and resolve conflicts 2017-11-24 13:46:59 +01:00
ansuz 56102d3689 use unified listmap 2017-11-24 13:40:21 +01:00
ansuz 661db129b2 lint compliance 2017-11-24 10:32:58 +01:00
ansuz 80978377f2 return transformed cursor value 2017-11-24 10:03:45 +01:00
ansuz 2e00214783 drop unreachable code 2017-11-23 16:57:01 +01:00
ansuz ee6c2097f5 resolve merge conflicts 2017-11-23 16:56:49 +01:00
yflory 9795ac32cb Ability to burn an anonymous drive from the browser 2017-11-23 14:36:42 +01:00
yflory 4b5abdecbe Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-23 12:29:32 +01:00
yflory 280a7c2765 Clean cryptpad-common 2017-11-23 12:28:49 +01:00
ansuz 98c2b0c802 Merge branch 'soon' into staging 2017-11-22 17:38:49 +01:00
ansuz 3ff0eb116b don't let search interfere with renaming 2017-11-22 17:23:14 +01:00
yflory eba1c9dfac Add chainpad log to the debug app 2017-11-21 18:50:33 +01:00
yflory a660c03f97 Fix scrollbar in the debug app 2017-11-21 17:42:50 +01:00
yflory 30cea8888d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-21 17:37:53 +01:00
yflory 06011065d2 Add a debug app 2017-11-21 17:37:38 +01:00
ansuz 60c4973d62 resolve merge conflicts 2017-11-21 17:22:06 +01:00
ansuz 585f9d2e4e repair broken 'clear channel' button 2017-11-21 17:19:35 +01:00
yflory 000f3edd1d Constants file 2017-11-21 16:47:19 +01:00
yflory 477f14bb8b Put constants in a separate file 2017-11-21 16:46:19 +01:00
ansuz 9d662bd337 fix right-click pad creation in drive 2017-11-21 15:21:37 +01:00
ansuz d726c95f0b fix namespace collision 2017-11-21 15:10:28 +01:00
ansuz c8a9afb6c8 remove duplicate loading screen 2017-11-21 15:09:53 +01:00
yflory 7f88d1d43a Improve drive loading speed 2017-11-21 11:09:59 +01:00
yflory 06ede6b294 Fix export in apps using framework 2017-11-21 10:26:33 +01:00
yflory c35e3d644e Make sure dates are stored as numbers in the drive 2017-11-20 15:37:23 +01:00
yflory 655dfe971d Add translation for the edit username button in the userlist 2017-11-20 14:28:35 +01:00
yflory eb88efd83f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-20 14:17:37 +01:00
yflory 80803ad076 Fix empty codemirror after thumbnail creation 2017-11-20 14:17:29 +01:00
ansuz a8d5a68eb5 open links correctly in contacts app 2017-11-20 14:06:19 +01:00
ansuz 7441a68fb9 update test after merging api changes 2017-11-20 12:22:26 +01:00
ansuz d1beb6493b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-20 12:20:13 +01:00
ansuz b96ea47f1f strip tracking parameters when parsing urls 2017-11-20 12:09:17 +01:00
yflory e2cf46d725 Add new keyboard shortcuts for the drive search 2017-11-20 11:50:52 +01:00
yflory cf26c4c286 Improve the toolbar UI for smaller screens 2017-11-17 18:21:45 +01:00
yflory fc02f97d78 Use less2 classes in the user menu 2017-11-17 18:20:45 +01:00
yflory 41a082c46d Fix video thumbnails 2017-11-17 18:20:02 +01:00
yflory fd258fc277 Fix preview button tooltip in code 2017-11-17 18:19:35 +01:00
yflory fe9261f6a2 Fix modules order in TODO 2017-11-17 18:19:11 +01:00
yflory af8aa25228 Add an option to never rename a file during the session 2017-11-17 10:57:54 +01:00
yflory 31b31654ec Lint compliance 2017-11-16 18:57:33 +01:00
yflory 25d3d321da Ability to rename a file before uploading it to the server 2017-11-16 18:11:13 +01:00
yflory 2813b7219e Fix the public key using the wrong domain in settings 2017-11-16 13:35:07 +01:00
yflory a96e49d55a Fix filepicker creating a new netflux network when initialized 2017-11-15 16:56:50 +01:00
yflory 630ac45948 Fix laggy and blinking tooltips 2017-11-15 16:31:26 +01:00
yflory 1f53304ad3 Display a dropdown menu inside another one 2017-11-15 15:35:28 +01:00
yflory 014e12b5b5 Ability to update the username from the userlist 2017-11-15 11:32:54 +01:00
yflory bdd24ed14f lint 2017-11-14 11:57:13 +01:00
yflory 7cfe64fc5b Remove cryptpad-common dependency for some inner apps 2017-11-13 18:09:19 +01:00
yflory 1514ad5df3 Move the 'logged out' screen inside the sframe 2017-11-13 17:29:00 +01:00
yflory 5a2afb5c95 Remove Realtime and Messaging from common 2017-11-13 17:01:09 +01:00
yflory 30c8c253dd Remove util and hash from common 2017-11-13 16:32:40 +01:00
yflory c9e1de042c Remove common-interface dependency from cryptpad-common 2017-11-13 12:00:26 +01:00
yflory dc207393fd Separate UI elements from cryptpad-common 2017-11-13 10:23:18 +01:00
Caleb James DeLisle 50da6b3b2e Needs to be handled in chainpad-listmap
Revert "Do content checks on the drive so if it gets corrupted, the patch will be rejected"

This reverts commit eaa7b6e8e5.
2017-11-11 01:34:20 +01:00
Caleb James DeLisle eaa7b6e8e5 Do content checks on the drive so if it gets corrupted, the patch will be rejected 2017-11-11 01:26:54 +01:00
yflory 354c63bd64 Clean old code 2017-11-09 18:17:49 +01:00
Caleb James DeLisle ac66511f0a Merge branch 'staging' into new-diff 2017-11-09 17:44:45 +01:00
yflory be848c1bec Fix broken readonly link in drive 2017-11-09 17:27:50 +01:00
yflory f931574dac lint compliance 2017-11-09 17:23:13 +01:00
Caleb James DeLisle 7b62a8042e Remove TextPatcher and begin to include ChainPad directly using requirejs instead of sniffing off the window 2017-11-09 17:07:04 +01:00
Caleb James DeLisle 840cd91bcb manual merge 2017-11-09 15:38:32 +01:00
Caleb James DeLisle 75130150d5 Refactored out TextPatcher and JsonOT and replaced with new ChainPad 2017-11-09 15:36:49 +01:00
yflory cf5ccf04f2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-09 14:23:54 +01:00
yflory 101482b8cc Migrate settings to use a sandboxed iframe 2017-11-09 14:23:40 +01:00
ansuz 7f8147b18b Merge branch 'soon' 2017-11-07 15:06:57 +01:00
yflory c1ba08cfc6 Make sure thumbnails are .png 2017-11-07 15:04:45 +01:00
yflory 0956905ca8 Wipe localForage on log out 2017-11-07 14:56:50 +01:00
yflory 6b9ffe8dd1 Make thumbnails more secure 2017-11-07 14:51:53 +01:00
ansuz 454fc8498c remove old* apps 2017-11-07 13:50:07 +01:00
ansuz e07bb0f7b3 roll back to old transform function, except in pad 2017-11-06 17:18:10 +01:00
yflory a592317e35 lint compliance 2017-11-06 15:49:40 +01:00
yflory fef97ed60e Fix an creating duplicates mediatags in markdown preview 2017-11-06 15:47:18 +01:00
yflory 9060464f37 Create thumbnails only when the tab is not focused 2017-11-06 13:36:54 +01:00
yflory a37e6c7979 lint compliance 2017-11-03 18:39:06 +01:00
yflory 2a3a5c4342 Ability to disable thumbnails 2017-11-03 18:38:27 +01:00
yflory 5dff9a32b6 Fix comments order in polls 2017-11-03 18:38:04 +01:00
yflory 1871749b6f Fix -1 viewer in the userlist when disconnected 2017-11-03 15:14:23 +01:00
yflory cf3024ef5b Ability to display an error in the toolbar state 2017-11-03 14:30:59 +01:00
yflory 8de9a596f1 Fix cursor in thumbnails 2017-11-02 19:11:27 +01:00
yflory fd7bb3aadb Make sure the infinite spinner modal is not displayed multiple times 2017-11-02 17:47:19 +01:00
yflory 3ebb5ca493 Fix issue in diffMarked creating text nodes for each character 2017-10-31 18:19:30 +01:00
yflory 5438970ab4 typo 2017-10-31 11:30:13 +01:00
yflory e0f7df80b3 Fix avatar upload and use less2 everywhere in profile 2017-10-31 11:11:29 +01:00
yflory 7f9b21405b Add missing files for profile 2017-10-31 10:27:41 +01:00
yflory e99836bae2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-30 18:49:43 +01:00
yflory 4250688856 Migrate profile to use sframe 2017-10-30 18:49:28 +01:00
ansuz 744809101c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-30 16:24:55 +01:00
ansuz 867df1db56 fix '+New' button in drive toolbar 2017-10-30 16:24:41 +01:00
yflory 907e2cb517 lint compliance 2017-10-30 15:13:27 +01:00
yflory abc511a56e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-30 15:12:29 +01:00
yflory 68accaf653 Todo in sframe with less2 2017-10-30 15:12:15 +01:00
ansuz 11b8b380fd Merge branch 'staging' into evilham 2017-10-30 14:50:11 +01:00
ansuz 04f26ff886 Merge branch 'staging' of github.com:evilham/cryptpad into evilham 2017-10-30 14:41:21 +01:00
ansuz 0a14c715ad add test for support of invite urls 2017-10-30 14:40:43 +01:00
Evilham 5dcfbd07ab Merge branch 'theming-improvement' into staging 2017-10-27 18:32:08 +02:00
Evilham 4933aafbc8 Added default values to avoid breaking existing themes. 2017-10-27 18:31:52 +02:00
ansuz 4c0049ad55 don't log presence of other users as 'joins' when you have first joined 2017-10-27 14:20:31 +02:00
ansuz 325f685f3e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-27 14:14:25 +02:00
ansuz 1cbf1aec92 prevent undefined access in non-sframe apps 2017-10-27 14:14:19 +02:00
yflory ac1b67ad67 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-27 13:31:54 +02:00
yflory 1245b4d244 Enable thumbnails in poll and whiteboard 2017-10-27 13:31:41 +02:00
ansuz d644054e3f lint compliance 2017-10-27 11:13:26 +02:00
ansuz ed253e6c75 Merge branch 'staging' into evilham 2017-10-27 11:03:16 +02:00
ansuz df1a700cb2 disable thumbnail test. add test for flat dom 2017-10-27 11:01:22 +02:00
ansuz 02cd7e5b58 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-27 10:44:53 +02:00
ansuz 69890ebd8f prototype alternate datastructure for trees in listmap 2017-10-27 10:43:44 +02:00
ansuz 23c305f71f implement removeItem so localForage doesn't complain 2017-10-27 10:37:44 +02:00
Evilham 735f0a7e30 Merge branch 'theming-improvement' into staging 2017-10-26 20:44:56 +02:00
Evilham 83da9cf752 Moved colours to colortheme.less to enable theming 2017-10-26 20:29:14 +02:00
yflory 8251247da2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-26 12:31:33 +02:00
yflory 6f020b67ca Add thumbnails to framework apps 2017-10-26 12:31:16 +02:00
ansuz 98c66ef8f6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-25 13:04:08 +02:00
yflory bf817f20ee Fix file upload in code and slide 2017-10-25 12:31:22 +02:00
ansuz f031af4e9d fix broken media-tags in contacts 2017-10-25 10:50:17 +02:00
yflory 24572a40d2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-24 18:50:19 +02:00
yflory f4adbd980e Thumbnails for the code app 2017-10-24 18:49:58 +02:00
ansuz ba97aa7ad2 allow file upload handler to create thumbnails for whiteboard 2017-10-24 18:09:38 +02:00
ansuz 6157c57a4b disable color palette when interface is not editable 2017-10-24 17:59:19 +02:00
ansuz 8359902f6a fix typo in poll 2017-10-24 17:42:08 +02:00
ansuz 69f9a7ebf3 make userlist change notifications configurable 2017-10-24 17:29:58 +02:00
Caleb James DeLisle 027b9fa383 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-24 18:03:31 +03:00
Caleb James DeLisle aa37997aa3 Enable JSON-OT again because it is working now that the arguments are passed in the right order <facepalm> 2017-10-24 18:02:03 +03:00
ansuz bac608adfe Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-24 16:56:13 +02:00
ansuz dc90811090 only call onReady once in sframe-listmap 2017-10-24 16:56:08 +02:00
yflory bac10472f3 lint compliance 2017-10-24 14:32:47 +02:00
yflory 39b4cb9226 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-24 14:31:56 +02:00
yflory 18b5b20d27 Add thumbnails for PDFs 2017-10-24 14:31:42 +02:00
ansuz aee51f1317 lint compliance 2017-10-24 14:02:29 +02:00
ansuz 447b0a74ee handle errors for videos when uploading 2017-10-24 13:45:27 +02:00
yflory 30a69fae13 Add thumbnails for videos 2017-10-24 12:26:04 +02:00
yflory 21f8ae7570 Keep the correct ratio for image thumbnails 2017-10-24 11:45:07 +02:00
yflory 2dd3c42fd5 Fix handlers registered again on reconnect in drive and poll 2017-10-24 10:42:08 +02:00
yflory a0bcb901d3 Add titles in poll when options or usernames are overflowing 2017-10-23 15:16:51 +02:00
yflory 74985fd0f2 Use text for the addUser button in polls 2017-10-23 15:12:27 +02:00
ansuz 6db5a34323 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-23 14:53:42 +02:00
ansuz c17fc2efe7 improve option order in poll 2017-10-23 14:53:31 +02:00
yflory 2be22867c1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-23 14:39:31 +02:00
yflory 13718d0263 Fix recent pads in chrome 2017-10-23 14:38:38 +02:00
ansuz 2e5fdf709a Merge branch 'soon' into staging 2017-10-23 14:29:01 +02:00
ansuz de8339fea7 hide alertify when you are in presentation mode 2017-10-23 14:25:25 +02:00
Caleb James DeLisle 9b02b36724 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-23 14:22:54 +03:00
Caleb James DeLisle d7e9498143 Fix and then disable the new OT 2017-10-23 14:22:33 +03:00
ansuz 288e141c1f add missing sframe method 2017-10-23 12:33:50 +02:00
yflory c1d05a00ba Improve media-tag export in pad to work with existing CSP 2017-10-23 10:55:40 +02:00
yflory 3e4faf1be1 Add new state messages in the toolbar 2017-10-20 18:12:47 +02:00
yflory 6d080bcb45 Ability to export mediatag images in pad 2017-10-20 18:10:08 +02:00
yflory a0dd867f33 Fix pending state not removed after friend invite rejected 2017-10-20 18:09:09 +02:00
yflory c25be21138 Fix the upgrade button in the drive 2017-10-20 10:16:01 +02:00
Caleb James DeLisle cc6b2192e4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-20 10:26:27 +03:00
yflory a3c7aa67d8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-19 19:07:00 +02:00
yflory 094856a511 Fix renaming pad with multiple dots in the name in drive 2017-10-19 18:30:55 +02:00
ansuz bf832ba784 fix comment overflow 2017-10-19 17:30:40 +02:00
yflory 7bc2f81852 Fix pinned column not always stored in polls 2017-10-19 16:01:56 +02:00
yflory 88e7f9a218 Add last access and creation times in the properties window in drive 2017-10-19 15:05:55 +02:00
yflory 22e3baed4b Fix sort issues in drive 2017-10-19 15:00:29 +02:00
yflory f43606f71d Present mode to display only the parsed markdown in code 2017-10-19 14:39:38 +02:00
yflory 515214aed1 Use present mode in embed code 2017-10-19 11:59:07 +02:00
yflory 201c974df6 Merge branch 'thumbnails' into staging 2017-10-19 11:43:43 +02:00
yflory 7b8490ad20 Use less2 in contacts 2017-10-19 09:58:28 +02:00
yflory dd63cd13d7 Fix profile page title 2017-10-18 16:59:20 +02:00
Caleb James DeLisle 81d0b3272d Fix multiple infinite-spinner errors piling up on top of eachother 2017-10-18 14:49:50 +03:00
Caleb James DeLisle 9e4c48f537 lint errors 2017-10-18 12:25:13 +03:00
Caleb James DeLisle a149152f11 Merge branch 'staging' into framework 2017-10-18 11:42:31 +03:00
yflory 4197b7b968 Fix missing icon in list mode for files with thumbnail 2017-10-17 17:23:31 +02:00
yflory d941b1098a Remove selection in whiteboard when uploading to the drive 2017-10-17 17:21:15 +02:00
yflory 4116d08dd1 Display thumbnails in the drive and then file picker 2017-10-17 17:17:31 +02:00
yflory 6920129126 Embed images from the drive in whiteboard 2017-10-17 12:19:57 +02:00
MacLemon 867b971c33 Compressed images: PNG recompressed pixel identical, JPGs recompressed visually identically. Saving about 9.8%≈580kB overall, to speed up initial and repeating client connections. 2017-10-14 00:31:31 +02:00
yflory 2fd120100a Merge branch 'wb' into staging 2017-10-13 16:58:59 +02:00
Caleb James DeLisle 15337603bb Merge branch 'staging' into framework 2017-10-13 13:41:24 +03:00
Caleb James DeLisle a6b34491fc freeze the editor when reconnecting 2017-10-13 13:40:51 +03:00
Caleb James DeLisle 854c1e94a4 make infinite spinner error message go away if ChainPad settles after it has been popped 2017-10-13 13:39:49 +03:00
yflory a859ab081a Fix fouc in drive 2017-10-12 18:21:34 +02:00
yflory 7b6432f134 Lint 2017-10-12 18:20:33 +02:00
yflory 6926d42292 Autoload template picker to make it faster to appear when used 2017-10-12 18:18:01 +02:00
yflory 1c8e1a36e8 Add file type in the pad attributes for existing files 2017-10-12 17:43:49 +02:00
yflory b86f8e3f26 Fix uloaded files not moved to the correct folder in drive 2017-10-12 17:33:22 +02:00