Commit Graph

Select branches

Hide Pull Requests

master

#1

v4.14.0

v4.14.1

v5.0.0

Mono Color

• 1091e0b375 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-09-14 11:52:52 +0200
• 47ce645897 implement slice ansuz 2017-09-14 11:51:33 +0200
• a8f7beb20b remove deprecated apps ansuz 2017-09-14 11:36:01 +0200
• 6ed4f2fc64 fix a thing ansuz 2017-09-14 11:27:10 +0200
• 8a564bf350 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-09-14 11:23:51 +0200
• 513f8e73d4 refactor cryptpad.ready to use nthen ansuz 2017-09-14 11:23:37 +0200
• c50c297490 Fix the size of the loading screen for the filepicker yflory 2017-09-14 11:03:39 +0200
• b643ccc232 typo Caleb James DeLisle 2017-09-14 10:54:16 +0200
• 652c916690 change the command in the documentation so that it will not change itself Caleb James DeLisle 2017-09-14 10:52:55 +0200
• 5f0383ae99 update version of sframe-boot because it was changed Caleb James DeLisle 2017-09-14 10:52:25 +0200
• 845f75f8a7 remove a 100ms dead spot from page load Caleb James DeLisle 2017-09-14 10:48:59 +0200
• b24e9b84af Manual merge, update the CSS in loading.js and document that loading.less does nothing. Caleb James DeLisle 2017-09-14 10:48:35 +0200
• 8a32b72ffc 1. implement cryptpadCache which has put() and get() functions that can be used like a localStorage that auto-flushes when a new version is released 2. change loading.js to use packaged css in order to get the loading screen up as quick as possible. 3. change LessLoader to cache less in cryptpadCache Caleb James DeLisle 2017-09-14 10:23:05 +0200
• 4d688289cc lint-compliance ansuz 2017-09-13 18:19:15 +0200
• 2797a77f5d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-09-13 18:18:45 +0200
• 47cfa0cf45 Focus the editable content when opening a codemirror pad yflory 2017-09-13 18:09:55 +0200
• e0ae0fcd91 thanks Dima! ansuz 2017-09-13 17:47:49 +0200
• f039fc7ff5 develop a system for avoiding z-index problems ansuz 2017-09-13 17:43:17 +0200
• bafa401473 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-09-13 17:22:48 +0200
• fa64adbbe5 Hide visible elements while loading the slide app yflory 2017-09-13 17:22:43 +0200
• fbd4be6135 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-09-13 16:32:41 +0200
• d360e2d0f4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-09-13 16:20:26 +0200
• ab64bf9e59 Use less2 for the loading screen yflory 2017-09-13 16:19:26 +0200
• 710418f42f Make LessLoader able to cache even inside of the sandbox iframe and don't load less compiler unless needed Caleb James DeLisle 2017-09-13 16:04:01 +0200
• a332168926 fix some bugs in prompts, alerts, confirms ansuz 2017-09-13 15:52:31 +0200
• 0db33d48fc properly handle variable args in Cryptpad.alert ansuz 2017-09-13 14:52:58 +0200
• 8a87ec180e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-09-13 14:52:26 +0200
• 0d8c292fef Merge branches 'staging' and 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2017-09-13 14:47:55 +0200
• 789a923792 Change font-awesome to be pulled through LessLoader which will rewrite the font file URLs to use ver= parameter Caleb James DeLisle 2017-09-13 14:47:50 +0200
• d46cc8226d Update LessLoader to be capable of loading CSS as well as less files and properly rewrite the URLs Caleb James DeLisle 2017-09-13 14:46:41 +0200
• dc86579d46 use an 8 character password for tests ansuz 2017-09-13 14:00:48 +0200
• e1f090bb9d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-09-13 12:33:05 +0200
• 244e3ecba7 support forefront flag in alert config ansuz 2017-09-13 12:32:30 +0200
• 63cb5dfc1e Make less loader rewrite urls to use version parameter Caleb James DeLisle 2017-09-13 12:04:24 +0200
• d967df2cec Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2017-09-13 11:00:09 +0200
• e3c0ec29f7 Hopefully chase out a race in sframe-channel Caleb James DeLisle 2017-09-13 11:00:00 +0200
• 8c41e0bdd6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-09-12 18:40:20 +0200
• 437f50fd4a Migrate the file to a sandboxed iframe yflory 2017-09-12 18:40:11 +0200
• cce8811f9a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-09-12 14:17:46 +0200
• 1713167a5d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2017-09-12 14:12:41 +0200
• 981a919328 Added tooltips back to sframe land with hopefully a more robust removal. Caleb James DeLisle 2017-09-12 14:12:35 +0200
• ad591fba50 bump version ansuz 2017-09-12 14:04:30 +0200
• 5ac3e97dc8 Merge branch 'master' into staging yflory 2017-09-12 12:20:47 +0200
• 8c3e2dbe61 Missing french translation keys yflory 2017-09-12 11:45:47 +0200
• 7d720c73a9 Merge branch 'soon' yflory 2017-09-12 11:34:12 +0200
• ddbda08c88 Fix an issue when cleaning the template category in the drive yflory 2017-09-12 11:29:24 +0200
• 9d229b8868 lint compliance ansuz 2017-09-12 11:30:43 +0200
• 5b3667fd4e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-09-12 11:29:57 +0200
• 63700cb791 Fix an issue when cleaning the template category in the drive yflory 2017-09-12 11:29:24 +0200
• a87ccdc37e remove redundant lines ansuz 2017-09-12 11:27:24 +0200
• 4dedb5e2a6 Merge branch 'master' of github.com:xwiki-labs/cryptpad ansuz 2017-09-12 11:25:32 +0200
• da0e31fa54 guard against possible type errors ansuz 2017-09-12 11:20:50 +0200
• 0f9da69185 Show if a pad has been renamed in the drive yflory 2017-09-12 10:32:40 +0200
• 499b5ea2ba warn that a password is too short before doing anything else ansuz 2017-09-12 10:50:59 +0200
• a0b3201df3 fix focus on alerts, prompts, and confirms. call back from alerts ansuz 2017-09-12 10:49:48 +0200
• a74915ab58 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2017-09-11 17:52:40 +0200
• 671c893e8a Duplicating code like a moron, this should hopefully get fixed later. Caleb James DeLisle 2017-09-11 17:52:34 +0200
• 5a4836fe6d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-09-11 16:36:41 +0200
• 79094aa4bb Fix closing the title input when the title is not modified yflory 2017-09-11 16:36:24 +0200
• 58c38dd77b focus on the current window when you pop an alert ansuz 2017-09-11 16:34:00 +0200
• b9545f45f7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-09-11 16:26:21 +0200
• 306fec2d0e improve messages for template picker confirm ansuz 2017-09-11 16:25:58 +0200
• 1943c83f69 clean up api for Cryptpad.confirm ansuz 2017-09-11 16:24:43 +0200
• 8d3ebdbaf7 I'm stupid Caleb James DeLisle 2017-09-11 15:53:27 +0200
• 041071e61c manual merge Caleb James DeLisle 2017-09-11 15:52:14 +0200
• 7334173b4a Hopefully fix infinite spinner whenever there is a disconnect (pad) Caleb James DeLisle 2017-09-11 15:46:21 +0200
• 9271b0c1a8 Try to fix half-codemirror bug yflory 2017-09-11 14:42:43 +0200
• 304a8df808 Remove unneeded migration and fix attributes migration yflory 2017-09-11 14:25:19 +0200
• 37dca9c155 Add missing translation keys in french yflory 2017-09-11 14:12:06 +0200
• 5a1abc8986 let's try using actual js syntax ansuz 2017-09-11 14:04:40 +0200
• 134c6057c1 Merge branch 'slide2' of github.com:xwiki-labs/cryptpad into origin/slide2 ansuz 2017-09-11 14:01:05 +0200
• 59d25b4c1a use camel case, not snek case ansuz 2017-09-11 14:00:27 +0200
• 520b8967fd allow people with short passwords to log in ansuz 2017-09-11 13:54:48 +0200
• 8ef27dca08 Lint yflory 2017-09-11 12:25:23 +0200
• 1aef844fc3 Fix title attribute for truncated titles in the drive yflory 2017-09-11 12:23:24 +0200
• 55fe882f64 Fix readonly mode in code yflory 2017-09-11 12:23:04 +0200
• 5cde3fffb8 Align title for normal, readonly and page mode in the toolbar yflory 2017-09-11 12:04:22 +0200
• bd422178c4 Hide the filepicker button in readonly mode yflory 2017-09-11 11:59:09 +0200
• 51f1be9f7a Improve the input style when renaming a folder in the drive tree yflory 2017-09-11 11:50:04 +0200
• 642511dc3b Disable exiting present mode when in embed mode yflory 2017-09-11 11:38:40 +0200
• 7582c9cffd Fix register button in the index dropdown menu for mobiles yflory 2017-09-11 11:22:41 +0200
• 403b62f131 Fix ghost icon modal and improve UI on mobile yflory 2017-09-11 11:04:14 +0200
• 60cbfb4281 Auto-resolve bower dependencies conflict yflory 2017-09-11 10:41:44 +0200
• 757d0a2800 Save the state of CKEditor's toolbar (visible or hidden) yflory 2017-09-11 10:10:29 +0200
• 5bf966633c Merge branch 'staging' into slide2 yflory 2017-09-08 18:21:38 +0200
• 514bff7065 Add slide number in the title in slide2 yflory 2017-09-08 18:21:11 +0200
• 0ed6846e07 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-09-08 17:41:46 +0200
• b5b9f931c7 don't use common-realtime ansuz 2017-09-08 17:41:05 +0200
• 32e8c8ef4b implement alertify without alertify ansuz 2017-09-08 17:40:25 +0200
• a302ee5d25 guard against undefined arguments ansuz 2017-09-08 17:39:41 +0200
• c3a07e879c Merge branch 'staging' into slide2 yflory 2017-09-08 16:23:07 +0200
• fc069dac48 Ask the user before loading the template picker yflory 2017-09-08 16:21:12 +0200
• 05793c220c Fix secure iframes on Edge yflory 2017-09-08 15:54:54 +0200
• 290d668ceb Fix race condition preventing slide to work on Edge yflory 2017-09-08 15:53:53 +0200
• de5d925154 autoselect user href in settings ansuz 2017-09-08 15:07:25 +0200
• e950ce74cb focus on input when opening filepicker ansuz 2017-09-08 15:01:47 +0200
• 739903d511 don't check account usage if you aren't logged in ansuz 2017-09-08 14:00:49 +0200
• bbf7ed3827 refactor drive to use dialog.selectable() ansuz 2017-09-08 12:24:20 +0200
• 684a12ce2e Update pinneddata to work on blobs too Caleb James DeLisle 2017-09-08 11:35:45 +0200
• fe2454ba31 add the ability to filter for old pads using pinneddata.js Caleb James DeLisle 2017-09-08 10:39:45 +0200