dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
15,679 Commits 99 Branches 133 Tags 566 MiB
Commit Graph

15679 Commits

Author SHA1 Message Date
yflory 8fab5a3d3c Merge branch '2024.6-rc' of github.com:cryptpad/cryptpad into 2024.6-rc 2024-06-25 13:38:02 +02:00
yflory 0490fcab67 Fix TypeError 2024-06-25 13:37:48 +02:00
mathilde-cryptpad 5cd714465a fix conflict with package description 2024-06-25 12:50:36 +02:00
mathilde-cryptpad 25b5a3a341 revert name change who doesn't allow capital letters 2024-06-25 12:26:59 +02:00
mathilde-cryptpad a87edcaf69
Merge pull request #1530 from cryptpad/upgrade-cryptpad-version-npm 
upgrade CryptPad version in package.json, update description as well
 2024-06-25 12:20:11 +02:00
mathilde-cryptpad 20d7c10fb8 upgrade CryptPad version in package.json, update description as well 2024-06-25 12:19:09 +02:00
mathilde-cryptpad 738ba20743
Merge pull request #1529 from cryptpad/docker-compose-new-version 
upgrade CryptPad version in docker-compose.yml
 2024-06-25 12:14:33 +02:00
mathilde-cryptpad a7fac806bd upgrade CryptPad version in docker-compose.yml 2024-06-25 12:13:55 +02:00
yflory 307a3f4c5c Fix EINVAL on install page when token was just created 2024-06-25 11:29:13 +02:00
yflory b17b2c5cd4 Update ws dependency to fix possible DoS issue 2024-06-24 18:13:36 +02:00
yflory c16e57f813 Merge branch '2024.6-rc' of github.com:cryptpad/cryptpad into 2024.6-rc 2024-06-24 18:03:59 +02:00
yflory f823e421e7 Replace lesshint dev dependency 2024-06-24 18:03:44 +02:00
Wolfgang Ginolas 3bbf848253 Add "Upgrade notes" for 2024.6.0 to CHANGELOG.md 2024-06-24 17:54:47 +02:00
yflory 3d7a886475 Update package-lock 2024-06-24 17:17:31 +02:00
yflory fd8e057401 Add XXX for hardcoded translation 2024-06-24 17:12:22 +02:00
yflory 8fd4b66cae Merge branch 'staging' into 2024.6-test 2024-06-24 17:11:58 +02:00
yflory 62b5425a3e Update package.json version 2024-06-24 17:10:50 +02:00
yflory 57459807b4 Merge branch 'staging' into 2024.6-test 2024-06-24 17:06:06 +02:00
yflory aa8156f69d Merge branch 'CorvusCorax-remove_mediatag_subfolder' into staging 2024-06-24 17:05:25 +02:00
yflory 6e43ae31b9 Merge branch 'remove_mediatag_subfolder' of https://github.com/CorvusCorax/cryptpad into CorvusCorax-remove_mediatag_subfolder 2024-06-24 17:05:05 +02:00
yflory eaf494d33f Merge branch 'staging' of github.com:cryptpad/cryptpad into staging 2024-06-24 17:03:36 +02:00
yflory 547258b891 Merge branch 'superboum-bug/create_block_folder_at_boot' into staging 2024-06-24 17:03:15 +02:00
yflory f98ac59530 Merge branch 'bug/create_block_folder_at_boot' of https://github.com/superboum/cryptpad into superboum-bug/create_block_folder_at_boot 2024-06-24 17:02:47 +02:00
yflory cf8dfb3f88
Merge pull request #1527 from nisbet-hubbard/patch-4 
Tidy up Apache httpd config
 2024-06-24 16:54:20 +02:00
yflory 3a23833c30 Merge branch 'staging' into 2024.6-test 2024-06-24 16:51:17 +02:00
yflory 25bd9243fb Merge branch 'main' into staging 2024-06-24 16:51:04 +02:00
yflory ab551aac31 Merge branch 'staging' into 2024.6-test 2024-06-24 16:32:28 +02:00
yflory 947295eb8a Update package-lock 2024-06-24 16:32:15 +02:00
yflory 42923ae333 Update dependencies 2024-06-24 16:25:42 +02:00
yflory 79335f5d28 lint compliance 2024-06-24 15:27:37 +02:00
yflory 4f484cc611 Merge branch 'appconfig_ui' into 2024.6-test 2024-06-24 15:25:47 +02:00
yflory 261d580093 lint compliance 2024-06-24 15:25:29 +02:00
yflory d010c60550 Merge branch 'staging' into appconfig_ui 2024-06-24 15:24:31 +02:00
yflory 49b87146b2 Merge branch 'plugins' into 2024.6-test 2024-06-24 15:19:24 +02:00
yflory 9e5d39a2e2 Fix issues when no clientside plugins are installed 2024-06-24 15:19:13 +02:00
yflory 03ea3f7c8e Merge branch 'appconfig_ui' into 2024.6-test 2024-06-24 15:15:44 +02:00
yflory 62bcab59b9 Fix sidebar links after refactoring 2024-06-24 15:15:01 +02:00
yflory 5e61dd60f1 lint compliance 2024-06-24 15:12:06 +02:00
zuzanna-maria a386f7782f linting 2024-06-24 13:33:19 +01:00
yflory e501474d77 Merge branch 'appconfig_ui' into 2024.6-test 2024-06-24 11:58:39 +02:00
David Benque ea64d9b068 Merge branch 'appconfig_ui' of github.com:cryptpad/cryptpad into appconfig_ui 2024-06-24 10:53:57 +01:00
David Benque 4e3e3543d7 Add instance color presets 2024-06-24 10:53:51 +01:00
yflory 58f05dd5d6 Merge branch 'appconfig_ui' into 2024.6-test 2024-06-24 11:13:57 +02:00
yflory c250e8bff2 Don't push disabled apps decree if the value didn't change 2024-06-24 11:13:42 +02:00
yflory 3e1ba2a834 Merge branch 'appconfig_ui' into 2024.6-test 2024-06-24 11:07:46 +02:00
yflory d06ad0d5b2 Onboarding: remove login loading screen to show onboarding 2024-06-24 11:05:18 +02:00
nisbet-hubbard f5fc1d6bde
Minor fix 2024-06-22 21:02:50 +08:00
yflory 179865304d Merge branch 'plugins' into 2024.6-test 2024-06-21 18:49:26 +02:00
yflory 67549561b8 Merge branch 'appconfig_ui' into 2024.6-test 2024-06-21 18:47:44 +02:00
yflory 704100b90e Merge branch 'appconfig_ui' of github.com:cryptpad/cryptpad into appconfig_ui 2024-06-21 18:38:47 +02:00