Commit graph

3764 commits

Author SHA1 Message Date
CatalinScr
83be769bb3 Merge branch 'master' into staging
updated with new version
2017-08-31 11:36:39 +03:00
CatalinScr
1bf77cb77e changed the icons 2017-08-31 11:27:02 +03:00
CatalinScr
ee325c1813 Repaired the errors from lint 2017-08-31 10:20:10 +03:00
CatalinScr
f95f3f4f24 Updated the contact page 2017-08-31 10:04:40 +03:00
Caleb James DeLisle
a60709ff73 Infinite spinner popup leads to frame attempting to reload and failing 2017-08-30 19:23:01 +02:00
yflory
b8971cdc23 Add previewMode settings to code2 2017-08-30 18:47:50 +02:00
yflory
0d008aaa2e Add indent settings to code2 2017-08-30 17:57:10 +02:00
yflory
f54dc7505c Migrate indentation settings to a settings subobject 2017-08-30 17:19:50 +02:00
yflory
0893bcc0e5 Merge branch 'staging' into code2 2017-08-30 14:57:19 +02:00
yflory
f06683e949 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-30 12:26:23 +02:00
yflory
0ce32464fd Fix flickering avatar in firefox 2017-08-30 12:26:11 +02:00
ansuz
9a23b77b46 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-30 11:31:59 +02:00
ansuz
ba0e935add stub localStorage, and handle errors that might come from touching localStorage 2017-08-30 11:31:49 +02:00
ansuz
be8ea4102e keep trying to parse the hash until it works 2017-08-30 11:26:51 +02:00
yflory
4db4f66786 Remove an unnecessary fix for Safari 2017-08-30 11:14:58 +02:00
yflory
d3e947f17e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-30 11:11:48 +02:00
yflory
7498057c89 Fix Safari iframe size 2017-08-30 11:11:43 +02:00
yflory
a2ed266048 Move the code app in a secure iframe 2017-08-30 11:10:57 +02:00
Caleb James DeLisle
1044531806 Fix Safari iframe size issue 2017-08-30 11:04:52 +02:00
ansuz
a34d1793e0 drop 'loading' text from loading screen 2017-08-29 18:15:40 +02:00
ansuz
2ef4ebc6ef two new tips for the loading screen 2017-08-29 17:56:34 +02:00
ansuz
595fa4c2e4 Merge branch 'soon' 2017-08-29 12:00:16 +02:00
ansuz
ca8f05a16f bump package version 2017-08-29 11:53:50 +02:00
ansuz
181a19a9a0 polyfill for array.fill 2017-08-29 11:49:10 +02:00
yflory
26dea043fb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-29 11:20:25 +02:00
yflory
51fa6287c1 Enable notifications in secure pads 2017-08-29 11:20:02 +02:00
ansuz
570ff75a6c update footer for latest version 2017-08-29 11:12:08 +02:00
yflory
642dc17910 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-29 11:03:05 +02:00
yflory
901917983b Fix an issue preventing pads to be stored in the drive 2017-08-29 11:02:56 +02:00
ansuz
40f062abda restore app usage report in new pad 2017-08-29 10:50:02 +02:00
ansuz
8fb7fef3f5 regular expressions are never falsey 2017-08-29 10:37:19 +02:00
ansuz
24eac9b4a6 test for flakey tests 2017-08-28 18:42:04 +02:00
ansuz
7d2a76f4d6 delete dead code. fix off-by-one for messages. turn off history button when history is exhausted 2017-08-28 18:32:43 +02:00
ansuz
288c03bb41 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-28 17:52:01 +02:00
Caleb James DeLisle
fe03e6ae83 bad code, lint 2017-08-28 17:53:23 +02:00
ansuz
430a6f7b77 lint compliance 2017-08-28 17:51:50 +02:00
Caleb James DeLisle
190dff1c9b Use the bounce app for opening a link with the right click 2017-08-28 17:50:55 +02:00
yflory
dec870d2bd Fix selection in the drive search results 2017-08-28 17:43:26 +02:00
yflory
4bceef8952 Fix the upload status table missing in the drive 2017-08-28 17:35:24 +02:00
yflory
0b4e044540 Fix the plugin to open a link in a new tab in pad 2017-08-28 17:26:51 +02:00
yflory
d9a4a32bf9 Fix avatar for anonymous users in secure pads 2017-08-28 16:57:10 +02:00
yflory
00fda0d7d7 Fix avatar in read-only mode (secure pads) 2017-08-28 16:49:28 +02:00
yflory
88cb4fd83c Enable friend requests from secure pads 2017-08-28 16:21:05 +02:00
yflory
147d88d845 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-28 15:13:30 +02:00
yflory
e43c68aa48 Fix viewers number in secure iframe 2017-08-28 15:13:16 +02:00
yflory
f89015d9ed Update the tab title to match the pad title in pad2 2017-08-28 14:49:33 +02:00
ansuz
1280cd1659 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-28 14:49:01 +02:00
yflory
51c065d13c Fix link to main in the new toolbar 2017-08-28 14:18:33 +02:00
yflory
d9bf2abcd8 Fix old hashes not working anymore in pad 2017-08-28 13:53:24 +02:00
ansuz
536fe04790 emit notification when alert, confirm, or prompt are called 2017-08-28 13:46:28 +02:00