Commit Graph

5042 Commits (a440359bc73f810a8d1831427730bd96bb70bbb1)

Author SHA1 Message Date
Caleb James DeLisle a440359bc7 Commit patches provided to me by someone who Seemed Trustworthy At The Time
(should fix false negatives in shared-worker detection)
2018-07-12 16:59:36 +02:00
Caleb James DeLisle cb8888ea1a Yes, so it turns out that making a small asthetic change after testing on every browser does actually break it :| 2018-07-12 16:51:48 +02:00
Caleb James DeLisle fabdbc3b61 Add a feedback test for checking for CSS variables, so we won't use a feature which is not implemented by the vast majority of the people using CryptPad... 2018-07-12 16:02:46 +02:00
yflory 071c34d4fa Fix undefined secret with password-protected files (#250) 2018-07-02 10:51:43 +02:00
yflory 34914785eb lint compliance 2018-06-28 16:15:38 +02:00
yflory a537f7de8b Fix infinite loading screen caused by some browser settings 2018-06-28 16:13:52 +02:00
ansuz 76c9b01d45 update changelog one more time 2018-06-27 15:13:47 +02:00
ansuz fc6322b105 ignore /block/ 2018-06-27 15:03:48 +02:00
ansuz 2c56972be6 update changelog and example nginx config 2018-06-27 15:03:38 +02:00
ansuz 232ef4c243 Merge branch 'master' of /home/ansuz/Desktop/cryptpad 2018-06-27 13:51:32 +02:00
ansuz 04d080d5a8 2.4.0 changelog 2018-06-27 13:48:36 +02:00
ansuz 6d94f6ce21 roll back to pre-socket.io code 2018-06-26 15:31:57 +02:00
ansuz 02169bfa83 Revert "Use socket.io instead of WebSocket"
In hindsight this may have been a terrible idea.

RIP uptime.

This reverts commit 9195c57445.
2018-06-26 15:30:40 +02:00
yflory 6dc7e7eff4 Disable WebWorkers by default 2018-06-26 14:15:25 +02:00
yflory bfb850554d Fix the contacts app with workers 2018-06-25 18:08:47 +02:00
yflory 87dc528a99 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-06-25 16:59:52 +02:00
yflory 6d8693ff8c Fix history mode UI 2018-06-25 16:59:40 +02:00
ansuz 7dc393a2d2 remove debug log 2018-06-25 15:33:54 +02:00
ansuz d76f3dceab remove comment 2018-06-25 14:30:41 +02:00
ansuz fb5553f918 fix typo 2018-06-25 14:25:37 +02:00
ansuz 9820ac278f address npm warnings 2018-06-25 13:45:25 +02:00
yflory 76bc82ac13 lint compliance 2018-06-25 13:42:17 +02:00
yflory 0160ef30b7 Fix pad password change 2018-06-25 12:08:06 +02:00
yflory 9b6895b47a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-06-25 11:13:08 +02:00
yflory 355dc5c993 Hide account password change form in settings 2018-06-25 11:13:02 +02:00
ansuz 4e9baff0b6 bump version 2018-06-25 11:00:59 +02:00
yflory fbe940c024 Fallback to async store in self.crypto doesn't exist in webworkers (ie/edge) 2018-06-22 19:43:07 +02:00
yflory 52cc007431 Merge branch 'master' into staging 2018-06-21 16:56:44 +02:00
yflory ddcbd000dc Bump chainpad-server version 2018-06-21 16:55:54 +02:00
ansuz 567a4d2d98 use more restrictive semver for chainpad-server 2018-06-21 16:54:57 +02:00
yflory ad0663c168 :q 2018-06-21 16:48:09 +02:00
yflory 29aca1da02 Bump listmap version 2018-06-21 14:36:38 +02:00
yflory 30beec0102 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-06-21 14:08:18 +02:00
yflory d9c186a3da Merge branch 'staging' into socketio 2018-06-21 14:01:56 +02:00
ansuz fc35d06c83 Merge branch 'soon' into staging 2018-06-21 10:42:25 +02:00
ansuz 184708f859 fix login from register page 2018-06-21 10:40:09 +02:00
yflory a5b207d57b Password change UI 2018-06-20 10:02:56 +02:00
yflory 7948fe2b70 Merge branch 'soon' into staging 2018-06-19 17:02:26 +02:00
yflory 29f577dfc6 Improve history to load it chunk by chunk 2018-06-19 17:02:16 +02:00
yflory c802b761c7 Fix pads not stored in the correct folder the first time 2018-06-19 11:04:39 +02:00
yflory 60db53a993 Use framework in the whiteboard app 2018-06-18 12:14:16 +02:00
yflory d37aa0646e Change account password (clientside RPC) 2018-06-14 18:18:53 +02:00
yflory b89b033175 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-06-14 17:18:56 +02:00
yflory 54d63df1cf Ability to change the password of a pad 2018-06-14 17:18:32 +02:00
ansuz 2463dd0c9e Merge branch 'soon' into staging 2018-06-13 13:52:58 +02:00
ansuz 9f9664eba1
Merge pull request #247 from CatalinScr/master
Repaired some responsive issues on about page, contact and features
2018-06-13 13:52:17 +02:00
Catalin e9e461c4d6 Repaired some responsive issues on about page, contact and features 2018-06-13 11:12:56 +03:00
yflory d1e8baca68 Lint compliance 2018-06-12 18:26:21 +02:00
yflory 4896fe81fe Merge branch 'serviceworker' into staging 2018-06-12 18:24:19 +02:00
yflory 1b49020753 Add support for async store when WebWorker is not available 2018-06-12 18:20:48 +02:00