Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• bd85f1b003 Fix file upload and remove unnecessary dependencies yflory 2017-12-01 10:16:48 +01:00
• b5516ddcd0 send 404 page from server ansuz 2017-11-30 19:19:21 +01:00
• 443eeaa407 fancy 404 page ansuz 2017-11-30 19:17:59 +01:00
• 7544bb1ced Fix a few issues with RPC which I managed to verschlumbesserung Caleb James DeLisle 2017-11-30 18:48:19 +01:00
• 7c8572c99d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2017-11-30 18:32:27 +01:00
• 5187b3f26c Flow compliance and fix a few bugs in rpc.js Caleb James DeLisle 2017-11-30 18:32:20 +01:00
• 664625a6ef Fix more async store issues yflory 2017-11-30 18:22:26 +01:00
• d1277d7026 Merge branch 'staging' into refactor2 yflory 2017-11-30 17:25:23 +01:00
• aca83ce72a expose self as global for linter ansuz 2017-11-30 17:25:05 +01:00
• 3f892e04a5 fix codemirror overflow css ansuz 2017-11-30 17:24:43 +01:00
• 5c3237e093 Fix issues with the async store yflory 2017-11-30 17:21:58 +01:00
• b3688db202 Use async store yflory 2017-11-30 15:01:17 +01:00
• 0840570fbf Async store part 1 yflory 2017-11-30 10:33:09 +01:00
• 96cf83af34 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-11-27 18:26:11 +01:00
• 385ac9607c pass 'self' into common-util instead of using window ansuz 2017-11-27 18:26:04 +01:00
• f0dca50c62 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-11-27 18:10:49 +01:00
• acd8ab7446 Add the markdown toolbar in profile yflory 2017-11-27 18:10:37 +01:00
• 97d56303bc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-11-27 17:59:07 +01:00
• 1d0da582b4 update bower.json ansuz 2017-11-27 17:58:50 +01:00
• b0a384e8e0 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-11-27 17:55:48 +01:00
• 74e59a513a Add the markdown toolbar to the slide and poll apps yflory 2017-11-27 17:55:20 +01:00
• 22c5ff757b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-11-27 15:05:07 +01:00
• 650d26afea use unified listmap in profile app ansuz 2017-11-27 15:04:59 +01:00
• 68d602f74a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-11-27 14:44:57 +01:00
• 644f6e9985 Use the bounce app to open links from inner yflory 2017-11-27 14:44:44 +01:00
• 5eacc158d9 make tests pass again ansuz 2017-11-27 13:45:40 +01:00
• 812df7de6f Merge branch 'merge-staging' into staging ansuz 2017-11-27 12:18:34 +01:00
• be5c5831dd lint compliance ansuz 2017-11-27 12:18:04 +01:00
• 444ba91287 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-11-27 12:17:46 +01:00
• b0f553e9ea Add a markdown toolbar to help with the markdown syntax yflory 2017-11-27 12:17:35 +01:00
• 77c81f2426 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into merge-staging ansuz 2017-11-27 12:16:47 +01:00
• 4ff4ccd1d3 use faster and more correct 'find' implementation ansuz 2017-11-27 11:30:50 +01:00
• e3f04ef076 Merge branch 'soon' into staging ansuz 2017-11-27 11:11:49 +01:00
• 71cf3a4ddf fix creation of personal todo list ansuz 2017-11-27 11:09:28 +01:00
• 701af29192 fix broken register/login process ansuz 2017-11-24 15:12:00 +01:00
• a3c093838c merge latest staging and resolve conflicts ansuz 2017-11-24 13:46:59 +01:00
• 56102d3689 use unified listmap ansuz 2017-11-24 13:40:21 +01:00
• 661db129b2 lint compliance ansuz 2017-11-24 10:32:58 +01:00
• 80978377f2 return transformed cursor value ansuz 2017-11-24 10:03:45 +01:00
• 2e00214783 drop unreachable code ansuz 2017-11-23 16:57:01 +01:00
• ee6c2097f5 resolve merge conflicts ansuz 2017-11-23 16:56:49 +01:00
• 9795ac32cb Ability to burn an anonymous drive from the browser yflory 2017-11-23 14:36:42 +01:00
• 4b5abdecbe Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-11-23 12:29:32 +01:00
• 280a7c2765 Clean cryptpad-common yflory 2017-11-23 12:28:49 +01:00
• 1e9856647e lint compliance ansuz 2017-11-22 17:40:00 +01:00
• 98c2b0c802 Merge branch 'soon' into staging ansuz 2017-11-22 17:38:49 +01:00
• 3ff0eb116b don't let search interfere with renaming ansuz 2017-11-22 17:23:14 +01:00
• 677ba9bc0f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-11-21 18:50:54 +01:00
• eba1c9dfac Add chainpad log to the debug app yflory 2017-11-21 18:50:33 +01:00
• eac6afba24 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-11-21 18:22:08 +01:00
• c196b98eb2 add a script to check accounts server for registered users ansuz 2017-11-21 18:22:01 +01:00
• cdd8c6e110 Fix history mode not centered yflory 2017-11-21 17:48:43 +01:00
• a660c03f97 Fix scrollbar in the debug app yflory 2017-11-21 17:42:50 +01:00
• 30cea8888d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-11-21 17:37:53 +01:00
• 06011065d2 Add a debug app yflory 2017-11-21 17:37:38 +01:00
• 60c4973d62 resolve merge conflicts ansuz 2017-11-21 17:22:06 +01:00
• 585f9d2e4e repair broken 'clear channel' button ansuz 2017-11-21 17:19:35 +01:00
• 2ff1a17ade Merge branch 'soon' into staging ansuz 2017-11-21 17:02:59 +01:00
• 000f3edd1d Constants file yflory 2017-11-21 16:47:19 +01:00
• 477f14bb8b Put constants in a separate file yflory 2017-11-21 16:46:19 +01:00
• 8150abddbe remove dead code from pages.js ansuz 2017-11-21 15:52:21 +01:00
• 4ffb59dce9 bump to version 1.21.0 ansuz 2017-11-21 15:47:06 +01:00
• 9d662bd337 fix right-click pad creation in drive ansuz 2017-11-21 15:21:37 +01:00
• d726c95f0b fix namespace collision ansuz 2017-11-21 15:10:28 +01:00
• c8a9afb6c8 remove duplicate loading screen ansuz 2017-11-21 15:09:53 +01:00
• 7f88d1d43a Improve drive loading speed yflory 2017-11-21 11:09:59 +01:00
• 06ede6b294 Fix export in apps using framework yflory 2017-11-21 10:26:17 +01:00
• c35e3d644e Make sure dates are stored as numbers in the drive yflory 2017-11-20 15:37:23 +01:00
• 655dfe971d Add translation for the edit username button in the userlist yflory 2017-11-20 14:28:35 +01:00
• e8e90905e4 Fix assert translations yflory 2017-11-20 14:23:56 +01:00
• eb88efd83f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-11-20 14:17:37 +01:00
• 80803ad076 Fix empty codemirror after thumbnail creation yflory 2017-11-20 14:17:29 +01:00
• 78e972201a bump CryptPad version ansuz 2017-11-20 14:16:55 +01:00
• a8d5a68eb5 open links correctly in contacts app ansuz 2017-11-20 14:06:19 +01:00
• 7441a68fb9 update test after merging api changes ansuz 2017-11-20 12:22:26 +01:00
• d1beb6493b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-11-20 12:20:13 +01:00
• b96ea47f1f strip tracking parameters when parsing urls ansuz 2017-11-20 12:09:17 +01:00
• e2cf46d725 Add new keyboard shortcuts for the drive search yflory 2017-11-20 11:50:52 +01:00
• ce3600b026 Update translation keys yflory 2017-11-20 10:41:27 +01:00
• cf26c4c286 Improve the toolbar UI for smaller screens yflory 2017-11-17 18:21:45 +01:00
• fc02f97d78 Use less2 classes in the user menu yflory 2017-11-17 18:20:45 +01:00
• 41a082c46d Fix video thumbnails yflory 2017-11-17 18:20:02 +01:00
• fd258fc277 Fix preview button tooltip in code yflory 2017-11-17 18:19:35 +01:00
• fe9261f6a2 Fix modules order in TODO yflory 2017-11-17 18:19:11 +01:00
• af8aa25228 Add an option to never rename a file during the session yflory 2017-11-17 10:57:54 +01:00
• 31b31654ec Lint compliance yflory 2017-11-16 18:57:33 +01:00
• 25d3d321da Ability to rename a file before uploading it to the server yflory 2017-11-16 18:11:13 +01:00
• 2813b7219e Fix the public key using the wrong domain in settings yflory 2017-11-16 13:35:07 +01:00
• a96e49d55a Fix filepicker creating a new netflux network when initialized yflory 2017-11-15 16:56:50 +01:00
• 630ac45948 Fix laggy and blinking tooltips yflory 2017-11-15 16:31:26 +01:00
• 1f53304ad3 Display a dropdown menu inside another one yflory 2017-11-15 15:35:28 +01:00
• 014e12b5b5 Ability to update the username from the userlist yflory 2017-11-15 11:32:54 +01:00
• bdd24ed14f lint yflory 2017-11-14 11:57:13 +01:00
• 9184dd0ce6 Merge branch 'refactor2' into staging yflory 2017-11-14 11:53:13 +01:00
• 7cfe64fc5b Remove cryptpad-common dependency for some inner apps yflory 2017-11-13 18:09:19 +01:00
• 1514ad5df3 Move the 'logged out' screen inside the sframe yflory 2017-11-13 17:28:09 +01:00
• 5a2afb5c95 Remove Realtime and Messaging from common yflory 2017-11-13 17:01:09 +01:00
• af1ea4fd96 Fix typo in the French translation yflory 2017-11-13 16:34:37 +01:00
• 30c8c253dd Remove util and hash from common yflory 2017-11-13 16:32:40 +01:00
• c9e1de042c Remove common-interface dependency from cryptpad-common yflory 2017-11-13 12:00:15 +01:00