Commit Graph
100 Commits
Author SHA1 Message Date
ansuz b319fefa86 migrate .de translation to json 2019-02-12 12:05:22 +01:00
ansuz f1d1818200 resolve merge conflicts 2019-02-12 11:58:13 +01:00
ansuz 905e6b0fa1 add new translation keys to English text 2019-02-11 17:16:21 +01:00
ansuz 184bb2aa80 Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon 2019-02-11 17:02:42 +01:00
ansuz eb0fb5d3d5 add release notes for Raccoon (v2.17.0) 2019-02-11 17:02:25 +01:00
ansuz 18b5e1a405 Merge remote-tracking branch 'origin/weblate' into soon 2019-02-11 13:55:08 +01:00
ansuz 7b331af00e bump version to 2.17.0 2019-02-11 11:19:00 +01:00
ansuz 5175ed10c5 update example nginx config for spreadsheets 2019-01-29 11:56:55 +01:00
ansuz 38803195a3 Merge branch 'soon' into staging 2019-01-28 17:58:13 +01:00
ansuz c811a1a5a1 Merge branch 'master' into soon 2019-01-28 17:56:53 +01:00
ansuz 0ca94055b4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-01-28 17:13:57 +01:00
ansuz c3a1bca39a bump version to 2.16.0 2019-01-28 17:06:41 +01:00
ansuz 181493b22d add 2.16.0 changelog 2019-01-28 17:05:21 +01:00
ansuz 1281c9b2be remove some dead serverside code 2019-01-28 15:28:38 +01:00
ansuz 4f1ed242a3 Merge branch 'soon' into staging 2019-01-28 15:01:19 +01:00
ansuz 1600f800e8 add a todo for flat file db atime 2019-01-28 14:21:17 +01:00
ansuz 9d0e0a4efa log font path to make sure it's working 2019-01-24 18:42:29 +01:00
ansuz 802075f83c log errors when trying to serve fonts 2019-01-24 18:41:14 +01:00
ansuz f775d395f4 serve cached onlyoffice-compatible fonts 2019-01-24 18:40:12 +01:00
ansuz 803e9c4560 add cache of magically modified onlyoffice-compatible fonts 2019-01-24 18:29:46 +01:00
ansuz 21d035393d disable english translations 2019-01-24 14:48:18 +01:00
ansuz 5410728bff lint compliance 2019-01-24 14:47:39 +01:00
ansuz 93c5dc9202 Merge branch 'soon' into staging 2019-01-18 15:45:02 +01:00
ansuz 69b50dd102 Merge branch 'master' into soon 2019-01-18 15:44:52 +01:00
ansuz 5a61453492 Merge branch 'soon' into staging 2019-01-14 16:42:37 +01:00
ansuz 6cf8720458 update how the async store chooses to prune history to avoid the diverged checkpoint bug 2019-01-14 16:40:54 +01:00
ansuz 3de8cf186c Merge branch 'soon' into staging 2019-01-14 15:33:44 +01:00
ansuz 724e4e39f5 Merge branch 'master' into soon 2019-01-14 15:33:29 +01:00
ansuz 9105a89eab intantiate ephemeral channels with 34 hex characters 2019-01-14 15:32:49 +01:00
ansuz 6963f00a57 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-01-14 15:32:09 +01:00
ansuz 6f89156415 guard against calling an undefined function 2019-01-11 17:01:43 +01:00
ansuz 8bab799ac9 guard against calling an undefined function 2019-01-11 17:01:22 +01:00
ansuz 77c0cf7359 guard against calling an undefined function 2019-01-11 16:58:39 +01:00
ansuz 20959f84ae return Boolean from our test for WebRTC support 2019-01-10 18:21:39 +01:00
ansuz 275a3c80fc roll back to less 3.7.1 because newer versions break IE
see https://github.com/less/less.js/issues/3321
2019-01-10 18:20:32 +01:00
ansuz 060e5a12a2 lint compliance 2019-01-09 16:16:44 +01:00
ansuz 0f644b04b2 send feedback related to full drive export 2019-01-09 16:16:32 +01:00
ansuz 5e6f4c738b update changelog for Pademelon release 2019-01-09 15:19:22 +01:00
ansuz 34608a0484 update footer and version 2019-01-08 15:29:50 +01:00
ansuz 0783944e1c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-01-08 15:17:51 +01:00
ansuz 424a14625d add feedback keys for password change and drive migration 2019-01-08 15:17:43 +01:00
ansuz ab832f38b7 send feedback for the subscription button in the settings sidebar 2019-01-08 14:44:40 +01:00
ansuz bcd6a4b6c6 add feedback keys 2019-01-08 14:33:02 +01:00
ansuz 611fb4895c Merge branch 'soon' into staging 2019-01-07 17:07:21 +01:00
ansuz db95b1f243 Merge branch 'soon' into staging 2018-12-13 16:14:10 +01:00
ansuz 1cdae1d3dd update changelog for Opossum release 2018-12-13 14:23:51 +01:00
ansuz 8960c8fcbd bump to latest version and codename 2018-12-11 11:11:17 +01:00
ansuz 8affe4053c Merge branch 'staging' of github.com:joldie/cryptpad into print-code 2018-12-11 10:41:17 +01:00
ansuz 60e7011adc update changelog 2018-11-27 17:35:36 +01:00
ansuz 44419fc929 bump version 2018-11-27 17:04:58 +01:00
ansuz 56feaff72d Merge branch 'master' of github.com:xwiki-labs/cryptpad 2018-11-21 12:07:16 +01:00
ansuz c71b1c013b add changelog 2018-11-21 12:07:01 +01:00
ansuz 1b83431382 Merge branch 'master' of https://git.xwikisas.com/xwiki-labs/cryptpad 2018-11-20 13:11:49 +01:00
ansuz d407f9af74 downgrade an XXX to a FIXME 2018-11-20 11:27:59 +01:00
ansuz 04d96d5d0e remove outdated comments 2018-11-20 11:23:31 +01:00
ansuz 8bbd4e2086 bump version and release codename 2018-11-20 11:14:26 +01:00
ansuz fcce48f2dd Merge branch 'soon' into staging 2018-11-20 11:12:41 +01:00
ansuz 93920e0cee release notes for 2.10.0 2018-10-23 18:47:18 +02:00
ansuz 26540b4b94 correctly support httpSafeOrigin loaded from configuration file 2018-10-17 13:48:31 +02:00
ansuz 5a5c41fec7 update changelog for v2.9.0 2018-10-02 16:01:24 -04:00
ansuz 5d8e93c5c7 simplify subscriptions and turn on by default 2018-10-02 15:42:04 -04:00
ansuz 1d63419df8 update error handling, but leave the note to come back 2018-10-02 11:31:08 -04:00
ansuz 67d1347bd8 bump version to 2.9.0 in footer and package.json 2018-10-02 11:07:42 -04:00
ansuz e77f833652 come back to this error 2018-09-25 20:09:45 -04:00
ansuz b181d72727 Merge branch 'staging' into oo2 2018-09-25 11:19:52 -04:00
ansuz ad4e36015b Merge branch 'soon' into staging 2018-09-20 11:44:56 -04:00
ansuz d49f787bcd update changelog for 2.8.0 (Ibis) 2018-09-20 11:41:13 -04:00
ansuz 91cff453f1 enable shared folders by default 2018-09-20 11:40:42 -04:00
ansuz b27285885e oops, try again 2018-09-20 10:06:21 -04:00
ansuz 13d511d037 fix broken link 2018-09-20 10:04:08 -04:00
ansuz 82b805fea6 Merge branch 'soon' 2018-09-18 22:17:08 -04:00
ansuz 43e194be7e bump footer and package.json version 2018-09-18 22:16:41 -04:00
ansuz 7deb346552 update to new marked lib without breaking custom renderers 2018-09-17 15:35:53 -04:00
ansuz e3907f15d1 recover keys when logging in if necessary 2018-09-17 14:31:33 -04:00
ansuz a5cffe7eb2 abort sequenced actions whenever you callback 2018-09-17 14:29:49 -04:00
ansuz e83b225295 update changelogs 2018-09-04 10:28:01 -04:00
ansuz 8dec54d550 WIP Changelog 2018-09-04 09:38:26 -04:00
ansuz 0e70961074 password-protected shared folders aren't urgent. dropping the XXX 2018-09-04 09:14:13 -04:00
ansuz a203a67a53 update another translation 2018-09-04 09:06:32 -04:00
ansuz 2b2995d2c0 update a few english translations 2018-09-04 09:00:32 -04:00
ansuz 2bd02ca69e bump version to 2.7.0 2018-09-04 08:59:38 -04:00
ansuz 9fe78dcc5f bump version from 2.5.0 to 2.6.0 2018-08-22 15:32:47 +02:00
ansuz af40e140f9 safety net for call of undefined function in mergeDrive 2018-08-16 16:59:52 +02:00
ansuz 2259d1b6ac Merge branch 'soon' into staging 2018-08-16 13:33:09 +02:00
ansuz fb9cf2c81e lint compliance 2018-08-14 17:11:08 +02:00
ansuz 912a9d569c Merge branch 'revised-german' into soon 2018-08-07 12:03:21 +02:00
ansuz 88c43cfc5c address a linter error 2018-08-07 11:45:22 +02:00
ansuz dc122e424c Merge branch 'master' into soon 2018-08-07 11:41:37 +02:00
ansuz f5172fd05f Merge branch 'soon' into staging 2018-08-07 11:40:50 +02:00
ansuz 24c7ce57e1 apply the fix for password change recommended by @sairim 2018-08-07 11:40:21 +02:00
ansuz 97142b2b32 add footer to homepage 2018-07-19 17:39:21 +02:00
ansuz 6922bc1e08 lint compliance 2018-07-19 11:14:52 +02:00
ansuz fcc54a3c34 Merge branch 'docker-fix-rename' into staging 2018-07-19 10:33:23 +02:00
ansuz a090dc52db flow compliance 2018-07-19 10:33:01 +02:00
ansuz 0769452f04 Merge branch 'soon' 2018-07-18 16:01:52 +02:00
ansuz 7004f26730 update documentation 2018-07-18 16:01:27 +02:00
ansuz a181c09a68 Merge branch 'soon' into staging 2018-07-18 15:56:44 +02:00
ansuz 58332a9ce3 add french translation for password change loading screen 2018-07-18 15:56:13 +02:00
ansuz c1eb6d6a01 Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon 2018-07-18 15:53:26 +02:00
ansuz e2600e4b36 display a loading screen while users are changing their passwords 2018-07-18 15:53:12 +02:00