Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• f990200996 drop any notion of crypto from sframe-listmap ansuz 2017-09-19 18:21:33 +02:00
• a1c124f1be Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-09-19 15:38:21 +02:00
• 95542bcdaf Lint yflory 2017-09-19 15:38:19 +02:00
• c9223cb942 listmap does not care about 'readOnly' mode anymore ansuz 2017-09-19 15:38:06 +02:00
• 88914ec6cc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-09-19 15:36:38 +02:00
• 8a09e39f46 Enable tags in pads yflory 2017-09-19 15:30:08 +02:00
• d2b27f3588 resolve merge conflicts ansuz 2017-09-19 14:24:26 +02:00
• f127240a2f add poll to main.less ansuz 2017-09-19 14:23:54 +02:00
• 4af01e6e9e make listmap consume cpNfInner ansuz 2017-09-19 14:16:13 +02:00
• 6683434c62 Fix wrong relative url yflory 2017-09-19 12:03:40 +02:00
• 72f0952835 Make sure we can't open a pad using the wrong app yflory 2017-09-19 11:31:45 +02:00
• 35a313d6ee Make palette realtime yflory 2017-09-19 11:20:20 +02:00
• 6fdd66167a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-09-19 11:04:59 +02:00
• 3023e8c855 Fix templates in whiteboard yflory 2017-09-19 11:04:52 +02:00
• 732585ea7b Sandboxed iframe for the whiteboard app yflory 2017-09-19 10:27:31 +02:00
• 029a8e3023 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-09-19 10:27:30 +02:00
• d72146ba7f use setAttribute for assigning attributes in hyperscript ansuz 2017-09-19 10:27:14 +02:00
• 2ceb925d9b Link to cryptad releases documentation added. Genma 2017-09-18 16:11:40 +02:00
• a78b597ebb lint errors yflory 2017-09-18 15:51:47 +02:00
• 92ea3593cd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-09-18 15:47:52 +02:00
• 8ce364a252 Add a button to empty the trash in the drive yflory 2017-09-18 15:47:39 +02:00
• 937d323780 don't assume anything ckeditor-related is lint compliant ansuz 2017-09-18 15:30:56 +02:00
• a1e7bf701d Select the element after clicking 'show in folder' in the drive search yflory 2017-09-18 15:24:25 +02:00
• 0a18e09440 Cryptad version in Readme.md added Genma 2017-09-18 15:11:17 +02:00
• 5c405090e1 pin ckeditor version ansuz 2017-09-18 15:09:39 +02:00
• f9d27d2783 WIP secure contacts ansuz 2017-09-18 15:09:01 +02:00
• 483160a96a Fix tab notifications in code and slides yflory 2017-09-18 14:31:58 +02:00
• 1131ef0172 Fix language selection in sandboxed iframes yflory 2017-09-18 14:26:54 +02:00
• 0a656ca8d6 Fix the splitter in code and add it back yflory 2017-09-18 12:09:18 +02:00
• 018f71df04 Add drop handlers for mediatags in ckeditor yflory 2017-09-18 10:59:40 +02:00
• c00d295466 Add missing translations yflory 2017-09-15 17:33:36 +02:00
• a927f40f02 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-09-15 13:21:45 +02:00
• 974658453c Mediatag integration in pads yflory 2017-09-15 13:21:37 +02:00
• 08e0ae424d log errors in less compilation ansuz 2017-09-14 18:13:03 +02:00
• 927a4b948f Merge branch 'soon' into staging ansuz 2017-09-14 14:05:55 +02:00
• 15db6b180c copy bug fixes from changes ansuz 2017-09-14 13:43:13 +02:00
• 5b45e92250 delete range requests after they have completed ansuz 2017-09-14 12:08:41 +02:00
• 4f6909fce3 set icon to 'faded' styles ansuz 2017-09-14 12:07:21 +02:00
• 086d4bae32 clean up contacts initialization ansuz 2017-09-14 12:01:57 +02:00
• 96d0456f31 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-09-14 11:54:16 +02:00
• 1091e0b375 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-09-14 11:52:52 +02:00
• 47ce645897 implement slice ansuz 2017-09-14 11:51:33 +02:00
• a8f7beb20b remove deprecated apps ansuz 2017-09-14 11:36:01 +02:00
• 6ed4f2fc64 fix a thing ansuz 2017-09-14 11:27:10 +02:00
• 8a564bf350 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-09-14 11:23:51 +02:00
• 513f8e73d4 refactor cryptpad.ready to use nthen ansuz 2017-09-14 11:23:37 +02:00
• c50c297490 Fix the size of the loading screen for the filepicker yflory 2017-09-14 11:03:39 +02:00
• b643ccc232 typo Caleb James DeLisle 2017-09-14 10:54:16 +02:00
• 652c916690 change the command in the documentation so that it will not change itself Caleb James DeLisle 2017-09-14 10:52:55 +02:00
• 5f0383ae99 update version of sframe-boot because it was changed Caleb James DeLisle 2017-09-14 10:52:25 +02:00
• 845f75f8a7 remove a 100ms dead spot from page load Caleb James DeLisle 2017-09-14 10:48:59 +02:00
• 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 +02:00
• 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 +02:00
• 4d688289cc lint-compliance ansuz 2017-09-13 18:19:15 +02:00
• 2797a77f5d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-09-13 18:18:45 +02:00
• 47cfa0cf45 Focus the editable content when opening a codemirror pad yflory 2017-09-13 18:09:55 +02:00
• e0ae0fcd91 thanks Dima! ansuz 2017-09-13 17:47:49 +02:00
• f039fc7ff5 develop a system for avoiding z-index problems ansuz 2017-09-13 17:43:17 +02:00
• bafa401473 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-09-13 17:22:48 +02:00
• fa64adbbe5 Hide visible elements while loading the slide app yflory 2017-09-13 17:22:43 +02:00
• fbd4be6135 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-09-13 16:32:41 +02:00
• d360e2d0f4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-09-13 16:20:26 +02:00
• ab64bf9e59 Use less2 for the loading screen yflory 2017-09-13 16:19:26 +02:00
• 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 +02:00
• a332168926 fix some bugs in prompts, alerts, confirms ansuz 2017-09-13 15:52:31 +02:00
• 0db33d48fc properly handle variable args in Cryptpad.alert ansuz 2017-09-13 14:52:58 +02:00
• 8a87ec180e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-09-13 14:52:26 +02:00
• 0d8c292fef Merge branches 'staging' and 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2017-09-13 14:47:55 +02:00
• 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 +02:00
• 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 +02:00
• dc86579d46 use an 8 character password for tests ansuz 2017-09-13 14:00:48 +02:00
• e1f090bb9d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-09-13 12:33:05 +02:00
• 244e3ecba7 support forefront flag in alert config ansuz 2017-09-13 12:32:30 +02:00
• 63cb5dfc1e Make less loader rewrite urls to use version parameter Caleb James DeLisle 2017-09-13 12:04:24 +02:00
• d967df2cec Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2017-09-13 11:00:09 +02:00
• e3c0ec29f7 Hopefully chase out a race in sframe-channel Caleb James DeLisle 2017-09-13 11:00:00 +02:00
• 8c41e0bdd6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-09-12 18:40:20 +02:00
• 437f50fd4a Migrate the file to a sandboxed iframe yflory 2017-09-12 18:40:11 +02:00
• cce8811f9a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-09-12 14:17:46 +02:00
• 1713167a5d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2017-09-12 14:12:41 +02:00
• 981a919328 Added tooltips back to sframe land with hopefully a more robust removal. Caleb James DeLisle 2017-09-12 14:12:35 +02:00
• ad591fba50 bump version ansuz 2017-09-12 14:04:30 +02:00
• 5ac3e97dc8 Merge branch 'master' into staging yflory 2017-09-12 12:20:47 +02:00
• 8c3e2dbe61 Missing french translation keys yflory 2017-09-12 11:45:47 +02:00
• 7d720c73a9 Merge branch 'soon' yflory 2017-09-12 11:34:12 +02:00
• ddbda08c88 Fix an issue when cleaning the template category in the drive yflory 2017-09-12 11:29:24 +02:00
• 9d229b8868 lint compliance ansuz 2017-09-12 11:30:43 +02:00
• 5b3667fd4e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-09-12 11:29:57 +02:00
• 63700cb791 Fix an issue when cleaning the template category in the drive yflory 2017-09-12 11:29:24 +02:00
• a87ccdc37e remove redundant lines ansuz 2017-09-12 11:27:24 +02:00
• 4dedb5e2a6 Merge branch 'master' of github.com:xwiki-labs/cryptpad ansuz 2017-09-12 11:25:32 +02:00
• da0e31fa54 guard against possible type errors ansuz 2017-09-12 11:20:50 +02:00
• 0f9da69185 Show if a pad has been renamed in the drive yflory 2017-09-12 10:32:40 +02:00
• 499b5ea2ba warn that a password is too short before doing anything else ansuz 2017-09-12 10:50:59 +02:00
• a0b3201df3 fix focus on alerts, prompts, and confirms. call back from alerts ansuz 2017-09-12 10:49:48 +02:00
• a74915ab58 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2017-09-11 17:52:40 +02:00
• 671c893e8a Duplicating code like a moron, this should hopefully get fixed later. Caleb James DeLisle 2017-09-11 17:52:34 +02:00
• 5a4836fe6d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-09-11 16:36:41 +02:00
• 79094aa4bb Fix closing the title input when the title is not modified yflory 2017-09-11 16:36:24 +02:00
• 58c38dd77b focus on the current window when you pop an alert ansuz 2017-09-11 16:34:00 +02:00