yflory
d3af840f81
Merge branch 'cpnetflux' into mailbox
2019-05-16 15:58:35 +02:00
yflory
909e70905c
Add comment
2019-05-16 15:20:50 +02:00
yflory
827a47d9b7
Fix issue when reconnecting to a pad
2019-05-16 14:11:31 +02:00
yflory
ce2d0d5b83
Mailbox and notifications prototype
2019-05-15 18:22:39 +02:00
yflory
3feb310fc4
Add mailbox inner channel
2019-05-15 14:52:58 +02:00
yflory
11b57cddb1
Merge branch 'cpnetflux' into staging
2019-05-15 14:52:28 +02:00
yflory
c61617411a
Add mailbox module
2019-05-15 14:49:35 +02:00
Weblate
c7b1655907
Translated using Weblate (Spanish)
...
Currently translated at 45.2% (433 of 957 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/es/
2019-05-14 09:15:06 +00:00
Weblate
bc413d7514
Translated using Weblate (Russian)
...
Currently translated at 36.7% (351 of 956 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ru/
2019-05-14 09:15:06 +00:00
Weblate
3b420bc71b
Translated using Weblate (Romanian)
...
Currently translated at 57.6% (551 of 956 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ro/
2019-05-14 09:15:06 +00:00
Weblate
0722f302a5
Translated using Weblate (Italian)
...
Currently translated at 43.5% (416 of 956 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/it/
2019-05-14 09:15:06 +00:00
Weblate
e0592bddd4
Translated using Weblate (French)
...
Currently translated at 100.0% (957 of 957 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2019-05-14 09:15:06 +00:00
Weblate
ce8cbaf136
Translated using Weblate (English)
...
Currently translated at 100.0% (957 of 957 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2019-05-14 09:15:05 +00:00
yflory
a148434244
Fix share dialog pre-selecting the edit link in a read-only pad #365
2019-05-13 15:26:20 +02:00
yflory
6395cee9fb
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2019-05-03 15:08:32 +02:00
Weblate
f04f9955de
Translated using Weblate (German)
...
Currently translated at 100.0% (956 of 956 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2019-05-03 13:08:18 +00:00
Weblate
f5f2b16d10
Translated using Weblate (French)
...
Currently translated at 100.0% (956 of 956 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2019-05-03 13:08:18 +00:00
Weblate
275d0390c9
Translated using Weblate (English)
...
Currently translated at 100.0% (956 of 956 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (955 of 955 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (954 of 954 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2019-05-03 13:08:18 +00:00
yflory
5a19f7cc5d
Recent pads improvements
2019-05-03 15:07:04 +02:00
Weblate
c9e53d9ab9
Translated using Weblate (Russian)
...
Currently translated at 35.3% (334 of 947 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ru/
2019-05-02 08:59:34 +00:00
Weblate
d71633697e
Translated using Weblate (Norwegian Bokmål)
...
Currently translated at 32.6% (309 of 947 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/nb_NO/
2019-05-02 08:59:34 +00:00
Weblate
55b6d65abe
Translated using Weblate (Italian)
...
Currently translated at 36.6% (347 of 947 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/it/
Translated using Weblate (Italian)
Currently translated at 28.6% (271 of 947 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/it/
2019-05-02 08:59:34 +00:00
Weblate
de106d22bc
Translated using Weblate (French)
...
Currently translated at 100.0% (953 of 953 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2019-05-02 08:59:34 +00:00
Weblate
8e73a6217e
Translated using Weblate (English)
...
Currently translated at 100.0% (953 of 953 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (952 of 952 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (951 of 951 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (950 of 950 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (949 of 949 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (948 of 948 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2019-05-02 08:59:33 +00:00
yflory
18d6e22043
Reload the page with Esc on timeout error
2019-05-02 10:49:42 +02:00
yflory
b0fdddc9ee
Add support for italian translation
2019-04-26 15:22:29 +02:00
yflory
c4ac858f5d
Remove chainpad-netflux-outer
2019-04-26 15:17:20 +02:00
Weblate
0585b6aa41
Translated using Weblate (Russian)
...
Currently translated at 33.2% (314 of 947 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ru/
2019-04-23 12:50:05 +00:00
Weblate
cc9e6412a1
Translated using Weblate (Romanian)
...
Currently translated at 54.0% (511 of 947 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ro/
2019-04-23 12:50:05 +00:00
Weblate
07d9c17ab0
Translated using Weblate (Norwegian Bokmål)
...
Currently translated at 32.0% (303 of 947 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/nb_NO/
Translated using Weblate (Norwegian Bokmål)
Currently translated at 23.5% (223 of 947 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/nb_NO/
2019-04-23 12:50:04 +00:00
yflory
c3d8d27b33
Hide image and formula buttons in the sheet app
2019-04-23 13:58:25 +02:00
yflory
ad3ee14d2b
Fix Clean CryptDrive button in settings
2019-04-23 13:35:05 +02:00
yflory
126a379ed2
Fix mermaid css
2019-04-23 13:23:44 +02:00
yflory
d3afee0e34
Add a spellcheck option for codemirror
2019-04-23 13:23:33 +02:00
yflory
3676a6b923
Fix highlighting in code blocks for markdown rendering
2019-04-18 18:41:16 +02:00
yflory
f4bf032513
Fix one case of duplicated content #352
2019-04-18 15:15:07 +02:00
yflory
c75e4035b6
Make the list of available languages for CryptPad configurable
2019-04-17 14:54:01 +02:00
yflory
fc3cb27fb8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2019-04-17 11:15:07 +02:00
yflory
da6916a8cb
Add new language: Norwegian Bokmål
2019-04-17 11:14:18 +02:00
Weblate
45d6f56abc
Translated using Weblate (Russian)
...
Currently translated at 33.1% (313 of 947 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ru/
Translated using Weblate (Russian)
Currently translated at 31.3% (296 of 947 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ru/
2019-04-16 15:24:42 +00:00
yflory
a12f6b322f
Fix the title input being reset with userlist changes
2019-04-16 17:24:09 +02:00
yflory
9765dca9ff
Another fix about phantom viewers
2019-04-16 17:14:05 +02:00
yflory
3d5c9c78ee
lint compliance
2019-04-16 15:36:16 +02:00
yflory
9b9cedd191
Fix userlist and chat after reconnection in a shared worker
2019-04-16 12:09:39 +02:00
yflory
52dbc296ee
Detect phantom tabs using PING in the worker
2019-04-15 14:21:04 +02:00
yflory
ab832643f7
Fix chat icon always blinking on first visit
2019-04-15 14:16:42 +02:00
yflory
d103ae1b16
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2019-04-12 17:42:33 +02:00
yflory
86346c567c
Clean the Mermaid code and speed up load time
2019-04-12 17:39:29 +02:00
ansuz
24c4029922
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2019-04-12 17:24:36 +02:00
ansuz
36637c4a7f
leave a quick note about an error
2019-04-12 16:54:59 +02:00
yflory
92d87787c9
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2019-04-09 16:29:59 +02:00
yflory
1f3ef77349
Service workers tests
2019-04-09 16:29:42 +02:00
Weblate
9c4ae61550
Translated using Weblate (German)
...
Currently translated at 100.0% (947 of 947 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2019-04-09 12:42:54 +00:00
Weblate
05f464ce4d
Translated using Weblate (French)
...
Currently translated at 99.9% (946 of 947 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2019-04-08 13:50:12 +00:00
Weblate
2c8e5500d8
Translated using Weblate (English)
...
Currently translated at 100.0% (947 of 947 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2019-04-08 13:50:12 +00:00
Weblate
8ec60a22cc
Update translation files
...
Updated by "Cleanup translation files" hook in Weblate.
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
2019-04-08 13:36:26 +00:00
Weblate
7932e4f578
Update translation files
...
Updated by "Cleanup translation files" hook in Weblate.
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
2019-04-08 13:36:25 +00:00
Weblate
b2ae889d05
Update translation files
...
Updated by "Cleanup translation files" hook in Weblate.
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
2019-04-08 13:36:25 +00:00
yflory
912cf23fe4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2019-04-08 15:35:50 +02:00
yflory
6899c8c4f1
Remove old translations
2019-04-08 15:35:43 +02:00
Weblate
623945010c
Translated using Weblate (English)
...
Currently translated at 100.0% (952 of 952 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (951 of 951 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (950 of 950 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (949 of 949 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (948 of 948 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (947 of 947 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (946 of 946 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2019-04-08 13:33:57 +00:00
Weblate
6648778568
Translated using Weblate (English)
...
Currently translated at 100.0% (945 of 945 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (944 of 944 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (943 of 943 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (942 of 942 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (941 of 941 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (940 of 940 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (939 of 939 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (938 of 938 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (937 of 937 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (936 of 936 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (935 of 935 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (934 of 934 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (933 of 933 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (932 of 932 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (931 of 931 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (930 of 930 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (930 of 930 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (929 of 929 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (928 of 928 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (927 of 927 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (926 of 926 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (925 of 925 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (924 of 924 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (923 of 923 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2019-04-08 13:18:30 +00:00
Weblate
e963a19d4b
Translated using Weblate (Russian)
...
Currently translated at 30.2% (278 of 922 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ru/
2019-04-08 12:13:13 +00:00
Weblate
ceff76d389
Translated using Weblate (Romanian)
...
Currently translated at 49.8% (459 of 922 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ro/
Translated using Weblate (Romanian)
Currently translated at 47.6% (439 of 922 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ro/
2019-04-08 12:13:13 +00:00
Weblate
0ff4121b96
Translated using Weblate (German)
...
Currently translated at 100.0% (922 of 922 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2019-04-08 12:13:12 +00:00
yflory
54a71d8049
lint compliance
2019-04-04 11:44:06 +02:00
yflory
c3d3d67605
Fix mermaid rendering when switching tabs
2019-04-04 11:42:59 +02:00
yflory
f95f9727bf
Print the error when trying to get the limit
2019-04-04 11:26:19 +02:00
yflory
e5d7a0f5c6
Mermaid support in the code app
2019-04-03 14:45:42 +02:00
yflory
41d37d4c91
Fix user list hidden with small height
2019-04-02 14:19:00 +02:00
Weblate
d0c7d4cfb8
Translated using Weblate (French)
...
Currently translated at 100.0% (922 of 922 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2019-04-01 14:33:09 +00:00
Weblate
e777ab362e
Update translation files
...
Updated by "Cleanup translation files" hook in Weblate.
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
2019-04-01 09:11:05 +00:00
Weblate
1a68f0dc6f
Translated using Weblate (Russian)
...
Currently translated at 14.9% (139 of 935 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ru/
2019-04-01 09:11:05 +00:00
Weblate
3b548a5567
Update translation files
...
Updated by "Cleanup translation files" hook in Weblate.
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
Translated using Weblate (Romanian)
Currently translated at 44.9% (420 of 935 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ro/
2019-04-01 09:11:05 +00:00
Weblate
5cc9044f2d
Update translation files
...
Updated by "Cleanup translation files" hook in Weblate.
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
2019-04-01 09:11:05 +00:00
Weblate
30177d2c89
Update translation files
...
Updated by "Cleanup translation files" hook in Weblate.
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
2019-04-01 09:11:05 +00:00
Weblate
26b4861be0
Update translation files
...
Updated by "Cleanup translation files" hook in Weblate.
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
Translated using Weblate (German)
Currently translated at 100.0% (935 of 935 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2019-04-01 09:11:05 +00:00
Weblate
090aa7d37e
Update translation files
...
Updated by "Cleanup translation files" hook in Weblate.
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
Translated using Weblate (French)
Currently translated at 100.0% (935 of 935 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2019-04-01 09:11:05 +00:00
Weblate
f039b989be
Update translation files
...
Updated by "Cleanup translation files" hook in Weblate.
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
2019-04-01 09:11:05 +00:00
yflory
3413235d63
Display all applications in a grid on the home page
2019-03-28 16:58:46 +01:00
yflory
723631c78c
Clean the UI on first use of a pad (hide chat and reduce help)
2019-03-28 11:41:59 +01:00
yflory
bb5f03bd0f
Add admin panel
2019-03-27 17:00:28 +01:00
yflory
5a629e8681
Store authors of a pad in the metadata
2019-03-25 16:00:17 +01:00
Weblate
4f98a84209
Translated using Weblate (Russian)
...
Currently translated at 11.2% (105 of 934 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ru/
2019-03-25 13:42:45 +00:00
Weblate
c33c062ace
Translated using Weblate (Romanian)
...
Currently translated at 43.7% (408 of 934 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ro/
2019-03-25 13:42:45 +00:00
Weblate
e799102dc9
Translated using Weblate (French)
...
Currently translated at 100.0% (935 of 935 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2019-03-25 13:42:45 +00:00
Weblate
d83c8f63ef
Translated using Weblate (English)
...
Currently translated at 100.0% (935 of 935 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2019-03-25 13:42:45 +00:00
Weblate
8665a1f59b
Translated using Weblate (Russian)
...
Currently translated at 10.6% (99 of 934 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ru/
2019-03-19 12:44:58 +00:00
Weblate
3847ff2f46
Translated using Weblate (Romanian)
...
Currently translated at 39.2% (366 of 934 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ro/
Translated using Weblate (Romanian)
Currently translated at 38.9% (363 of 934 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ro/
2019-03-19 12:44:58 +00:00
yflory
15bc9ddc1e
Add initial files for the Russian translation
2019-03-13 15:51:46 +01:00
Weblate
e59ce100fe
Translated using Weblate (German)
...
Currently translated at 100.0% (934 of 934 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2019-03-13 14:32:23 +00:00
Weblate
8df6703c67
Translated using Weblate (French)
...
Currently translated at 100.0% (934 of 934 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2019-03-13 14:32:23 +00:00
Weblate
088bb058c4
Translated using Weblate (English)
...
Currently translated at 100.0% (934 of 934 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2019-03-13 14:32:23 +00:00
Weblate
03dc40b8a4
Translated using Weblate (German)
...
Currently translated at 100.0% (934 of 934 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2019-03-13 13:07:27 +00:00
Weblate
0b540038c0
Translated using Weblate (Spanish)
...
Currently translated at 47.6% (445 of 934 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/es/
2019-03-07 13:22:41 +00:00
Weblate
9a2ba56030
Translated using Weblate (Spanish)
...
Currently translated at 47.5% (444 of 934 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/es/
2019-03-07 13:19:08 +00:00
Weblate
66a15da30d
Translated using Weblate (Spanish)
...
Currently translated at 47.4% (443 of 934 strings)
Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/es/
2019-03-07 13:16:09 +00:00
yflory
de062b036f
Fix HTML entities displayed in table of contents
2019-03-05 13:25:46 +01:00
Weblate
718df29b5b
Translated using Weblate (French)
...
Currently translated at 100.0% (934 of 934 strings)
Translation: CryptPad/App
Translate-URL: http://disrupt.cryptpad.fr/projects/cryptpad/app/fr/
2019-03-05 10:55:15 +00:00
yflory
42055c32b5
Fix undefined settings when creating a new account
2019-03-05 11:50:02 +01:00
yflory
34cc90bd08
Add feedback
2019-03-05 11:17:31 +01:00
yflory
52f2b428e0
lint compliance
2019-03-05 11:15:28 +01:00
yflory
9c69c9acd7
Convert tabs to spaces in codemirror with the correct settings #324
2019-02-28 18:08:48 +01:00
yflory
e98b4176b4
Fix error at registration
2019-02-28 17:09:53 +01:00
yflory
98bf773221
Better performances and UI for the debug tools
2019-02-26 15:48:29 +01:00
yflory
ec33084226
Add debugging tools
2019-02-25 18:43:32 +01:00
yflory
0d996b8ed4
Remove duplicates when migrating anon drive into user drive
2019-02-21 17:40:34 +01:00
yflory
6aa617e41e
Add TOC button to the markdown toolbar
2019-02-21 11:41:08 +01:00
yflory
49b8f66ff9
Merge branch 'soon' into staging
2019-02-21 11:26:35 +01:00
yflory
807d62bf51
Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon
2019-02-21 10:48:51 +01:00
yflory
86ce8b6ea7
Fix file app broken with V1 hashes
2019-02-21 10:48:30 +01:00
Weblate
4416fa5ca7
Translated using Weblate (French)
...
Currently translated at 100.0% (933 of 933 strings)
Translation: CryptPad/App
Translate-URL: http://disrupt.cryptpad.fr/projects/cryptpad/app/fr/
2019-02-19 13:34:53 +00:00
yflory
d0fc08b432
Generate dot graph from the debug app
2019-02-19 14:31:05 +01:00
yflory
03e94ae598
Improve toc
2019-02-19 11:06:25 +01:00
Weblate
7b084807bb
Update translation files
...
Updated by "Cleanup translation files" hook in Weblate.
Translation: CryptPad/App
Translate-URL: http://disrupt.cryptpad.fr/projects/cryptpad/app/
2019-02-18 16:29:04 +00:00
Weblate
a368741dc2
Update translation files
...
Updated by "Cleanup translation files" hook in Weblate.
Translation: CryptPad/App
Translate-URL: http://disrupt.cryptpad.fr/projects/cryptpad/app/
2019-02-18 16:29:04 +00:00
Weblate
df7ceeae23
Update translation files
...
Updated by "Cleanup translation files" hook in Weblate.
Translation: CryptPad/App
Translate-URL: http://disrupt.cryptpad.fr/projects/cryptpad/app/
2019-02-18 16:29:03 +00:00
Weblate
e112853d6d
Update translation files
...
Updated by "Cleanup translation files" hook in Weblate.
Translation: CryptPad/App
Translate-URL: http://disrupt.cryptpad.fr/projects/cryptpad/app/
2019-02-18 16:29:03 +00:00
Weblate
6721e1d59f
Update translation files
...
Updated by "Cleanup translation files" hook in Weblate.
Translation: CryptPad/App
Translate-URL: http://disrupt.cryptpad.fr/projects/cryptpad/app/
2019-02-18 16:29:03 +00:00
Weblate
c969a5e2de
Update translation files
...
Updated by "Cleanup translation files" hook in Weblate.
Translation: CryptPad/App
Translate-URL: http://disrupt.cryptpad.fr/projects/cryptpad/app/
2019-02-18 16:29:03 +00:00
Weblate
af3c810b7b
Translated using Weblate (French)
...
Currently translated at 100.0% (930 of 930 strings)
Translation: CryptPad/App
Translate-URL: http://disrupt.cryptpad.fr/projects/cryptpad/app/fr/
2019-02-18 16:29:03 +00:00
Weblate
95f9b176dc
Translated using Weblate (English)
...
Currently translated at 100.0% (930 of 930 strings)
Translation: CryptPad/App
Translate-URL: http://disrupt.cryptpad.fr/projects/cryptpad/app/en/
Translated using Weblate (English)
Currently translated at 100.0% (930 of 930 strings)
Translation: CryptPad/App
Translate-URL: http://disrupt.cryptpad.fr/projects/cryptpad/app/en/
2019-02-18 16:29:03 +00:00
Weblate
413e6ac0e1
Update translation files
...
Updated by "Cleanup translation files" hook in Weblate.
Translation: CryptPad/App
Translate-URL: http://disrupt.cryptpad.fr/projects/cryptpad/app/
2019-02-18 16:29:03 +00:00
yflory
03b40d87ed
Add support for table of contents in the code app ( #325 )
2019-02-18 17:25:27 +01:00
yflory
26e8cea545
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2019-02-18 15:09:52 +01:00
yflory
bfe985e406
Move the chat code outside of the contacts folder
2019-02-18 15:09:27 +01:00
CryptPad
5b1587914c
Translated using Weblate (Spanish)
...
Currently translated at 47.7% (443 of 929 strings)
Translation: CryptPad/App
Translate-URL: http://disrupt.cryptpad.fr/projects/cryptpad/app/es/
2019-02-13 15:48:18 +00:00
CryptPad
c1f6208762
Translated using Weblate (Spanish)
...
Currently translated at 47.6% (442 of 929 strings)
Translation: CryptPad/App
Translate-URL: http://disrupt.cryptpad.fr/projects/cryptpad/app/es/
2019-02-13 15:44:39 +00:00
Yann Flory
2415b54b83
Translated using Weblate (French)
...
Currently translated at 100.0% (929 of 929 strings)
Translation: CryptPad/App
Translate-URL: http://disrupt.cryptpad.fr/projects/cryptpad/app/fr/
2019-02-13 15:35:57 +00:00
Yann Flory
e889870b93
Translated using Weblate (English)
...
Currently translated at 100.0% (929 of 929 strings)
Translation: CryptPad/App
Translate-URL: http://disrupt.cryptpad.fr/projects/cryptpad/app/en/
2019-02-13 15:35:57 +00:00
Yann Flory
80ccdb29d2
Translated using Weblate (French)
...
Currently translated at 100.0% (929 of 929 strings)
Translation: CryptPad/App
Translate-URL: http://disrupt.cryptpad.fr/projects/cryptpad/app/fr/
2019-02-13 14:44:42 +00:00
Admin
b481ee0536
Translated using Weblate (French)
...
Currently translated at 100.0% (929 of 929 strings)
Translation: CryptPad/App
Translate-URL: http://disrupt.cryptpad.fr/projects/cryptpad/app/fr/
2019-02-13 14:44:42 +00:00
Admin
9dd3db0dc4
Translated using Weblate (French)
...
Currently translated at 100.0% (929 of 929 strings)
Translation: CryptPad/App
Translate-URL: http://disrupt.cryptpad.fr/projects/cryptpad/app/fr/
2019-02-13 14:16:55 +00:00
yflory
f112864027
Update indentation in JSON translation files
2019-02-13 15:14:56 +01:00
ansuz
07c942de9d
drop unnecessary keys from french translation
2019-02-12 13:38:18 +01:00
ansuz
a089ed8e9d
Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon
2019-02-12 12:07:35 +01:00
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
yflory
d0f70d413a
Update french translation
2019-02-12 11:19:59 +01:00
yflory
c0d33040b6
Fix an issue with empty hash in the href validator
2019-02-12 11:16:13 +01:00
ansuz
905e6b0fa1
add new translation keys to English text
2019-02-11 17:16:21 +01:00
ansuz
18b5e1a405
Merge remote-tracking branch 'origin/weblate' into soon
2019-02-11 13:55:08 +01:00
JanRei
2b33d9ecee
Update German translation plus some minor message fixes
2019-02-10 13:35:18 +01:00
yflory
6c1da07c60
Display an error when an invalid hash in used
2019-02-06 15:35:27 +01:00
yflory
46c3f1f3df
Add the properties box to the OO apps toolbar
2019-02-05 17:07:49 +01:00
yflory
084aa09a2c
lint compliance
2019-02-05 17:07:19 +01:00
yflory
6855c3e9fd
Fix incorrect total size displayed for spreadsheets ( #318 )
2019-02-05 16:32:49 +01:00
yflory
c9450de799
Fix 'lock is null' error in onlyoffice apps
2019-02-05 16:19:09 +01:00
yflory
f04ba4a3d8
Too many false positive with the timeout detection
2019-02-05 16:17:54 +01:00
yflory
412670c8a6
PCS with owners and password for spreadsheets
2019-02-05 15:58:49 +01:00
yflory
aa5484ff21
lint compliance
2019-02-04 16:22:05 +01:00
yflory
fe0961b24b
Enable import feature in spreadsheets
2019-02-04 16:08:28 +01:00
yflory
ea54dd7392
Fix spreadsheets issues when using multiple sheets
2019-02-04 15:45:01 +01:00
yflory
4abed38bb1
Add a dev mode to facilitate debugging
2019-01-31 15:27:01 +01:00
yflory
07cd0b21b6
Fix last known hash sent to onlyoffice (it is already known...)
2019-01-31 15:26:03 +01:00
yflory
0c4c9dd283
Merge branch 'master' into staging
2019-01-31 14:09:42 +01:00
yflory
3b8d6213e0
lint compliance
2019-01-31 10:29:12 +01:00
yflory
9367dc8b4d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2019-01-31 10:19:33 +01:00
Adrian Nöthlich
13970d5c73
Started to rework the German translation
2019-01-30 16:34:18 +01:00
yflory
cb89a5fdfe
Test timeout to kill phantom viewers
2019-01-30 15:50:37 +01:00
yflory
d989b6d6e4
Fix one case of phantom viewers
2019-01-30 15:49:07 +01:00
yflory
6018f57ec1
Change translation format to JSON
2019-01-30 14:38:21 +01:00
yflory
d97ada3e26
Test new translations
2019-01-29 17:50:02 +01:00
yflory
7e00d444c0
Update markdown rendering in code and slide
2019-01-29 14:39:06 +01:00
yflory
e5abaa34b2
Fix cursor channel not updated to ephemeral
2019-01-29 11:40:44 +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
yflory
50e814f4d0
Fix access to undefined object in sheet
2019-01-28 17:28:13 +01:00
yflory
0e61c46dcf
Move fonts to the onlyoffice build
2019-01-28 17:06:17 +01:00
yflory
4e6df3d1c0
lint compliance
2019-01-28 16:39:49 +01:00
Ludovic Dubost
32af7f5871
Support import/export to internal format for office pads
2019-01-28 15:58:19 +01:00
yflory
aec9e1be72
Text for the help menu in oo apps
2019-01-28 15:42:49 +01:00
yflory
739f1674d1
Hide upload table in onlyoffice
2019-01-28 15:42:35 +01:00
yflory
af55e07107
Remove console log in oo apps
2019-01-28 14:11:51 +01:00
yflory
9ca7d504d2
Display help box in oo apps
2019-01-28 11:31:57 +01:00
yflory
e78fc2abcb
Add the spreadsheet app to the home page
2019-01-25 17:30:27 +01:00
yflory
6e153dc858
Handle server connection loss
2019-01-25 17:14:52 +01:00
yflory
e93c9c3faa
Rename the spreadsheet app
2019-01-25 17:13:55 +01:00
yflory
3d1d79e379
Disable strict mode
2019-01-24 19:02:09 +01:00
yflory
56ff47af48
Enable chat in OO apps
2019-01-24 16:43:05 +01:00
yflory
ed4f8016a1
Merge branch 'staging' into locks
2019-01-24 16:27:15 +01:00
yflory
024eafaf32
Hide oodoc and ooslide in the apps list
2019-01-24 16:26:15 +01:00
yflory
4946a44e33
Pin the realtime channel in the OO apps
2019-01-24 16:20:56 +01:00
yflory
139b4608c0
lint compliance
2019-01-24 15:52:37 +01:00
yflory
88d23039b6
Remove old code and add comments
2019-01-24 15:46:04 +01:00
yflory
ec2f21ec64
Implement lock mechanisms for spreadsheets
2019-01-24 15:26:35 +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
Paul Libbrecht
73a75c11c9
Actualizing German translations. PL
2019-01-23 19:04:05 +01:00
yflory
01f93f6f7b
FIx unrecoverable errors when using IE11
2019-01-22 12:25:49 +01:00
yflory
2ac176eeec
Share the correct index in onlyoffice messages
2019-01-21 16:54:31 +01:00
yflory
7d0f34a684
Debugging tools
2019-01-21 16:54:15 +01:00
yflory
a66d8c1384
Use lastKnownHash to handle checkpoints in the realtime channel
2019-01-18 18:17:34 +01:00
yflory
ef452d1221
Fix language detection in codemirror when importing a markdown file
2019-01-15 18:20:33 +01:00
yflory
8dbeee1af9
Realtime spreadsheets
2019-01-15 17:54:44 +01:00
yflory
a41a31a574
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2019-01-15 14:34:17 +01:00
yflory
6fa7b147e9
Add C, C++, Objective-C and Java to the list of languages in the code app
2019-01-15 14:34:11 +01:00
yflory
c5f554fe7b
Test with onlyoffice 5.2.6
2019-01-15 14:28:49 +01:00
yflory
b79ba61984
Improve realtime channel for onlyoffice
2019-01-15 10:46:39 +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
9105a89eab
intantiate ephemeral channels with 34 hex characters
2019-01-14 15:32:49 +01:00
yflory
efdecd4059
First step for realtime in onlyoffice apps
2019-01-14 14:01:22 +01:00
ansuz
6f89156415
guard against calling an undefined function
2019-01-11 17:01:43 +01:00
yflory
41a1148c17
Use the same code for the different frontend channels
2019-01-11 15:30:26 +01:00
ansuz
20959f84ae
return Boolean from our test for WebRTC support
2019-01-10 18:21:39 +01:00
yflory
b4aae68c0c
Fix access rights in the file app
2019-01-09 12:15:08 +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
yflory
573a3557f1
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2019-01-08 15:03:16 +01:00
yflory
5b80fafe5e
Add feedback
2019-01-08 15:03:02 +01:00
ansuz
bcd6a4b6c6
add feedback keys
2019-01-08 14:33:02 +01:00
yflory
107c352922
Update translations
2019-01-08 14:02:54 +01:00
yflory
f760253137
Fix typo
2019-01-08 14:02:03 +01:00
yflory
d87a87410d
Preserve hidden owned pads from a deleted folder
2019-01-08 13:57:22 +01:00
yflory
a9e030a6a8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2019-01-08 10:54:00 +01:00
ansuz
611fb4895c
Merge branch 'soon' into staging
2019-01-07 17:07:21 +01:00
Paul Libbrecht
1cd79e12f2
Latest update of the German translation (cursors, shared folders, ...).
2019-01-07 12:25:19 +01:00
yflory
1e672c4a6b
Use onlyoffice spreadsheets without ooserver
2019-01-07 12:02:38 +01:00
yflory
047a4a3ab4
Copy files to a shared folder instead of moving them
2019-01-07 10:25:13 +01:00
rhoio
5294604b90
Style, grammar and typo fixes in german translation
2019-01-06 17:40:36 +01:00
yflory
0a7adb3e88
Hide duplicated owned pads
2019-01-04 15:10:13 +01:00
yflory
7658fb90a2
Translations for spellcheck
2019-01-03 18:47:27 +01:00
yflory
cef9733262
Enable spellcheck in pad
2018-12-21 18:16:29 +01:00
yflory
c6acd191b9
Own drive translations
2018-12-20 11:18:12 +01:00
yflory
f2f9b57505
Own drive migration
2018-12-19 18:59:20 +01:00
yflory
b2b23446e8
Add missing translations
2018-12-18 14:48:52 +01:00
yflory
bbc06f668f
Fix undefined hash for deleted shared folders
2018-12-17 15:49:48 +01:00
yflory
a11a883cff
Cursor improvements in pad, code and slide
2018-12-17 11:44:08 +01:00
yflory
760f58b74c
Merge branch 'staging' into oo2
2018-12-13 16:24:11 +01:00
yflory
ae7d97b3dd
Ability to disable apps using appconfig
2018-12-12 14:52:58 +01:00
yflory
f883fb7e04
Preserve chat and cursor channel when importing a template
2018-12-12 13:48:28 +01:00
yflory
1a0344547b
Improve cursor in pad
2018-12-11 15:59:40 +01:00
yflory
bfd94c7f2b
Merge branch 'cursor' into staging
2018-12-11 13:36:49 +01:00
yflory
95a0bc9fc1
Merge branch 'rochat' into staging
2018-12-11 13:36:41 +01:00
yflory
489a99c5c4
Don't delete the old chat for now
2018-12-11 13:35:00 +01:00
yflory
0197f583f2
Translations for the cursor position settings
2018-12-11 12:04:11 +01:00
yflory
13da052325
Update translation key
2018-12-11 11:09:34 +01:00
yflory
fb5ad34299
Fix typo...
2018-12-11 10:57:43 +01:00
yflory
a121df2600
Delete validateKey in the messenger memory when we leave the channel
2018-12-11 10:52:11 +01:00
ansuz
8affe4053c
Merge branch 'staging' of github.com:joldie/cryptpad into print-code
2018-12-11 10:41:17 +01:00
yflory
d88dee9a83
Restrict sending messages in a pad chat to editors only
2018-12-10 17:47:47 +01:00
yflory
32fc941141
Merge branch 'staging' into cursor
2018-12-10 13:46:27 +01:00
yflory
a2e28e6e25
Fix missing avatar in cursor tooltip
2018-12-10 13:46:21 +01:00
yflory
c6f63d4d54
Cursor position in pad
2018-12-10 11:57:39 +01:00
joldie
35c39fae5d
Added print button to code pad page.
2018-12-06 16:43:48 +01:00
yflory
600c984576
Only show the user colors in the userlist if the app supports it
2018-12-06 13:59:56 +01:00
yflory
081fc01694
Add a settings category about the cursor
2018-12-06 13:48:14 +01:00
yflory
c81b4d77e8
lint compliance
2018-12-06 11:55:40 +01:00
yflory
f157f852b1
Fix and improve cursor
2018-12-06 11:54:34 +01:00
yflory
1ba80a344b
See other users' cursor position
2018-12-04 17:18:42 +01:00
yflory
008b5a3e9f
Fix an ownership issue in friend channels
2018-11-27 16:57:55 +01:00
yflory
ca45ff31d1
Refactor messenger to use commands from UI to store
2018-11-27 16:55:56 +01:00
yflory
f5965716b6
Minor update because of flow...
2018-11-27 13:58:33 +01:00
yflory
2a46b8f855
Fix an issue with last known hash in the messenger
2018-11-27 13:42:11 +01:00
yflory
dbad925e5e
New cursor recovery system (beta)
2018-11-26 16:23:16 +01:00
yflory
13d6579861
Add typing test in the code app
2018-11-22 14:45:12 +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
fcce48f2dd
Merge branch 'soon' into staging
2018-11-20 11:12:41 +01:00
yflory
8522c3723d
Translations for the NGI logo
2018-11-19 17:08:20 +01:00
yflory
3a4cfbb7e8
Disable HTML in chat
2018-11-13 17:19:28 +01:00
yflory
22f1ac9e1e
Merge branch 'master' of github.com:xwiki-labs/cryptpad
2018-11-13 14:21:24 +01:00
yflory
fc915e3337
Use DiffMarked in messenger to avoid duplicate code
2018-11-13 14:14:23 +01:00
yflory
b166c70a5f
Fix conflict when a user was reverting the latest patch from someone else
2018-11-09 16:38:16 +01:00
yflory
8f849d8d4a
Merge branch 'staging' into cursor
2018-11-08 18:24:33 +01:00
yflory
4daa2266c0
Fix new network open for each shared folder
2018-11-08 18:24:06 +01:00
yflory
fe0d579d56
Cursor improvements in pad (Beta)
2018-11-08 12:06:46 +01:00
yflory
82c3c7f50b
Improve the Typing Test in pad
2018-11-08 10:46:07 +01:00
yflory
a5b04bd62a
Download a file from the drive using the context menu
2018-11-06 18:35:04 +01:00
Paul Libbrecht
3f2e6b0611
completion
2018-11-06 13:01:17 +01:00
yflory
4e26a8fbc5
Merge branch 'soon' into staging
2018-11-06 10:47:03 +01:00
Paul Libbrecht
12b2224dad
Bad syntax error left. Sorry. Now fixed.
...
paul
2018-11-05 19:10:56 +01:00
yflory
b74e086602
Shortcuts are now added from sframe-common
2018-11-05 17:46:51 +01:00
yflory
05e7d5eb9b
Add missing translation
2018-11-05 17:32:25 +01:00
yflory
997692efb4
Use the font-size codemirror setting in the slide app too
2018-11-05 17:30:07 +01:00
yflory
1c5847dd01
Prevent Ctrl+S from saving useless content. Add support for custom shortcuts in CkEditor
2018-11-05 16:53:25 +01:00
yflory
1d31aab990
Display more warning messages about the full drive export
2018-11-05 15:09:32 +01:00
yflory
7509ce1cc7
Use new application icons
2018-11-05 12:02:27 +01:00
Paul Libbrecht
31a6fac4e0
Update German translation with latest phrases. Paul
2018-11-02 21:03:20 +01:00
ansuz
ef08771ffa
Fix typo in German translation, closes #290
...
s/Unbenennen/Umbenennen
2018-10-29 12:11:16 +01:00
yflory
db25d914ab
Improve default UI for small or zoomed screens
2018-10-29 11:48:22 +01:00
yflory
8b554dec63
Set font size in code editor from the settings page ( #140 )
2018-10-29 11:46:57 +01:00
yflory
e4daa5adbe
Fix random character insertion
2018-10-25 17:26:46 +02:00
yflory
98db6057c8
Allow shared workers by default
2018-10-23 15:06:17 +02:00
yflory
3c99302c32
Update French translation
2018-10-23 14:21:42 +02:00
yflory
4e3c09f640
Merge branch 'master' into staging
2018-10-22 17:22:28 +02:00
yflory
6924541080
Merge branch 'move' into staging
2018-10-22 17:13:41 +02:00
yflory
85cb56df1d
Import changes from pull requests in master (translation files were moved)
2018-10-22 17:11:17 +02:00
yflory
fc86e5daf8
French translation
2018-10-22 15:13:55 +02:00
yflory
ef37bac2e7
Add UI for the CryptDrive export
2018-10-19 18:38:35 +02:00
yflory
3e9e92dcac
Implement full CryptDrive export
2018-10-18 18:50:38 +02:00
yflory
92ce311694
Basic CryptDrive export with pads
2018-10-17 14:32:33 +02:00
yflory
f4d5a7567f
Return an error when the pad has been deleted from the server
2018-10-16 17:49:24 +02:00
yflory
9f0398826d
Make customized translations more maintainable
2018-10-15 18:38:41 +02:00
yflory
caa72ba949
Remove dropdown menus scrollbar when space is available
2018-10-15 16:35:21 +02:00
yflory
3257914b17
Add support for PowerShell mode in codemirror
2018-10-08 11:16:38 +02:00
yflory
bf55657993
Password-protected shared folders
2018-10-05 18:06:11 +02:00
yflory
c127f0a5f6
Add a comment
2018-10-05 18:04:48 +02:00
yflory
7d3d3cf5ac
Distinguish between two anonymous users in the chat
2018-10-05 18:04:20 +02:00
ansuz
90c905827d
Merge pull request #281 from ryanpcmcquen/patch-2
...
Typo fix: additionnal => additional
2018-10-05 10:22:03 -04:00
yflory
2a313a90e0
Don't rejoin a dropped channel on reconnect and leave chat channel
2018-10-04 11:08:23 -04:00
yflory
498703384f
Don't rejoin a dropped channel on reconnect and leave chat channel
2018-10-04 15:29:34 +02:00
yflory
2a86db2001
New Features page
2018-10-03 17:25:04 +02:00
yflory
5cbe2f7c0f
Fix tag autocomplete and Tags category in the drive
2018-10-03 15:22:13 +02:00
yflory
5d3d591228
Keep trying until the first tab is loaded
2018-10-02 18:14:06 +02:00
yflory
c59d744d78
Fix loading a tab while another one is initializing the worker
2018-10-02 17:49:39 +02:00
ansuz
1d63419df8
update error handling, but leave the note to come back
2018-10-02 11:31:08 -04:00
yflory
c5c6dc8223
Enable browser notifications for messaging tools
2018-10-02 12:08:25 +02:00
yflory
1201f2dcc4
Fix small UI issue
2018-10-01 18:28:25 +02:00
yflory
9a6e6f6e15
Fix User menu and link to drive in anonymous shared folders
2018-10-01 18:24:08 +02:00
yflory
d78a00b5e1
Ese the correct document type in the text for the store corner popup
2018-10-01 17:35:19 +02:00
yflory
930677750c
Merge branch 'anonsf' into staging
2018-10-01 16:21:53 +02:00
yflory
0a83840c9c
View a shared folder with an unregistered user
2018-10-01 15:17:27 +02:00
Ryan P. C. McQuen
df442f9b1e
Typo fix: additionnal => additional
2018-09-28 20:16:41 -07:00
yflory
17bc1ee703
Load shared folder when not logged in
2018-09-28 15:06:24 +02:00
ansuz
e77f833652
come back to this error
2018-09-25 20:09:45 -04:00
ansuz
ad4e36015b
Merge branch 'soon' into staging
2018-09-20 11:44:56 -04:00
ansuz
91cff453f1
enable shared folders by default
2018-09-20 11:40:42 -04:00
yflory
0e9b30744b
Add support for less highlighting
2018-09-19 17:06:39 +02:00
yflory
6b4643a916
Add syntax highlighting in code blocks rendered from markdown
2018-09-19 16:51:53 +02:00
ansuz
7deb346552
update to new marked lib without breaking custom renderers
2018-09-17 15:35:53 -04:00
yflory
bd1b120ab1
Add feedback about crowdfunding
2018-09-17 16:02:52 +02:00
yflory
f662036817
Change the hash in the address bar when browsing a shared folder
2018-09-17 15:10:10 +02:00
yflory
7a93927068
Fix UI issues with the new pad modals
2018-09-17 14:39:52 +02:00
yflory
179df27e3c
Fix autostore not displaying the error message when over pin limit
2018-09-17 11:23:35 +02:00
yflory
c1ef8243a1
Ability to select multiple files to upload ( #275 )
2018-09-17 10:31:27 +02:00
yflory
6c27d2964c
Disable friends chat in pad messenger
2018-09-14 15:42:41 +02:00
yflory
1895d6cbd8
Disable crowdfunding message for premium users
2018-09-14 11:21:52 +02:00
yflory
6257b23f16
Crowdfunding config
2018-09-14 10:36:29 +02:00
yflory
716159d300
Add OpenCollective links
2018-09-13 18:47:46 +02:00
yflory
d2c1ed5eff
Implement reconnect function in the messenger
2018-09-13 15:44:48 +02:00
yflory
10823fc124
Add toolbar notification when the messenger is closed
2018-09-12 15:07:50 +02:00
yflory
5276dc0bf6
lint compliance
2018-09-12 14:53:55 +02:00
yflory
621fc9a897
Ability to disable messenger at a global level
2018-09-12 14:51:37 +02:00
yflory
c38eb6588e
Fix small issues with the messenger
2018-09-12 11:55:26 +02:00
yflory
6c6ce7b7a8
Fix messenger bugs
2018-09-11 17:42:00 +02:00
yflory
ac989a1e73
lint compliance
2018-09-11 16:48:44 +02:00
yflory
f3c36bfd57
Improve messenger initial history
2018-09-11 16:47:52 +02:00
yflory
40c7cdd7c8
Fix an issue with messenger while opening the same tab twice
2018-09-10 18:16:24 +02:00
yflory
216c94b1f0
Fix messenger notifications
2018-09-10 17:50:36 +02:00
yflory
382690e5c8
Don't open other pads' chat in the current pad's messenger
2018-09-10 17:43:19 +02:00
yflory
cdce69e677
Improve messenger UI in apps
2018-09-10 13:20:01 +02:00
yflory
d4dd58e7df
Add a pad room when the messenger is active in a pad
2018-09-07 19:35:06 +02:00
yflory
9e27f111cb
lint compliance
2018-09-06 18:45:53 +02:00
yflory
e6743887fc
Refactor contacts/messenger so that it is usable directly in the apps
2018-09-06 18:41:22 +02:00
yflory
525703e7d8
Fix autostore popup displayed for dropped files
2018-09-04 10:36:19 +02:00
yflory
855612e98b
Make oo work with hashes v2
2018-09-03 11:20:32 +02:00
yflory
bf9cf95292
Merge branch 'staging' into oo2
2018-09-03 10:49:12 +02:00
yflory
ee1027ceb9
Ability to import mediatags to the drive
2018-08-31 15:41:08 +02:00
yflory
2bb7e68792
Remember previous values in the file upload modal
2018-08-30 12:14:37 +02:00
yflory
475301477f
Progress bar for loading a pad (framework only)
2018-08-30 12:07:21 +02:00
yflory
264f7dc6a1
Move base64 migration prompt to corner and only when the pad is stored
2018-08-30 11:21:33 +02:00
yflory
7b06626581
Merge branch 'autostore' into staging
2018-08-30 10:26:19 +02:00
yflory
90c96bfb70
Prompt users to migrate base64 images to mediatags in the pad app
2018-08-29 18:20:34 +02:00
yflory
b1f2d287b4
Add warning for chrome 68 users on Mac
2018-08-28 17:44:15 +02:00
yflory
256b7b5bb4
Phantom viewers potential fix
2018-08-28 16:28:32 +02:00
yflory
0e1c525c30
Fix an issue with new shared folder added to drive from another session
2018-08-28 14:29:13 +02:00
yflory
d201e9a0cd
Disable some toolbar features not available if the pad is not stored
2018-08-28 12:12:47 +02:00
yflory
9ebb598467
Make automatic pad storage configurable
2018-08-28 11:42:48 +02:00
yflory
e8a5244362
Autostore base
2018-08-27 14:58:09 +02:00
yflory
a117e329dc
Add a Share entry in the drive's context menu
2018-08-23 12:34:44 +02:00
yflory
e0b7f3f965
When importing a shared folder to the drive, open this folder directly
2018-08-23 11:55:14 +02:00
yflory
61659c1252
Fix template icon not overriden by a thumbnail in the PCS
2018-08-22 16:32:44 +02:00
yflory
ce08d7b650
Merge branch 'master' into soon
2018-08-22 15:34:06 +02:00
yflory
b084b892bd
Fix cache issues with workers in firefox
2018-08-22 15:26:42 +02:00
ansuz
af40e140f9
safety net for call of undefined function in mergeDrive
2018-08-16 16:59:52 +02:00
yflory
a65e083fca
Change PCS template icons
2018-07-28 11:38:22 +02:00
yflory
9a6fa4cbe2
Create a copy when uploading an owned file in a shared folder
2018-07-28 08:58:16 +02:00
yflory
20a9eee719
Disable shared folders creation by default
2018-07-20 18:41:14 +02:00
yflory
f2baaf5b5b
Fix shared folders issues including disappearing folders
2018-07-20 18:28:56 +02:00
yflory
4325ed4dde
Fix small UI issues in drive
2018-07-20 12:29:18 +02:00
yflory
bad1d7311a
Fix drive tests
2018-07-20 12:04:42 +02:00
yflory
d816a2ed9f
Prevent timeout when restoring drive
2018-07-19 17:51:38 +02:00
yflory
2be78deb93
Fix Drive history
2018-07-19 17:07:14 +02:00
yflory
8c20c7823e
Empty trash callback was missing
2018-07-19 15:32:45 +02:00
Caleb James DeLisle
5527949c70
Make LessLoader flow properly, sorry about that
2018-07-18 16:22:44 +02:00
yflory
ef73cf89cd
Merge branch 'soon' into staging
2018-07-18 15:10:23 +02:00
yflory
8eccffd8e4
Don't remove migrated read-only pads
2018-07-18 14:56:49 +02:00
yflory
64b51f3a80
jshint compliance
2018-07-18 14:25:48 +02:00
yflory
ebfa2c2dc3
Merge branch 'less-less' into staging
2018-07-18 14:18:37 +02:00
yflory
aafcb1bc02
Merge branch 'sharedfolder' into staging
2018-07-18 14:18:30 +02:00
Caleb James DeLisle
8d95efa144
Reference the relevant line in alertify.js
2018-07-18 13:22:27 +02:00
Caleb James DeLisle
a57a8e51a1
Prevent alertify.js from overriding styles
2018-07-18 13:20:16 +02:00
ansuz
e110f20397
support blocks on remote domains
2018-07-17 17:41:30 +02:00
yflory
e59aec0a45
Try...catch on testworker.js
2018-07-17 16:46:24 +02:00
yflory
08005a709e
Add a share icon in the drive when displaying a shared folder
2018-07-17 16:38:20 +02:00
ansuz
1629d7bb1d
provide a SANE default in case httpUnsafeOrigin is not provided
2018-07-17 16:31:15 +02:00
ansuz
bcbec0144c
provide a default in case httpUnsafeOrigin is not provided
2018-07-17 16:20:40 +02:00
yflory
6143bceabb
Fix XXX
2018-07-17 15:38:23 +02:00
ansuz
a2fd32d6a3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-07-17 14:49:19 +02:00
ansuz
e6d4bced18
clean up extraneous variables and log statements
2018-07-17 14:34:25 +02:00
yflory
ecb9f039b1
Fix pad password change not reloading with the correct URL
2018-07-17 12:27:23 +02:00
yflory
c9ac3c7c2b
Fix search in shared folders
2018-07-17 11:22:01 +02:00
yflory
fc91cf606b
Disable moveToTrash button for pads in shared folders
2018-07-16 18:05:23 +02:00
ansuz
2c22232a47
check if a user is logged in strictly by User_hash
2018-07-16 15:45:45 +02:00
ansuz
848a918eda
remove out of date comments
2018-07-16 15:45:19 +02:00
yflory
5b48eff78c
Remove owned pads deleted from the server in shared folders
2018-07-16 14:05:36 +02:00
ansuz
b9c4aa43b5
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-07-16 11:25:11 +02:00
ansuz
3d95e6088a
leave a FIXME note
2018-07-16 11:24:58 +02:00
Caleb James DeLisle
792f7bcc64
show how long less takes to compile
2018-07-14 15:21:45 +02:00
Caleb James DeLisle
6c49318ac7
Show how long it takes to parse less
2018-07-14 15:19:39 +02:00
Caleb James DeLisle
0d5ac05866
refactoring of the less infrastructure
2018-07-14 15:15:23 +02:00
yflory
b5c2eb8a9c
Automatically refresh the drive when a change occurs in a shared folder
2018-07-13 19:24:49 +02:00
yflory
4706b8a9de
Store newly created pads in the correct (shared) folder
2018-07-13 15:01:23 +02:00
yflory
6a80f49fe0
Don't load expired or deleted shared folders
2018-07-13 14:47:53 +02:00
Caleb James DeLisle
a6d3dbf94f
Wrapped modal.less into a mixin which gets rid of the last file which emitted CSS
2018-07-12 19:13:04 +02:00
Caleb James DeLisle
4a352f2ed8
Use import (reference) whenever the less file supposedly emits no CSS
2018-07-12 18:43:17 +02:00
yflory
7d89026d83
Fix more issues with shared folders
2018-07-12 17:27:16 +02:00
Caleb James DeLisle
c5105d7b84
Merge branch 'check-for-css-variables' into staging
2018-07-12 17:16:21 +02:00
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
8516587ece
lint compliance
2018-07-11 15:28:34 +02:00
yflory
9787f5304a
Don't unpin channels that are still in another proxy
2018-07-11 15:28:24 +02:00
yflory
321c7d5512
Move pin/unpin outside of userObject
2018-07-10 18:23:16 +02:00
ansuz
8574128efd
unstub password change function
2018-07-10 16:44:24 +02:00
ansuz
25b0d764ed
pass initialState variable when copying your drive in the changeUserPassword function
...
because the hardest problems to debug are always fixed with one line changes
2018-07-10 16:42:11 +02:00
ansuz
54bc29f28c
WIP maybe I missed something
2018-07-10 15:16:43 +02:00
yflory
66a494cbd2
temp
2018-07-10 15:10:07 +02:00
yflory
4b86ed2dec
Shared folders UI
2018-07-10 14:41:37 +02:00
ansuz
0a9ea95796
always set userHash in localStorage even with modern users
2018-07-10 13:11:22 +02:00
yflory
bc7524c134
Fix tippy
2018-07-10 10:39:21 +02:00
yflory
6312dadb60
Fix shared folders names in the drive
2018-07-09 18:11:04 +02:00
yflory
e0cc1a6eb6
Display a shared folder in the drive
2018-07-09 14:36:55 +02:00
ansuz
a15e232469
complete modern user registration/login. general cleanup
2018-07-09 14:20:38 +02:00
ansuz
d79064a4c5
Merge branch 'staging' into modern-users2
2018-07-06 11:37:50 +02:00
ansuz
4ef2cfa88d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-07-06 11:37:00 +02:00
ansuz
57a39258c3
WIP big commit
2018-07-06 11:36:48 +02:00
ansuz
0c3b898000
simple one line fixes
2018-07-06 10:28:41 +02:00
yflory
0c9dfc1fb5
Add proxy manager inner
2018-07-05 16:33:46 +02:00
yflory
bd6a199dca
Add missing functions to the proxy manager
2018-07-05 13:56:16 +02:00
yflory
a25a72b5db
Add a proxy manager to handle operations between shared folders
2018-07-05 10:37:06 +02:00
yflory
66591a3654
Merge branch 'rohref' into sharedfolder
2018-07-02 14:12:06 +02:00
ansuz
a3e0e765b5
derive block URI and URL in dedicated functions
2018-07-02 11:11:50 +02:00
yflory
a99e5a3aaa
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-07-02 11:03:58 +02:00
yflory
af5cc30381
Fix undefined function when calling error() in the drive
2018-07-02 11:02:43 +02:00
yflory
071c34d4fa
Fix undefined secret with password-protected files ( #250 )
2018-07-02 10:51:43 +02:00
yflory
27797c0520
Fix undefined secret with password-protected files ( #250 )
2018-07-02 10:50:30 +02:00
yflory
425ac8ea57
Migration for read-only links + fix issues with read-only pads
2018-06-29 18:16:04 +02:00
yflory
0f9a71686e
Add support for read-only href stored in filesData
2018-06-28 18:16:38 +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
yflory
470f404a24
temp
2018-06-28 15:31:30 +02:00
ansuz
cfc81e8c96
allocate blockSeed as Uint8Array
2018-06-28 15:21:13 +02:00
yflory
554b4a978d
Load shared folders in the store
2018-06-28 14:15:30 +02:00
ansuz
7aa7b82c60
merge staging
2018-06-28 13:33:54 +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
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
fbe940c024
Fallback to async store in self.crypto doesn't exist in webworkers (ie/edge)
2018-06-22 19:43:07 +02:00
ansuz
01614c4256
verify old user password before proceeding to change passwords
2018-06-22 15:34:50 +02:00
ansuz
85bcaa51f7
export a constant for the number of required bytes at login time
...
allocate bytes for blockSeed when changing passwords
2018-06-22 11:41:10 +02:00
yflory
a146f6acc9
Change user account password function
2018-06-22 10:37:54 +02:00
ansuz
6fde027a6c
add some TODOs
2018-06-21 10:26:46 +02:00
ansuz
9a7abe0b1e
Merge branch 'modern-users' of github.com:xwiki-labs/cryptpad into modern-users
2018-06-21 10:16:25 +02:00
ansuz
c2014c5906
a bit of cleanup, bug fixes, and lint compliance
2018-06-21 10:16:16 +02:00
yflory
36d1ae0f6c
Merge branch 'modern-users' of github.com:xwiki-labs/cryptpad into modern-users
2018-06-20 16:39:52 +02:00
yflory
71b085ba23
Owned drive migration UI
2018-06-20 16:39:01 +02:00
ansuz
c3741f847d
resolve conflicts from merge with staging
2018-06-20 14:29:13 +02:00
ansuz
d03339f20b
check for the presence of a blockHash in localStorage when logging in
2018-06-20 14:27:44 +02:00
ansuz
3ba0ad3cf1
get, set, and clear blocks from localStorage
2018-06-19 18:08:14 +02:00
ansuz
cb5fa72dba
implement removeLoginBlock rpc
2018-06-19 17:17: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
ansuz
577dea4c75
clientside implementation of block signing and encryption
2018-06-19 16:38:49 +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
54d63df1cf
Ability to change the password of a pad
2018-06-14 17:18:32 +02: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
ansuz
ff25929c18
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-06-12 15:50:53 +02:00
ansuz
54b52d681c
fix broken share menu resulting from adblock plus triggered by 'share'
2018-06-12 15:50:41 +02:00
yflory
d558b9e3e8
Fix 404 issues in media-tag
2018-06-12 15:21:57 +02:00
yflory
9fbf507cda
Fix new version detection
2018-06-12 14:23:54 +02:00
ansuz
aa51463a9a
Merge branch 'soon' into staging
2018-06-12 12:00:51 +02:00
yflory
4dec2cca5c
Translations for new version detected
2018-06-11 18:18:39 +02:00
yflory
089e0361b6
Detect new version
2018-06-11 16:52:26 +02:00
yflory
da396b6528
Remove XXX
2018-06-11 15:40:36 +02:00
yflory
aeaf7d1950
Fix mediatag...
2018-06-11 15:06:43 +02:00
yflory
054ad9e741
Fix 404 in thumbnails creation with corrupted data in the drive
2018-06-11 11:46:27 +02:00
yflory
8f28621bb0
Remove unnecessary logs when logging in
2018-06-11 11:23:11 +02:00
yflory
e39c77e162
Merge branch 'staging' into serviceworker
2018-06-11 10:59:01 +02:00
yflory
921e6eb3c3
Fix wrong pad title in drive
2018-06-11 10:58:44 +02:00
yflory
996245ec3d
Merge branch 'staging' into serviceworker
2018-06-11 10:17:50 +02:00
yflory
47dee664da
Add support for login & logout while keeping the same shared worker
2018-06-08 17:35:44 +02:00
ansuz
756681211b
update home page icons, allow for customization
2018-06-08 17:06:50 +02:00
yflory
02b282a1a5
Disconnect from shared/service worker
2018-06-08 16:45:07 +02:00
Caleb James DeLisle
1775638d00
Merge commit '0c8ce27' into staging
2018-06-07 15:51:16 +02:00
Caleb James DeLisle
0c8ce27f24
Make the less loader only load particular less files once
2018-06-07 15:49:59 +02:00
yflory
af2a13e5ae
Fix UI issue with PPF in the file picker
2018-06-07 15:42:16 +02:00
yflory
574d99f9db
Remove support for old media-tag
2018-06-07 15:09:35 +02:00
ansuz
eac7d38655
test media-tag, and fix the bug the tests exposed
2018-06-07 14:29:09 +02:00
yflory
bc57f8c274
Replace media-tag.js with the new one
2018-06-07 14:12:33 +02:00
yflory
87f4fe9c84
Add error code to a feedback key
2018-06-07 10:48:38 +02:00
yflory
f05e2225d6
lint compliance
2018-06-06 18:22:48 +02:00
yflory
78ff55e34e
Fix race condition
2018-06-06 18:21:52 +02:00
yflory
48dc8c78b4
Fix cache and merge issues
2018-06-06 18:10:58 +02:00
yflory
305b47132c
lint compliance
2018-06-06 17:55:02 +02:00
yflory
14db9fad8e
Merge branch 'echidna' into serviceworker
2018-06-06 17:54:07 +02:00
yflory
a6d9ecb3ba
lint compliance
2018-06-06 17:48:10 +02:00
yflory
598d56c75e
Fix cache issues
2018-06-06 17:45:43 +02:00
yflory
cefe19b0e1
Merge branch 'echidna' into serviceworker
2018-06-06 17:25:24 +02:00
yflory
953d98be96
Fix reconnect
2018-06-06 17:25:06 +02:00
yflory
ce6779a06f
Remove debugging logs
2018-06-06 17:11:30 +02:00
yflory
6ab29f8f3a
Test service worker and shared worker store
2018-06-06 15:58:43 +02:00
yflory
3f8b6d3b8a
Fix default title issues when using a template
2018-06-04 16:02:58 +02:00
yflory
9c5ad795e1
Service worker test
2018-06-01 19:23:30 +02:00
yflory
b0311ccec1
Don't create file duplicates in the drive
2018-06-01 12:10:49 +02:00
yflory
21366c252d
Merge branch 'donkey' into staging
2018-06-01 12:07:10 +02:00
yflory
cc163f83c7
Fix an issue creating duplicate files in the drive
2018-06-01 10:52:54 +02:00
yflory
b9f5a0f52b
Move async store in a webworker!
2018-05-31 18:22:16 +02:00
yflory
8586d0c944
Merge branch 'staging' into donkey
2018-05-31 13:28:14 +02:00
yflory
ba0e000808
Add a file upload modal
2018-05-31 13:27:44 +02:00
yflory
85e5c495d9
Remove owned file
2018-05-30 14:36:29 +02:00
yflory
93ecc06964
Upload owned files
2018-05-29 19:42:20 +02:00
yflory
a6bac8ae41
Fix password prompt issue when the password was wrong in the file app
2018-05-28 18:18:25 +02:00
yflory
05bd41f256
Upload a password-protected file from apps
2018-05-28 18:03:35 +02:00
yflory
66655b4a23
Upload a file with a password
2018-05-28 17:50:28 +02:00
yflory
8aac7bad45
Make sure the ID is not used when uploading a file
2018-05-28 16:57:20 +02:00
yflory
3267268e20
Fix share modal not using the previous values
2018-05-28 15:33:49 +02:00
yflory
586193d6a1
Password-protected files: upload files with hashes V2
2018-05-28 15:31:18 +02:00
yflory
c7e08fedfb
Password-protected files
2018-05-25 18:00:10 +02:00
yflory
914da83b46
Fix missing edit hash in share modal when opening a pad in read-only mode
2018-05-23 16:55:23 +02:00
yflory
4df285fed5
Fix pads using version 0 hashes
2018-05-23 16:45:05 +02:00
ansuz
bd66c8fee8
hacks to handle weird entries in drive
2018-05-18 10:28:31 +02:00
ansuz
2170fcb9ad
Merge branch 'kanban' into staging
2018-05-18 10:19:55 +02:00
yflory
ef735d6fe6
Fix an issue when trying to create a pad with a password from a template
2018-05-17 18:15:10 +02:00
ansuz
f218a9c119
correct a copy-pasted comment
2018-05-17 16:10:53 +02:00
yflory
b4638efe2d
Fix missing username when avatar is 404
2018-05-17 12:09:52 +02:00
yflory
31f9062422
Fix avatar pin
2018-05-17 11:46:16 +02:00
ansuz
d950b34bdf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-05-17 10:35:59 +02:00
ansuz
fb91f5df76
compare flat-dom output against hyperjson
2018-05-17 10:35:48 +02:00
yflory
5554c24b36
Remove dev console logging
2018-05-17 10:29:25 +02:00
yflory
b6ebc583ba
Add the kanban app to the list
2018-05-16 16:30:37 +02:00
yflory
65a2083afc
Suggest tags based on existing ones. Display existing tags in the drive.
2018-05-15 18:18:56 +02:00
yflory
e2052b4510
Fix multiple tippy tooltips displayed in poll's table
2018-05-15 10:59:53 +02:00
ansuz
dcd27f0da4
finalize save button tooltips
2018-05-14 14:20:37 +02:00
yflory
6fde15247b
Fix UI issues in the loading screen with the loading bar
2018-05-14 14:02:46 +02:00
yflory
2d2701596a
Loading message and loading bar for migration
2018-05-04 18:41:54 +02:00
yflory
2b8e734cae
Add revealable password input to display or prompt the password
2018-05-04 15:42:29 +02:00
yflory
447230d42e
Clean migration logging
2018-05-03 18:17:18 +02:00
yflory
6c4c5c135b
Async migration
2018-05-03 17:59:22 +02:00
yflory
288b0c2df1
Lint compliance
2018-05-03 15:16:48 +02:00
yflory
10ce95087a
Merge branch 'password' into staging
2018-05-03 15:16:03 +02:00
ansuz
ac09ba65ce
strip both old and new style checkpoint labels before decrypting when fetching history
2018-05-02 14:39:06 +02:00
yflory
2451174870
Lint compliance
2018-04-27 18:04:21 +02:00
yflory
d0c6746034
Merge branch 'mediatagplugin' into staging
2018-04-27 17:57:22 +02:00
yflory
009eb13fc3
Merge branch 'master' into staging
2018-04-27 17:51:12 +02:00
ansuz
41583b7858
Merge branch 'checkpoint-bug' into merge-checkpoint-bug
2018-04-27 17:45:26 +02:00
yflory
64c85fe548
Don't return channel in parsePadUrl
2018-04-27 17:23:23 +02:00
yflory
43d046406f
Store the channel id as pad attribute
2018-04-27 11:54:23 +02:00
yflory
b26ae67df5
Fix issues with channel ID when using a password
2018-04-26 15:10:31 +02:00
yflory
1879c1829c
Add passwod prompt to access protected pads
2018-04-25 19:03:58 +02:00
yflory
811463b870
Add support for version 2 hashes needed for password-protected pads
2018-04-24 17:22:33 +02:00
yflory
5eab39ad75
Tets mediatag plugin using widgets
2018-04-19 17:45:08 +02:00
yflory
449ae579e5
Lint compliance
2018-04-19 14:22:10 +02:00
yflory
a773c47950
Fix loading screen in login and register
2018-04-19 14:21:26 +02:00
yflory
a51e41c883
Rename the image used in the new loading screen
2018-04-19 11:30:54 +02:00
yflory
9f5e5786f3
Merge branch 'pcs' into staging
2018-04-19 11:14:56 +02:00
yflory
206ac14438
Prevent users from creating a pad when visiting a deleted profile (read-only mode)
2018-04-18 18:54:46 +02:00
yflory
24dfaf766d
View more templates
2018-04-17 18:23:58 +02:00
yflory
842952fe1f
New checkboxes and radio input everywhere
2018-04-17 15:51:03 +02:00
yflory
68c26f3164
Custom radio inputs
2018-04-16 19:07:57 +02:00
yflory
7870dc05ca
Fix notification timeout
2018-04-16 16:07:40 +02:00
yflory
881c36214f
Lint compliance
2018-04-16 15:57:18 +02:00
yflory
ec0fc85b9f
Sort templates by usage in the PCS
2018-04-13 18:52:55 +02:00
yflory
52d6c9d468
New colortheme for alertify logs and modals
2018-04-13 17:47:33 +02:00
yflory
5ee5a93513
New tippy everywhere
2018-04-13 15:25:14 +02:00
yflory
9d57548f1d
New tooltips
2018-04-12 19:08:08 +02:00
yflory
4a23b57655
New loading screen
2018-04-11 18:56:03 +02:00
yflory
e1473dff79
Fix tests
2018-04-10 16:38:31 +02:00
yflory
e37aab492b
Validate messages not coming from history-keeper
2018-04-10 15:10:28 +02:00
yflory
a570a73e98
Send checkpoints' id to the server to avoid storing duplicates
2018-04-10 10:38:30 +02:00
yflory
8bf9617dd6
Fix typo
2018-04-05 10:58:58 +02:00
yflory
2381dd0e39
Remove owned profile and owned todo in automatic account deletion
2018-04-04 17:24:26 +02:00
ansuz
f276915712
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-04-04 15:07:41 +02:00
ansuz
b323989347
remove extraneous console statements
2018-04-04 14:49:33 +02:00
yflory
c43afcf629
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-04-04 14:38:40 +02:00
yflory
52e634885e
Hide the import template button if templates are disabled in appconfig
2018-04-04 14:38:24 +02:00
ansuz
c24c06e90c
sign with your global private signing key
2018-04-04 14:17:48 +02:00
yflory
0993204d14
Disable thumbnails by default
2018-04-03 13:35:06 +02:00
yflory
0dfae72f88
Lock the UI for unregistered users
2018-04-03 12:04:49 +02:00
yflory
303adaea4c
Display only 5 items in the file upload table
2018-04-03 12:04:17 +02:00
yflory
cf22c58e39
Missing translations
2018-04-03 11:23:58 +02:00
yflory
a9d01ac864
Lock the UI when someone is editing
2018-04-03 11:00:46 +02:00
yflory
d12e5da1b7
Unpin old versions
2018-03-29 10:54:40 +02:00
yflory
c4a3e98123
Fix initial value in oo apps
2018-03-29 10:16:51 +02:00
yflory
fd1b4189be
Save and open oo docs
2018-03-28 19:35:49 +02:00
yflory
d5dce6ac22
Fix config
2018-03-27 14:03:30 +02:00
yflory
34f2d66b7e
Load OnlyOffice documents in the inner iframe
2018-03-26 18:32:40 +02:00
ansuz
8c4ed76fa7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-03-23 18:05:33 +01:00
ansuz
1f700a8374
fix confusing error message
2018-03-23 18:05:16 +01:00
yflory
1a950319a1
Fix broken links
2018-03-23 15:05:26 +01:00
yflory
f1c1d87d3f
Fix template importer
2018-03-23 10:53:31 +01:00
yflory
0c2987a6d1
Import template in existing pads
2018-03-22 17:01:01 +01:00
yflory
d4dfbddaa6
Add icons in the user menu
2018-03-22 15:19:14 +01:00
yflory
db9eee383c
Owned profile
2018-03-22 15:16:19 +01:00
yflory
9cba630700
lint compliance
2018-03-21 18:53:11 +01:00
yflory
01fb497e1b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-03-21 18:31:59 +01:00
yflory
a718603b36
Automatic account deletion
2018-03-21 18:27:20 +01:00
ansuz
a794efe931
Merge branch 'staging' into oo
2018-03-21 11:32:59 +01:00
sairim
faaff60f74
Fix broken FAQ link
...
Add a forward slash before faq.html... for the expiring pads FAQ link.
2018-03-20 18:16:29 +02:00
yflory
99712ec2f0
getMetadata RPC
2018-03-20 15:33:12 +01:00
yflory
44cd235f48
Fix CSS with Bootstrap 4
2018-03-20 11:05:43 +01:00
yflory
fa4b625f0d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-03-19 17:25:38 +01:00
yflory
67cdb6bd13
Fix initial values in the pad creation screen
2018-03-19 17:25:31 +01:00
ansuz
bd6b6dcb49
actually fix weird checkbox logic, and lint compliance
2018-03-19 17:13:44 +01:00
ansuz
dc783ce3e4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-03-19 16:56:15 +01:00
ansuz
96a63a3b7b
fix weird checkbox logic in share menu
2018-03-19 16:56:09 +01:00
yflory
91b3ef45f3
Fix mobile detection
2018-03-19 16:27:33 +01:00
yflory
4f2a91b82d
Pad creation screen UI improvements
2018-03-19 16:17:19 +01:00
yflory
07e361b88d
Account deletion button
2018-03-19 14:04:44 +01:00
yflory
f1107ae6e5
Don't count other people's owned pads against your limit
2018-03-16 18:13:33 +01:00
yflory
ab8306f5d4
Merge branch 'soon' into staging
2018-03-14 17:17:00 +01:00
yflory
de97c5a3ff
Fix mobile detection when hiding the userlist
2018-03-14 17:02:41 +01:00
yflory
d6228a39bd
Fix userlist notifications missing for join events
2018-03-14 16:34:44 +01:00
yflory
03bcd2f00d
Lint compliance
2018-03-14 12:12:24 +01:00
yflory
3eec812aff
Merge branch 'staging' into creation
2018-03-14 12:07:04 +01:00
yflory
b1d5beca6f
Translations + UI for pad creation screen v2
2018-03-14 11:37:49 +01:00
yflory
e56d762409
Catch chainpad errors and display it in the UI
2018-03-13 14:38:56 +01:00
yflory
c9ed6d6bf8
New pad creation screen
2018-03-13 11:31:08 +01:00
ansuz
7944bc1a82
merge staging branch
2018-03-09 12:08:18 +01:00
ansuz
64afcb7c0b
comment out busyloop workaround for tippyjs
2018-03-09 10:12:12 +01:00
ansuz
03ae9d5714
Merge branch 'soon'
2018-03-08 16:38:16 +01:00
yflory
442f15df98
Add help text in all the apps + french translation
2018-03-08 15:39:46 +01:00
yflory
cbd29794b8
Improve keyboard shortcuts in the pad creation screen
2018-03-08 12:16:40 +01:00
yflory
7a70d69d8e
Hide editor toolbars by default when using a small screen
2018-03-07 17:34:55 +01:00
yflory
f45023ed1f
Remove connection lost popup when websocket connection is lost
2018-03-07 16:48:49 +01:00
yflory
689368cdd7
Fix feedback for markdown toolbar and cke toolbar
2018-03-07 10:57:29 +01:00
ansuz
0af90ef88d
resolve merge conflict
2018-03-05 15:00:57 +01:00
ansuz
978b6b95df
WIP make oo encrypted
2018-03-05 14:05:53 +01:00
yflory
62186bd4bd
Remove tooltip when the element is removed from DOM
2018-03-05 11:19:05 +01:00
yflory
b0dba481d8
Fix small UI issues and IE issues
2018-03-02 18:33:43 +01:00
yflory
b7b560fcb8
Enable Cmd key support in shortcuts
2018-03-01 14:48:36 +01:00
yflory
12bfcbe701
Add fixed order for rightside icons in the toolbar
2018-03-01 14:32:14 +01:00
ansuz
ee4d12bd57
abstract repeated call
2018-02-28 18:15:33 +01:00
yflory
2c90cb5907
Move help button in drawer and fix drawer style
2018-02-28 17:59:27 +01:00
yflory
753b7550ca
Save button in the pad creation screen
2018-02-28 17:02:35 +01:00
yflory
a4a6385e86
Add keyboard shortcuts for the Ctrl+E or Cmd+E modal
2018-02-28 16:38:28 +01:00
yflory
60b2384885
Move initial state into a help block
2018-02-27 17:38:29 +01:00
yflory
5c53868c3b
Delete pads after 3 months of inactivity
2018-02-26 18:34:05 +01:00
yflory
329fd61bb1
Remove lag when creating a pad from the pad creation screen
2018-02-26 10:49:35 +01:00
yflory
a697ad9762
Merge branch 'soon'
2018-02-22 17:05:58 +01:00
yflory
61dbf94f2d
Fix pad attributes not working for readonly pads if you know the edit hash
2018-02-22 15:56:23 +01:00
yflory
8c42125ea0
Merge branch 'soon'
2018-02-22 12:44:28 +01:00
yflory
7ff9bbe2b0
Fix share modal with new pads
2018-02-22 12:43:16 +01:00
yflory
acf09c807d
Fix fonts
2018-02-20 16:09:49 +01:00
yflory
9ba912d953
Clean onlyoffice files
2018-02-20 15:47:07 +01:00
yflory
db71fe5bf8
Rename font files
2018-02-20 15:23:24 +01:00
yflory
d53ea25111
Merge branch 'soon'
2018-02-20 14:42:32 +01:00
yflory
5f50bedce2
Fix empty properties for readonly pads
2018-02-20 14:42:11 +01:00
yflory
15a8196037
Enable pad creation screen
2018-02-20 10:39:02 +01:00
yflory
2eef1e96e6
Remove invalid error reports
2018-02-20 10:21:15 +01:00
yflory
7cb3282634
New apps for text, slide and spreadsheet
2018-02-19 18:52:57 +01:00
yflory
766fa72841
Fix initial value of the preview link in the share modal
2018-02-19 14:07:21 +01:00
yflory
5c1e5a3f49
Merge branch 'staging' into oo
2018-02-19 12:11:06 +01:00
yflory
649fefad54
Send cookie when history keeper has changed
2018-02-16 15:25:53 +01:00
yflory
2ac9c3ba66
Report RPC errors when deleting owned pads
2018-02-16 12:33:33 +01:00
yflory
037a6ccc35
Fix INVALID_RESPONSE error in the file app
2018-02-16 12:02:20 +01:00
yflory
70e014cdfc
Hide infinite spinner and disconnect modals when pad is deleted
2018-02-15 11:34:44 +01:00
yflory
e83e589cf0
Kick from pad when an owned channel is deleted + whiteboard and poll
2018-02-14 19:41:07 +01:00
yflory
728a6a868d
Manage expired channels
2018-02-13 18:20:13 +01:00
yflory
3bb6d5a83c
Remove full history timeout
2018-02-09 15:47:29 +01:00
ansuz
d676a5e7db
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into keywords
2018-02-07 11:14:19 +01:00
yflory
5bba9b6c39
Refactor login to remove duplicate code
2018-02-06 18:45:12 +01:00
yflory
4df4c48fbd
Improve UI for pad creation screen
2018-02-06 17:36:37 +01:00
yflory
83eb304716
lint compliance
2018-02-01 11:16:34 +01:00
yflory
970122b41d
Send the channel id to the text analyzer
2018-02-01 11:08:04 +01:00
yflory
80df45f257
Get text from ckeditor
2018-02-01 10:09:08 +01:00
yflory
fb192a2c45
Add a configurable background color in the file app in view mode
2018-01-31 14:42:34 +01:00
yflory
91e42f1518
Fix the bug introduced in the share modal fix
2018-01-31 12:11:10 +01:00
yflory
0b1795e5a1
Fix an issue preventing the share modal to be used more than once
2018-01-31 12:08:55 +01:00
yflory
bdafc101c9
Ability to remove owned channels from the drive
2018-01-29 15:17:53 +01:00
yflory
b6e91c772e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-01-29 12:45:44 +01:00
yflory
a1d9f44bbd
Delete owned pads from server when removed from the owner's drive
2018-01-29 12:45:38 +01:00
ansuz
f134f11b73
new getDeletedPads rpc
2018-01-29 12:40:09 +01:00
yflory
5089f1206d
Pad creation screen translations and link to settings
2018-01-29 10:38:00 +01:00
yflory
36550b781f
Don't check for stronger hash if we have an edit hash
2018-01-26 15:44:38 +01:00
yflory
86144eda22
Display a message about pads deleted from the server
2018-01-26 12:26:58 +01:00
yflory
9a317018e2
Remove deleted pads from the drive
2018-01-25 17:54:21 +01:00
yflory
3d3f58b3fc
Improve share modal customization to make it work with async functions
2018-01-25 14:20:55 +01:00
yflory
5827905dbd
Import OnlyOffice code from the 'onlyoffice' branch and sframe it
2018-01-25 11:06:58 +01:00
ansuz
2b8414ca78
provide hints for running CryptPad
2018-01-24 16:16:46 +01:00
ansuz
80cd3e208a
lint compliance
2018-01-24 11:35:05 +01:00
ansuz
4e8335bfdd
fix support for custom button classes
2018-01-24 11:01:15 +01:00
yflory
2995782079
Different colors for ok and cancel in alertify
2018-01-23 17:02:32 +01:00
Caleb James DeLisle
4de6bd6195
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-01-23 16:32:05 +01:00
Caleb James DeLisle
014aacc76a
Added a new RPC to get file offsets of messages by hash or of last 2 checkpoints, also improved checking of valid channel names and fixed a pull-stream bug and exposed async-store to the window
2018-01-23 16:31:59 +01:00
yflory
69c33e2f83
Ability to disable profile
2018-01-23 14:24:40 +01:00
yflory
51587d1006
Ability to disable feedback on the entire instance
2018-01-23 13:47:30 +01:00
yflory
006d99e19a
Fix undefined friends
2018-01-23 12:09:54 +01:00
yflory
c90ba890ca
Add more configurable options and add a new way to use custom config
2018-01-22 16:56:37 +01:00
yflory
2e436f16c9
Refactor context menu in drive
2018-01-19 17:03:58 +01:00
yflory
4bea1aa2df
Display default avatars in IE
2018-01-18 15:25:45 +01:00
yflory
adf7e14891
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-01-18 15:04:17 +01:00
yflory
bc9a88fbe9
Add support for org-mode in th code app
2018-01-18 15:04:06 +01:00
ansuz
b08c1d94a1
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-01-18 12:20:10 +01:00
ansuz
02dbe9e458
enforce maxUploadSize
2018-01-18 12:19:58 +01:00
yflory
6a906e3770
Fix share modal extension point
2018-01-18 11:16:30 +01:00
yflory
51b4d269be
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-01-18 10:54:08 +01:00
yflory
6e086ee779
Add shortcuts in the share modal
2018-01-18 10:53:43 +01:00
ansuz
fc8847dae4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-01-18 10:32:27 +01:00
yflory
08ae327386
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-01-17 18:40:09 +01:00
yflory
c5ebbe1a56
New share menu
2018-01-17 18:39:45 +01:00
ansuz
e52c1fe65c
remove Symbol polyfill
2018-01-17 14:27:26 +01:00
ansuz
a91a047d73
more polyfill for IE
2018-01-16 18:15:08 +01:00
ansuz
50e3e3ce91
polyfill Symbol for IE
2018-01-16 18:12:33 +01:00
ansuz
1dd07ea48a
polyfill MAX_SAFE_INTEGER everywhere
2018-01-16 18:03:55 +01:00
yflory
4c49cd7592
Fix template picker not displayed anymore in framework
2018-01-16 14:39:56 +01:00
yflory
2f74324dac
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-01-16 12:05:37 +01:00
yflory
f79e1dfda0
Fix a race condition that could wiped the content of coed and slide
2018-01-16 12:05:26 +01:00
ansuz
3118dd8312
set logLevel to 2 by default for sframe apps
2018-01-16 11:52:04 +01:00
yflory
88a04fdb07
Don't create sfcommon a second time in code and slide
2018-01-16 11:26:16 +01:00
yflory
ee605183e5
Make sure we don't have duplicates in the webchannel members
2018-01-15 15:40:52 +01:00
yflory
20f05d2f6f
Fix Phantom viewers' revenge
2018-01-15 15:38:18 +01:00
yflory
47203c37f1
Remove console error caused by setTimeout called with undefined
2018-01-12 17:44:56 +01:00
yflory
a4b35728dc
Todo app has a hash in the omnibar
2018-01-12 17:08:41 +01:00
yflory
68ce7fe53d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-01-12 15:55:00 +01:00
yflory
d59bc4612d
Ability to disable the drive for anonymous users
2018-01-12 15:54:36 +01:00
ansuz
844d04df87
allow custom logout hooks defined in app config
2018-01-12 15:49:01 +01:00
ansuz
5b4e5480cb
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-01-12 14:51:53 +01:00
ansuz
9b78580d8e
make usage-bar display optional
2018-01-12 14:50:56 +01:00
yflory
db0d2e161c
Hide pad creation screen features if it is disabled in app config
2018-01-12 14:50:39 +01:00
yflory
daef08a9b3
Add an advanced new pad modal
2018-01-12 09:50:11 +01:00
yflory
bd9c44dbb2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-01-11 16:02:18 +01:00
yflory
ef480fea79
Add a settings category for the pad creation screen
2018-01-11 16:02:05 +01:00
ansuz
05ad38cfe1
add more config parameters to share menu extension
2018-01-11 15:55:57 +01:00
ansuz
c31b5aa6c0
make extension point cover share menu for files
2018-01-11 15:55:57 +01:00
yflory
13b704d9f6
Fix undefined webchannel when uploading a file
2018-01-11 15:55:57 +01:00
ansuz
ca3697ae3a
implement extension point for share menu
2018-01-11 15:55:57 +01:00
ansuz
5346afe51f
step towards customizable login functionality
2018-01-11 15:55:57 +01:00
Caleb James DeLisle
151d33db18
Added testing of /poll/ :D
2018-01-11 15:45:12 +01:00
yflory
8c9490868b
improve owned pads management in the drive
2018-01-10 17:57:40 +01:00
yflory
e5b9f089fb
Fix undefined webchannel when uploading a file
2018-01-10 11:47:52 +01:00
yflory
73126ed597
Display the owner and expiration time of a pad in the properties modal
2018-01-09 18:19:24 +01:00
yflory
ecd8ef6418
improve thumbnails creation performances in code
2018-01-09 15:25:11 +01:00
yflory
77dcc1c705
Fix a race condition when switching language in the code app
2018-01-09 12:44:25 +01:00
yflory
65ccfe39ef
Add a 'properties' button in pads to display pad data
2018-01-09 12:02:56 +01:00
yflory
071d385850
Remove an unnecessary websocket connection
2018-01-09 12:02:22 +01:00
yflory
7defde3c59
lint compliance
2018-01-08 17:41:10 +01:00
yflory
0cea5f4596
Create an owned pad and view owned pads in the drive
2018-01-08 17:36:44 +01:00
yflory
1ec41f4e09
Ability to pick a background image in slides
2018-01-04 17:22:01 +01:00
yflory
59c4df3d9b
Fix 'NaN' txid for RPC when using IE
2018-01-03 17:14:35 +01:00
yflory
0f02d76b56
Fix missing callback when uploading files to the drive
2018-01-03 15:08:26 +01:00
yflory
d2845b95b6
Fix multiple file upload prompt
2018-01-03 11:42:23 +01:00
yflory
10aaa06781
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-22 16:25:52 +01:00
ansuz
869909b101
implement more reliable check for whether a channel on the server is new
2017-12-22 16:24:17 +01:00
ansuz
b6430d640e
temporary measure to address infinite reload loop due to inaccurate inNewFile condition
2017-12-22 14:59:41 +01:00
yflory
2fd22c6db6
Fix task list in markdown when using one empty line between tasks
2017-12-22 14:56:01 +01:00
yflory
7164d2dfdd
lint compliance
2017-12-22 14:42:18 +01:00
ansuz
26f5a1fe74
signal that onLocal is called by onRemote
2017-12-22 13:16:15 +01:00
yflory
888739e333
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-21 18:21:14 +01:00
yflory
fa6106a6bb
Use CSS to remove the loading screen
2017-12-21 18:21:10 +01:00
ansuz
c0b5dc7536
make loading screen tip presence configurable
2017-12-21 18:09:49 +01:00
ansuz
892dfb18f7
check if users have service workers
2017-12-21 17:30:54 +01:00
ansuz
5f42a9749f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-21 17:23:58 +01:00
ansuz
4aa8d92a53
handle errors when constructing thumbnails from file metadata
2017-12-21 17:18:10 +01:00
yflory
5532b779fd
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-21 15:56:28 +01:00
ansuz
d1d75f2f25
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-21 15:53:16 +01:00
Caleb James DeLisle
590e77aafa
lint, missing semicolon
2017-12-21 11:15:21 +01:00
Caleb James DeLisle
4117eb71cc
Report the number of tests
2017-12-21 10:40:48 +01:00
Caleb James DeLisle
c928be028a
Upgrade the testing framework to allow multiple tests
2017-12-20 18:36:53 +01:00
yflory
f4078d68f0
Remove the 'edit username' button in the userlist in readonly mode
2017-12-20 11:54:30 +01:00
yflory
78f738143b
Hide the markdown toolbar in read-only mode
2017-12-20 11:41:47 +01:00
Caleb James DeLisle
cbd7351d53
Improved logging if there's a non-empty-newdoc
2017-12-19 19:08:01 +01:00
yflory
cfc9ce33d6
Hide the tags button for anonymous users
2017-12-19 11:58:45 +01:00
yflory
09433e0bf0
display existing tags in the prompt in drive
2017-12-19 10:16:53 +01:00
Caleb James DeLisle
3c0806659b
Better logging if we trigger the doc emptystring issue
2017-12-18 18:28:48 +01:00
Caleb James DeLisle
7842c730a4
support for testing on safari
2017-12-18 15:15:41 +01:00
Caleb James DeLisle
e587e9cd57
allow specifying the browser in selenium
2017-12-18 11:39:59 +01:00
ansuz
38e28ebc9a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-15 19:12:00 +01:00
ansuz
3c2d6af4f0
save pending tags when clicking OK on tagPrompt
2017-12-15 19:11:53 +01:00
yflory
47e4ce623a
Fix import pads from anon drive at registration
2017-12-15 18:27:13 +01:00
yflory
d666e9e7ee
Remove tag and filepicker buttons for anon users
2017-12-15 18:16:01 +01:00
yflory
c18d4297e1
Fix friend requests from the userlist
2017-12-15 16:19:22 +01:00
Caleb James DeLisle
6a2d79249d
Added some nice testing
2017-12-15 16:09:30 +01:00
yflory
50ddad5e41
Fix an issue with the tag prompt removing all keyup listeners
2017-12-15 15:33:53 +01:00
Caleb James DeLisle
bb548b3428
Merge branch 'staging' into better-testing
2017-12-15 10:29:28 +01:00
Caleb James DeLisle
6ac4fa4689
wip
2017-12-14 11:34:44 +01:00
ansuz
afcf3d06b3
unpin pads when they are removed from your drive
2017-12-12 16:00:05 +01:00
ansuz
1a0ac9830a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-12 14:53:17 +01:00
ansuz
c0e49211c4
eat errors related to cursors
2017-12-12 14:51:51 +01:00
yflory
bba974947b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-12 14:45:39 +01:00
yflory
6bcc72ff83
Fix pads using an old URL
2017-12-12 14:45:25 +01:00
Caleb James DeLisle
8582f92892
Attempt to handle the possible scenario where we are overwriting an existing pad with the initial content.
2017-12-12 14:30:10 +01:00
ansuz
50b6a23067
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-12 13:47:35 +01:00
ansuz
76af3b90a7
stub createUnpinnedWarning0
2017-12-12 13:47:24 +01:00
yflory
a863011a0c
Fix profile in read-only mode
2017-12-12 12:14:32 +01:00
yflory
b1765c6ae3
Fix pad creation screen with anonymous users
2017-12-11 17:58:59 +01:00
yflory
c269929319
Fix creation page not displayed in pad and slide
2017-12-11 17:17:06 +01:00
yflory
362104ec09
lint compliance
2017-12-11 14:49:41 +01:00
yflory
89cc583f53
Call the handler if onReady is called for a ready channel
2017-12-11 12:48:06 +01:00
yflory
dcfccf88cd
Merge branch 'creationpage' into staging
2017-12-11 12:21:21 +01:00
yflory
1922dbfd75
Creation page with mobile support
2017-12-11 12:19:44 +01:00
Caleb James DeLisle
7a09bf43eb
Fix a truly silly mistake in rpc.js and make the pad-not-pinned message get removed if a registered user joins
2017-12-08 14:46:32 +01:00
Caleb James DeLisle
008b2cc67e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-08 14:01:02 +01:00
Caleb James DeLisle
12b0f3e201
Pad Not Pinned: Better CSS, moved element outside of the title element, added it in poll, better colors, tippy, and login/register in same window
2017-12-08 14:00:53 +01:00
ansuz
06422e6d5a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-08 11:47:55 +01:00
ansuz
38bd27303b
WIP rpc framework
2017-12-08 11:47:07 +01:00
Caleb James DeLisle
617c4b6044
CSS refactorings and pad-is-not-pinned work
2017-12-07 19:00:13 +01:00
yflory
e96d54e655
Add a pad creation page
2017-12-07 18:51:50 +01:00
yflory
4377f2cee7
Fix missing translations in the drive
2017-12-07 12:20:26 +01:00
yflory
203c5d64c1
Focus codemirror after using the markdown toolbar
2017-12-07 12:18:14 +01:00
yflory
e72270d4a4
Add feedback when sharedworker is defined
2017-12-07 10:50:45 +01:00
yflory
1ac4abc482
Remove old code
2017-12-07 10:35:48 +01:00
yflory
64303b4090
Merge branch 'refactor' into staging
2017-12-07 10:34:15 +01:00
yflory
3e064e6638
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-06 18:33:16 +01:00
yflory
604ea1c95f
Feedback about webworkers
2017-12-06 18:32:48 +01:00
Caleb James DeLisle
ba74f9d37a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-05 18:32:29 +01:00
Caleb James DeLisle
1dabea84d9
Overrides to colortheme.less will nolonger block the adding of new keys to the original file
2017-12-05 18:32:23 +01:00
yflory
61935500f4
Lint compliance
2017-12-05 18:10:53 +01:00
yflory
9eb33e39e6
Enable change events in the drive
2017-12-05 18:09:43 +01:00
Caleb James DeLisle
c702a23c77
Initial work on the 'pad will expire' logic
2017-12-05 17:48:30 +01:00
yflory
17636769e4
Remove the second network created for the drive
2017-12-05 16:40:04 +01:00
ansuz
291eb57027
fix auth app
2017-12-05 15:07:35 +01:00
yflory
52712c4bb9
Use the network from the async store for pads
2017-12-04 19:16:38 +01:00
yflory
de7806504b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-04 15:03:57 +01:00
yflory
f52d987515
Ability to resize avatars before uploading them
2017-12-04 15:03:43 +01:00
ansuz
34223e4b78
remove accidental inclusion
2017-12-04 13:59:57 +01:00
ansuz
0b54a76211
lint compliance
2017-12-04 13:58:33 +01:00
ansuz
cd29208267
fix toolbar's incorrect gotoDrive title
2017-12-04 11:46:15 +01:00
ansuz
e85e2dcabd
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-04 11:41:45 +01:00
ansuz
d3d9e2e771
WIP: refactoring rpc code
2017-12-04 11:10:25 +01:00
ansuz
afcc888a8b
make flat dom quiet again
2017-12-04 10:16:17 +01:00
yflory
e164edec03
Fix the webworker app
2017-12-01 18:29:59 +01:00
yflory
c59c6072f3
Remove jquery from outer
2017-12-01 16:05:23 +01:00
yflory
c6b8bbea59
Fix tests
2017-12-01 14:56:34 +01:00
yflory
04e02871bc
Merge branch 'refactor2' into staging
2017-12-01 14:50:19 +01:00
yflory
4903bd0757
Enable messenger in async store
2017-12-01 14:49:21 +01:00
yflory
bd85f1b003
Fix file upload and remove unnecessary dependencies
2017-12-01 10:16:48 +01:00
Caleb James DeLisle
5187b3f26c
Flow compliance and fix a few bugs in rpc.js
2017-11-30 18:32:20 +01:00
yflory
664625a6ef
Fix more async store issues
2017-11-30 18:22:26 +01:00
yflory
5c3237e093
Fix issues with the async store
2017-11-30 17:21:58 +01:00
yflory
b3688db202
Use async store
2017-11-30 15:01:17 +01:00
yflory
0840570fbf
Async store part 1
2017-11-30 10:33:09 +01:00
ansuz
385ac9607c
pass 'self' into common-util instead of using window
2017-11-27 18:26:04 +01:00
yflory
74e59a513a
Add the markdown toolbar to the slide and poll apps
2017-11-27 17:55:20 +01:00
yflory
644f6e9985
Use the bounce app to open links from inner
2017-11-27 14:44:44 +01:00
ansuz
812df7de6f
Merge branch 'merge-staging' into staging
2017-11-27 12:18:34 +01:00
ansuz
be5c5831dd
lint compliance
2017-11-27 12:18:04 +01:00
yflory
b0f553e9ea
Add a markdown toolbar to help with the markdown syntax
2017-11-27 12:17:35 +01:00
ansuz
4ff4ccd1d3
use faster and more correct 'find' implementation
2017-11-27 11:30:50 +01:00
ansuz
701af29192
fix broken register/login process
2017-11-24 15:12:00 +01:00
ansuz
a3c093838c
merge latest staging and resolve conflicts
2017-11-24 13:46:59 +01:00
ansuz
56102d3689
use unified listmap
2017-11-24 13:40:21 +01:00
ansuz
661db129b2
lint compliance
2017-11-24 10:32:58 +01:00
ansuz
80978377f2
return transformed cursor value
2017-11-24 10:03:45 +01:00
ansuz
ee6c2097f5
resolve merge conflicts
2017-11-23 16:56:49 +01:00
yflory
9795ac32cb
Ability to burn an anonymous drive from the browser
2017-11-23 14:36:42 +01:00
yflory
280a7c2765
Clean cryptpad-common
2017-11-23 12:28:49 +01:00
yflory
eba1c9dfac
Add chainpad log to the debug app
2017-11-21 18:50:33 +01:00
yflory
30cea8888d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-11-21 17:37:53 +01:00
yflory
06011065d2
Add a debug app
2017-11-21 17:37:38 +01:00
ansuz
60c4973d62
resolve merge conflicts
2017-11-21 17:22:06 +01:00
ansuz
585f9d2e4e
repair broken 'clear channel' button
2017-11-21 17:19:35 +01:00
yflory
000f3edd1d
Constants file
2017-11-21 16:47:19 +01:00
yflory
477f14bb8b
Put constants in a separate file
2017-11-21 16:46:19 +01:00
yflory
7f88d1d43a
Improve drive loading speed
2017-11-21 11:09:59 +01:00
yflory
06ede6b294
Fix export in apps using framework
2017-11-21 10:26:33 +01:00
yflory
c35e3d644e
Make sure dates are stored as numbers in the drive
2017-11-20 15:37:23 +01:00
yflory
655dfe971d
Add translation for the edit username button in the userlist
2017-11-20 14:28:35 +01:00
ansuz
d1beb6493b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-11-20 12:20:13 +01:00
ansuz
b96ea47f1f
strip tracking parameters when parsing urls
2017-11-20 12:09:17 +01:00
yflory
fc02f97d78
Use less2 classes in the user menu
2017-11-17 18:20:45 +01:00
yflory
41a082c46d
Fix video thumbnails
2017-11-17 18:20:02 +01:00
yflory
af8aa25228
Add an option to never rename a file during the session
2017-11-17 10:57:54 +01:00
yflory
31b31654ec
Lint compliance
2017-11-16 18:57:33 +01:00
yflory
25d3d321da
Ability to rename a file before uploading it to the server
2017-11-16 18:11:13 +01:00
yflory
2813b7219e
Fix the public key using the wrong domain in settings
2017-11-16 13:35:07 +01:00
yflory
a96e49d55a
Fix filepicker creating a new netflux network when initialized
2017-11-15 16:56:50 +01:00
yflory
630ac45948
Fix laggy and blinking tooltips
2017-11-15 16:31:26 +01:00
yflory
1f53304ad3
Display a dropdown menu inside another one
2017-11-15 15:35:28 +01:00
yflory
014e12b5b5
Ability to update the username from the userlist
2017-11-15 11:32:54 +01:00
yflory
7cfe64fc5b
Remove cryptpad-common dependency for some inner apps
2017-11-13 18:09:19 +01:00
yflory
1514ad5df3
Move the 'logged out' screen inside the sframe
2017-11-13 17:29:00 +01:00
yflory
5a2afb5c95
Remove Realtime and Messaging from common
2017-11-13 17:01:09 +01:00
yflory
30c8c253dd
Remove util and hash from common
2017-11-13 16:32:40 +01:00
yflory
c9e1de042c
Remove common-interface dependency from cryptpad-common
2017-11-13 12:00:26 +01:00
yflory
dc207393fd
Separate UI elements from cryptpad-common
2017-11-13 10:23:18 +01:00
Caleb James DeLisle
50da6b3b2e
Needs to be handled in chainpad-listmap
...
Revert "Do content checks on the drive so if it gets corrupted, the patch will be rejected"
This reverts commit eaa7b6e8e5
.
2017-11-11 01:34:20 +01:00
Caleb James DeLisle
eaa7b6e8e5
Do content checks on the drive so if it gets corrupted, the patch will be rejected
2017-11-11 01:26:54 +01:00
yflory
354c63bd64
Clean old code
2017-11-09 18:17:49 +01:00
Caleb James DeLisle
ac66511f0a
Merge branch 'staging' into new-diff
2017-11-09 17:44:45 +01:00
yflory
f931574dac
lint compliance
2017-11-09 17:23:13 +01:00
Caleb James DeLisle
7b62a8042e
Remove TextPatcher and begin to include ChainPad directly using requirejs instead of sniffing off the window
2017-11-09 17:07:04 +01:00
Caleb James DeLisle
840cd91bcb
manual merge
2017-11-09 15:38:32 +01:00
Caleb James DeLisle
75130150d5
Refactored out TextPatcher and JsonOT and replaced with new ChainPad
2017-11-09 15:36:49 +01:00
yflory
101482b8cc
Migrate settings to use a sandboxed iframe
2017-11-09 14:23:40 +01:00
yflory
c1ba08cfc6
Make sure thumbnails are .png
2017-11-07 15:04:45 +01:00
yflory
0956905ca8
Wipe localForage on log out
2017-11-07 14:56:50 +01:00
yflory
6b9ffe8dd1
Make thumbnails more secure
2017-11-07 14:51:53 +01:00
ansuz
e07bb0f7b3
roll back to old transform function, except in pad
2017-11-06 17:18:10 +01:00
yflory
a592317e35
lint compliance
2017-11-06 15:49:40 +01:00
yflory
fef97ed60e
Fix an creating duplicates mediatags in markdown preview
2017-11-06 15:47:18 +01:00
yflory
9060464f37
Create thumbnails only when the tab is not focused
2017-11-06 13:36:54 +01:00
yflory
a37e6c7979
lint compliance
2017-11-03 18:39:06 +01:00
yflory
2a3a5c4342
Ability to disable thumbnails
2017-11-03 18:38:27 +01:00
yflory
1871749b6f
Fix -1 viewer in the userlist when disconnected
2017-11-03 15:14:23 +01:00
yflory
cf3024ef5b
Ability to display an error in the toolbar state
2017-11-03 14:30:59 +01:00
yflory
8de9a596f1
Fix cursor in thumbnails
2017-11-02 19:11:27 +01:00
yflory
fd7bb3aadb
Make sure the infinite spinner modal is not displayed multiple times
2017-11-02 17:47:19 +01:00
yflory
3ebb5ca493
Fix issue in diffMarked creating text nodes for each character
2017-10-31 18:19:30 +01:00
yflory
4250688856
Migrate profile to use sframe
2017-10-30 18:49:28 +01:00
ansuz
4c0049ad55
don't log presence of other users as 'joins' when you have first joined
2017-10-27 14:20:31 +02:00
ansuz
325f685f3e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-27 14:14:25 +02:00
ansuz
1cbf1aec92
prevent undefined access in non-sframe apps
2017-10-27 14:14:19 +02:00
yflory
ac1b67ad67
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-27 13:31:54 +02:00
yflory
1245b4d244
Enable thumbnails in poll and whiteboard
2017-10-27 13:31:41 +02:00
ansuz
df1a700cb2
disable thumbnail test. add test for flat dom
2017-10-27 11:01:22 +02:00
ansuz
02cd7e5b58
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-27 10:44:53 +02:00
ansuz
69890ebd8f
prototype alternate datastructure for trees in listmap
2017-10-27 10:43:44 +02:00
ansuz
23c305f71f
implement removeItem so localForage doesn't complain
2017-10-27 10:37:44 +02:00
yflory
6f020b67ca
Add thumbnails to framework apps
2017-10-26 12:31:16 +02:00
yflory
bf817f20ee
Fix file upload in code and slide
2017-10-25 12:31:22 +02:00
yflory
24572a40d2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-24 18:50:19 +02:00
yflory
f4adbd980e
Thumbnails for the code app
2017-10-24 18:49:58 +02:00
ansuz
69f9a7ebf3
make userlist change notifications configurable
2017-10-24 17:29:58 +02:00
Caleb James DeLisle
027b9fa383
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-24 18:03:31 +03:00
Caleb James DeLisle
aa37997aa3
Enable JSON-OT again because it is working now that the arguments are passed in the right order <facepalm>
2017-10-24 18:02:03 +03:00
ansuz
bac608adfe
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-24 16:56:13 +02:00
ansuz
dc90811090
only call onReady once in sframe-listmap
2017-10-24 16:56:08 +02:00
yflory
bac10472f3
lint compliance
2017-10-24 14:32:47 +02:00
yflory
39b4cb9226
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-24 14:31:56 +02:00
yflory
18b5b20d27
Add thumbnails for PDFs
2017-10-24 14:31:42 +02:00
ansuz
aee51f1317
lint compliance
2017-10-24 14:02:29 +02:00
ansuz
447b0a74ee
handle errors for videos when uploading
2017-10-24 13:45:27 +02:00
yflory
30a69fae13
Add thumbnails for videos
2017-10-24 12:26:04 +02:00
yflory
21f8ae7570
Keep the correct ratio for image thumbnails
2017-10-24 11:45:07 +02:00
yflory
2be22867c1
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-23 14:39:31 +02:00
yflory
13718d0263
Fix recent pads in chrome
2017-10-23 14:38:38 +02:00
ansuz
2e5fdf709a
Merge branch 'soon' into staging
2017-10-23 14:29:01 +02:00
Caleb James DeLisle
9b02b36724
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-23 14:22:54 +03:00
Caleb James DeLisle
d7e9498143
Fix and then disable the new OT
2017-10-23 14:22:33 +03:00
ansuz
288e141c1f
add missing sframe method
2017-10-23 12:33:50 +02:00
yflory
c1d05a00ba
Improve media-tag export in pad to work with existing CSP
2017-10-23 10:55:40 +02:00
yflory
3e4faf1be1
Add new state messages in the toolbar
2017-10-20 18:12:47 +02:00
yflory
6d080bcb45
Ability to export mediatag images in pad
2017-10-20 18:10:08 +02:00
yflory
a0dd867f33
Fix pending state not removed after friend invite rejected
2017-10-20 18:09:09 +02:00
yflory
c25be21138
Fix the upgrade button in the drive
2017-10-20 10:16:01 +02:00
Caleb James DeLisle
cc6b2192e4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-20 10:26:27 +03:00
yflory
515214aed1
Use present mode in embed code
2017-10-19 11:59:07 +02:00
yflory
201c974df6
Merge branch 'thumbnails' into staging
2017-10-19 11:43:43 +02:00
Caleb James DeLisle
81d0b3272d
Fix multiple infinite-spinner errors piling up on top of eachother
2017-10-18 14:49:50 +03:00
Caleb James DeLisle
9e4c48f537
lint errors
2017-10-18 12:25:13 +03:00
Caleb James DeLisle
a149152f11
Merge branch 'staging' into framework
2017-10-18 11:42:31 +03:00
yflory
4116d08dd1
Display thumbnails in the drive and then file picker
2017-10-17 17:17:31 +02:00
yflory
6920129126
Embed images from the drive in whiteboard
2017-10-17 12:19:57 +02:00
MacLemon
867b971c33
Compressed images: PNG recompressed pixel identical, JPGs recompressed visually identically. Saving about 9.8%≈580kB overall, to speed up initial and repeating client connections.
2017-10-14 00:31:31 +02:00
yflory
2fd120100a
Merge branch 'wb' into staging
2017-10-13 16:58:59 +02:00
Caleb James DeLisle
15337603bb
Merge branch 'staging' into framework
2017-10-13 13:41:24 +03:00
Caleb James DeLisle
854c1e94a4
make infinite spinner error message go away if ChainPad settles after it has been popped
2017-10-13 13:39:49 +03:00
yflory
6926d42292
Autoload template picker to make it faster to appear when used
2017-10-12 18:18:01 +02:00
yflory
1c8e1a36e8
Add file type in the pad attributes for existing files
2017-10-12 17:43:49 +02:00
yflory
b86f8e3f26
Fix uloaded files not moved to the correct folder in drive
2017-10-12 17:33:22 +02:00
Caleb James DeLisle
753e2d797e
Merge branch 'staging' into framework
2017-10-12 17:07:10 +03:00
yflory
62bc72847f
Add an error message when trying to tag a deleted pad
2017-10-12 15:06:29 +02:00
Caleb James DeLisle
c773b5d076
Remove a brittle test which can make a pad inaccessible, switch from transformFunction to (new) patchTransformer and add another DOM.normalize() which is needed
2017-10-12 15:42:09 +03:00
yflory
69dd3a60ab
Hide template and fileupload buttons for anonymous users
2017-10-12 14:32:12 +02:00
yflory
8e1f15e88d
Get title suggestion based on poll's description
2017-10-12 14:12:26 +02:00
yflory
95ad25973e
Ability to delete a stronger pad from readonly mode
2017-10-12 11:41:53 +02:00
yflory
b28c1537e8
Fix history in readonly mode
2017-10-12 10:59:23 +02:00
ansuz
f0bdc3b26f
second try
2017-10-09 16:57:30 +02:00
ansuz
d50a692986
add note about tags to prompt
2017-10-09 16:51:57 +02:00
Caleb James DeLisle
c8928a0811
Switch the transform function and also stop calling textPatcher without the metadata
2017-10-09 17:07:26 +03:00
yflory
035150614d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-09 15:38:08 +02:00
yflory
484e216054
Fix hashtag button in the toolbar
2017-10-09 15:37:37 +02:00
ansuz
a12239405b
fix toolbar 'home link' to visit home page from drive
2017-10-09 15:10:38 +02:00
Caleb James DeLisle
828a685ba8
Fix broken browser fight logging
2017-10-09 14:12:55 +03:00
yflory
aa744567ed
Fix thumbnails in sframe apps
2017-10-09 11:52:34 +02:00
yflory
5e7bf0cfb8
Embed an image in whiteboard
2017-10-09 10:32:24 +02:00
Caleb James DeLisle
f0eb58ee95
Merge branch 'staging' into framework
2017-10-06 14:50:35 +03:00
yflory
1c7c37c121
Add the file class to pads in 'template' and 'recent' categories in the drive
2017-10-05 18:07:05 +02:00
yflory
ab3648a30a
Merge branch 'newpoll' into staging
2017-10-05 17:56:17 +02:00
ansuz
503111d26a
use recompiled media-tag
2017-10-05 17:00:47 +02:00
ansuz
427afc3954
override modified file name in pdfjs
2017-10-05 16:59:55 +02:00
ansuz
d85db64939
add tags from drive
2017-10-05 16:58:34 +02:00
Caleb James DeLisle
0aecfad854
Occasionally the language selector only says "Mode" rather than the language
2017-10-05 16:12:49 +03:00
ansuz
1f35798194
stop event propagation from tag prompt
2017-10-05 15:08:34 +02:00
Caleb James DeLisle
d9e97b86e6
Merge branch 'staging' into framework
2017-10-05 12:14:37 +03:00
Caleb James DeLisle
383c2f54cb
1. Add a class cp-hidden-if-readonly which is display:none if the pad is in read-only mode. 2. Don't show color pickers or options when in read-only on presentation.
2017-10-05 12:14:03 +03:00
yflory
26dfc65c25
Comments in polls
2017-10-04 19:06:16 +02:00
yflory
68bda92291
Use codemirror for description in poll
2017-10-03 19:04:29 +02:00
ansuz
b8ce149db6
add hint about tag usage
2017-10-03 18:36:34 +02:00
Caleb James DeLisle
d6570ad9f2
Standardize media-tag embedder and make media tags always absolute URL, Standardize import/export logic for codemirror apps, fix arrow key navigation in presentation fullscreen mode before first click.
2017-10-03 17:57:57 +03:00
yflory
5cf86bf74a
Update UI in poll and remove old code
2017-10-03 14:11:11 +02:00
ansuz
09c0a473e2
fix function signatures
2017-10-03 14:08:40 +02:00
yflory
3337689630
Wrong translation key in toolbar
2017-10-03 14:04:07 +02:00
yflory
126742a1c3
Fix bugs in sframe poll and update UI
2017-10-02 19:02:31 +02:00
ansuz
351b95d6a9
resolve merge conflicts
2017-10-02 18:59:47 +02:00
ansuz
6c7b135f91
lint compliance
2017-10-02 18:58:18 +02:00
ansuz
94c392b79f
secure messaging
2017-10-02 18:57:17 +02:00
Caleb James DeLisle
53f65f6a87
Merge branch 'staging' into framework
2017-10-02 17:46:27 +03:00
Caleb James DeLisle
fa6938baa8
1. Migrated /slide/ to use framework
...
2. Fixed CSS not being applied on /slide/
3. Minor changes to /code/ to reuse code which is also used on /slide/
2017-10-02 17:34:37 +03:00
Caleb James DeLisle
1e5bc5da14
onReady should only be called once, onContentUpdate should be able to throw and there should be a generic normalizer
2017-10-02 15:09:25 +03:00
Caleb James DeLisle
12e82e80ec
When changing the title of a presentation, the title in the bottom of the slide should also change
2017-10-02 15:04:44 +03:00
ansuz
48c49e5a75
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-28 10:23:59 +02:00
ansuz
19e58cec94
prevent typeError
2017-09-28 10:23:48 +02:00
Caleb James DeLisle
f95acda758
Minor refactoring of /pad/ ; moved /*/main.js into a common file ; framework'd /code/
2017-09-27 16:53:16 +02:00
Caleb James DeLisle
6dbc02e81a
Merge branch 'staging' into framework
2017-09-27 12:01:18 +02:00
Caleb James DeLisle
1c791b5b51
Fix framework by removing some async and also fix media tags
2017-09-27 11:58:14 +02:00
Caleb James DeLisle
90d00c10b1
Make metadata-manager a bit more robust
2017-09-27 11:56:25 +02:00
yflory
8de1852ab9
Lint compliance
2017-09-27 10:36:16 +02:00
yflory
b4de31c827
Merge branch 'newdrive' into staging
2017-09-27 10:28:16 +02:00
Caleb James DeLisle
342b6012f7
manual merge of staging into framework
2017-09-26 17:11:45 +02:00
Caleb James DeLisle
cf6030ab8b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-26 15:58:33 +02:00
Caleb James DeLisle
e62c5e1d07
Add some debugging lines to help synthesize error cases
2017-09-26 15:58:25 +02:00
yflory
345bfc1cea
Remove migration for pad attributes
2017-09-26 14:36:49 +02:00
ansuz
b3e066eaca
show loading screen tips during loading screen
2017-09-26 10:59:25 +02:00
Caleb James DeLisle
77fe6a9bba
small bug fixes
2017-09-26 10:23:35 +02:00
Caleb James DeLisle
1b01855dd2
Merge branch 'staging' into framework
2017-09-25 18:11:57 +02:00
Caleb James DeLisle
1fd7a6e2b3
Mistake in mkEvent which makes all events only work once
2017-09-25 18:03:31 +02:00
Caleb James DeLisle
368a6b2406
manual merge, still wip
2017-09-25 17:35:25 +02:00
yflory
cdeac00633
Merge branch 'staging' into newdrive
2017-09-25 17:35:06 +02:00
yflory
a8eecee590
Fix access to undefined variable in drive
2017-09-25 17:29:31 +02:00
yflory
91e36171eb
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-25 17:09:41 +02:00
yflory
138ad17e3e
Fix 'import local pads' in settings creating duplicates
2017-09-25 17:09:26 +02:00
yflory
d2f1d0c0e9
Fix readme pad not added at registration in sframe drive
2017-09-25 16:09:54 +02:00
Caleb James DeLisle
ae54cbca33
Refactor sframe-cpnf-inner to export chainpad
2017-09-25 15:46:04 +02:00
Caleb James DeLisle
44018ee7e1
Improve the LessLoader check to hopefully stop the message saying cookies were blocked.
2017-09-25 15:45:56 +02:00
Caleb James DeLisle
b15527565c
Allow passing arguments when firing events
2017-09-25 15:45:49 +02:00
Caleb James DeLisle
0eb2165f31
Implement a new pad framework and make it work (seemingly) with /pad/
2017-09-25 15:45:08 +02:00
Caleb James DeLisle
d9845d3450
Refactor sframe-cpnf-inner to export chainpad
2017-09-25 15:44:03 +02:00
Caleb James DeLisle
f418ee9632
Improve the LessLoader check to hopefully stop the message saying cookies were blocked.
2017-09-25 15:43:02 +02:00
Caleb James DeLisle
72f03b2a47
Allow passing arguments when firing events
2017-09-25 15:42:08 +02:00
yflory
6aeb366767
Lint
2017-09-25 14:47:19 +02:00
yflory
0600ce59ec
Display the 'spinner' when typing in sframe apps
2017-09-25 13:19:25 +02:00
yflory
1d7683503f
Fix link origin in sframe upload table
2017-09-25 12:44:05 +02:00
yflory
92c808812a
Fix missing style in toolbar/less2
2017-09-25 11:59:05 +02:00
yflory
4049931924
Lint
2017-09-25 11:51:24 +02:00
yflory
c364377d7c
Use less2 in sframe drive
2017-09-25 11:48:42 +02:00
yflory
47fe7b1c53
Drive in sandboxed iframe
2017-09-22 19:35:06 +02:00
yflory
dfdeb7b113
Fix style and race condition for history mode
2017-09-21 18:00:33 +02:00
yflory
a810d7bd85
Fix style and race condition for history mode
2017-09-21 18:00:11 +02:00
yflory
456370b1aa
Base for Drive in sandboxed iframe
2017-09-21 17:59:26 +02:00
ansuz
95302366d1
lint compliance
2017-09-21 11:19:23 +02:00
ansuz
68f7d4bc0a
more conformant tagPrompt behaviour
2017-09-20 17:55:05 +02:00
ansuz
f990200996
drop any notion of crypto from sframe-listmap
2017-09-19 18:21:33 +02:00
ansuz
a1c124f1be
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-19 15:38:21 +02:00
ansuz
c9223cb942
listmap does not care about 'readOnly' mode anymore
2017-09-19 15:38:06 +02:00
yflory
88914ec6cc
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-19 15:36:38 +02:00
yflory
8a09e39f46
Enable tags in pads
2017-09-19 15:30:08 +02:00
ansuz
d2b27f3588
resolve merge conflicts
2017-09-19 14:24:26 +02:00
ansuz
4af01e6e9e
make listmap consume cpNfInner
2017-09-19 14:16:13 +02:00
yflory
6fdd66167a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-19 11:04:59 +02:00
yflory
732585ea7b
Sandboxed iframe for the whiteboard app
2017-09-19 10:27:31 +02:00
ansuz
d72146ba7f
use setAttribute for assigning attributes in hyperscript
2017-09-19 10:27:19 +02:00
yflory
a1e7bf701d
Select the element after clicking 'show in folder' in the drive search
2017-09-18 15:24:25 +02:00
yflory
1131ef0172
Fix language selection in sandboxed iframes
2017-09-18 14:26:54 +02:00
yflory
018f71df04
Add drop handlers for mediatags in ckeditor
2017-09-18 10:59:40 +02:00
ansuz
08e0ae424d
log errors in less compilation
2017-09-14 18:13:03 +02:00
ansuz
5b45e92250
delete range requests after they have completed
2017-09-14 12:08:41 +02:00
ansuz
47ce645897
implement slice
2017-09-14 11:51:33 +02:00
ansuz
6ed4f2fc64
fix a thing
2017-09-14 11:27:10 +02:00
ansuz
8a564bf350
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-14 11:23:51 +02:00
ansuz
513f8e73d4
refactor cryptpad.ready to use nthen
2017-09-14 11:23:37 +02:00
Caleb James DeLisle
b643ccc232
typo
2017-09-14 10:54:16 +02:00
Caleb James DeLisle
652c916690
change the command in the documentation so that it will not change itself
2017-09-14 10:52:55 +02:00
Caleb James DeLisle
845f75f8a7
remove a 100ms dead spot from page load
2017-09-14 10:48:59 +02:00
Caleb James DeLisle
b24e9b84af
Manual merge, update the CSS in loading.js and document that loading.less does nothing.
2017-09-14 10:48:35 +02:00
Caleb James DeLisle
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
2017-09-14 10:23:05 +02:00
ansuz
4d688289cc
lint-compliance
2017-09-13 18:19:15 +02:00
ansuz
2797a77f5d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 18:18:45 +02:00
yflory
47cfa0cf45
Focus the editable content when opening a codemirror pad
2017-09-13 18:09:55 +02:00
ansuz
f039fc7ff5
develop a system for avoiding z-index problems
2017-09-13 17:43:17 +02:00
yflory
bafa401473
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 17:22:48 +02:00
ansuz
fbd4be6135
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 16:32:41 +02:00
yflory
d360e2d0f4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 16:20:26 +02:00
yflory
ab64bf9e59
Use less2 for the loading screen
2017-09-13 16:19:26 +02:00
Caleb James DeLisle
710418f42f
Make LessLoader able to cache even inside of the sandbox iframe and don't load less compiler unless needed
2017-09-13 16:04:01 +02:00
ansuz
a332168926
fix some bugs in prompts, alerts, confirms
2017-09-13 15:52:31 +02:00
ansuz
0db33d48fc
properly handle variable args in Cryptpad.alert
2017-09-13 14:52:58 +02:00
Caleb James DeLisle
0d8c292fef
Merge branches 'staging' and 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 14:47:55 +02:00
Caleb James DeLisle
789a923792
Change font-awesome to be pulled through LessLoader which will rewrite the font file URLs to use ver= parameter
2017-09-13 14:47:50 +02:00
Caleb James DeLisle
d46cc8226d
Update LessLoader to be capable of loading CSS as well as less files and properly rewrite the URLs
2017-09-13 14:46:41 +02:00
ansuz
e1f090bb9d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 12:33:05 +02:00
ansuz
244e3ecba7
support forefront flag in alert config
2017-09-13 12:32:30 +02:00
Caleb James DeLisle
63cb5dfc1e
Make less loader rewrite urls to use version parameter
2017-09-13 12:04:24 +02:00
Caleb James DeLisle
d967df2cec
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 11:00:09 +02:00
Caleb James DeLisle
e3c0ec29f7
Hopefully chase out a race in sframe-channel
2017-09-13 11:00:00 +02:00
yflory
8c41e0bdd6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-12 18:40:20 +02:00
yflory
437f50fd4a
Migrate the file to a sandboxed iframe
2017-09-12 18:40:11 +02:00
Caleb James DeLisle
1713167a5d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-12 14:12:41 +02:00
Caleb James DeLisle
981a919328
Added tooltips back to sframe land with hopefully a more robust removal.
2017-09-12 14:12:35 +02:00
yflory
7d720c73a9
Merge branch 'soon'
2017-09-12 11:34:12 +02:00
yflory
ddbda08c88
Fix an issue when cleaning the template category in the drive
2017-09-12 11:32:32 +02:00
ansuz
9d229b8868
lint compliance
2017-09-12 11:30:43 +02:00
ansuz
a87ccdc37e
remove redundant lines
2017-09-12 11:27:24 +02:00
ansuz
da0e31fa54
guard against possible type errors
2017-09-12 11:20:50 +02:00
ansuz
a0b3201df3
fix focus on alerts, prompts, and confirms. call back from alerts
2017-09-12 10:49:48 +02:00
yflory
5a4836fe6d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-11 16:36:41 +02:00
yflory
79094aa4bb
Fix closing the title input when the title is not modified
2017-09-11 16:36:24 +02:00
ansuz
58c38dd77b
focus on the current window when you pop an alert
2017-09-11 16:34:00 +02:00
ansuz
b9545f45f7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-11 16:26:21 +02:00
ansuz
306fec2d0e
improve messages for template picker confirm
2017-09-11 16:25:58 +02:00
ansuz
1943c83f69
clean up api for Cryptpad.confirm
2017-09-11 16:24:43 +02:00
Caleb James DeLisle
8d3ebdbaf7
I'm stupid
2017-09-11 15:53:27 +02:00
Caleb James DeLisle
041071e61c
manual merge
2017-09-11 15:52:14 +02:00
Caleb James DeLisle
7334173b4a
Hopefully fix infinite spinner whenever there is a disconnect (pad)
2017-09-11 15:46:21 +02:00
yflory
304a8df808
Remove unneeded migration and fix attributes migration
2017-09-11 14:25:19 +02:00
ansuz
5a1abc8986
let's try using actual js syntax
2017-09-11 14:04:40 +02:00
ansuz
134c6057c1
Merge branch 'slide2' of github.com:xwiki-labs/cryptpad into origin/slide2
2017-09-11 14:01:05 +02:00
ansuz
59d25b4c1a
use camel case, not snek case
2017-09-11 14:00:27 +02:00
ansuz
520b8967fd
allow people with short passwords to log in
2017-09-11 13:54:48 +02:00
yflory
5bf966633c
Merge branch 'staging' into slide2
2017-09-08 18:21:38 +02:00
yflory
514bff7065
Add slide number in the title in slide2
2017-09-08 18:21:11 +02:00
ansuz
0ed6846e07
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-08 17:41:46 +02:00
ansuz
b5b9f931c7
don't use common-realtime
2017-09-08 17:41:05 +02:00
ansuz
32e8c8ef4b
implement alertify without alertify
2017-09-08 17:40:25 +02:00
yflory
c3a07e879c
Merge branch 'staging' into slide2
2017-09-08 16:23:07 +02:00
yflory
fc069dac48
Ask the user before loading the template picker
2017-09-08 16:21:12 +02:00
yflory
05793c220c
Fix secure iframes on Edge
2017-09-08 15:55:01 +02:00
yflory
290d668ceb
Fix race condition preventing slide to work on Edge
2017-09-08 15:53:53 +02:00
ansuz
739903d511
don't check account usage if you aren't logged in
2017-09-08 14:00:49 +02:00
ansuz
bbf7ed3827
refactor drive to use dialog.selectable()
...
fix class on alertify-like boxes
2017-09-08 12:24:20 +02:00
yflory
f2aaaa9751
Move slide to secure iframe
2017-09-07 18:56:58 +02:00
ansuz
809b56625d
refactor ui elements
2017-09-07 18:54:58 +02:00
ansuz
bca9ba66cb
enforce a configurable minimum password length when registering
2017-09-07 17:44:04 +02:00
ansuz
fab6264ce6
use loading screen from pages.js
2017-09-07 16:41:11 +02:00
ansuz
e8298f165a
only display first letter of name if user has no avatar
2017-09-07 16:35:24 +02:00
ansuz
85003f7a23
lint compliance
2017-09-07 14:21:54 +02:00
ansuz
cca3c04d43
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-07 12:45:18 +02:00
ansuz
15e24ebe4f
ui for hashtag picker
2017-09-07 12:45:07 +02:00
ansuz
1b97996ef8
implement util.once
2017-09-07 12:26:05 +02:00
yflory
0423a5f4e2
Clean secure iframe code
2017-09-06 18:26:10 +02:00
yflory
04a04aef2b
Add setAttribute/getAttribute in secure iframes. Store attributes in settings
2017-09-06 16:05:20 +02:00
yflory
61b228db79
Fix double / when storing a file
2017-09-06 11:41:09 +02:00
yflory
3ca9f41290
Get embed code for pad and code
2017-09-06 10:56:27 +02:00
yflory
0bb6698399
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-05 18:40:18 +02:00
yflory
e85b34f127
Add embed options in the secure pad hashes
2017-09-05 18:38:51 +02:00
ansuz
b3d5e04bb4
lint compliance
2017-09-05 17:23:16 +02:00
ansuz
3d2a2da74e
add listAllTags api
2017-09-05 16:52:22 +02:00
ansuz
0e8a26e8eb
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-05 15:37:02 +02:00
ansuz
1c50bb3f61
clear hung tooltips
2017-09-05 15:36:46 +02:00
yflory
53eb9bb541
Remove the logo from the filepicker loading screen
2017-09-05 15:34:38 +02:00
yflory
729c013af7
Get mediatag embed code from the file app
2017-09-05 15:08:05 +02:00
yflory
4108520d20
Add contacts in the new menu if the user is logged in
2017-09-05 11:43:16 +02:00
yflory
78b338c379
Merge branch 'code2' into staging
2017-09-05 11:38:17 +02:00
yflory
db86a2dbee
Merge branch 'code2' of github.com:xwiki-labs/cryptpad into code2
2017-09-05 11:36:31 +02:00
yflory
d2787e3eff
Make code2 the default code app
2017-09-05 11:36:02 +02:00
ansuz
4069945bc4
Merge branch 'code2' of github.com:xwiki-labs/cryptpad into code2
2017-09-05 11:27:11 +02:00
ansuz
cd7b00d45b
make pixels 100px
2017-09-05 11:25:47 +02:00
ansuz
b1a1f4ba13
add encrypted thumbnails to metadata for images.
...
correct decryption logic
2017-09-05 10:57:59 +02:00
ansuz
b8e913c95a
more thumbnail methods
2017-09-05 10:46:00 +02:00
ansuz
ffbb21dd2c
use cryptpad-september build of media-tag
2017-09-05 10:43:48 +02:00
yflory
86e23ac19f
Use less2 in secure iframes
2017-09-04 15:09:54 +02:00
yflory
f12f4bb925
Integrate filepicker secure iframe in the code2 app
2017-09-01 15:17:14 +02:00
ansuz
1072e3e797
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-31 18:12:21 +02:00
ansuz
ae60b5845f
implement search-by-tag for filesData
2017-08-31 18:12:13 +02:00
ansuz
72ef730f23
implement tag-related functions
2017-08-31 18:06:26 +02:00
ansuz
0302c06d0e
send feedback if client does not support symbols
2017-08-31 18:04:20 +02:00
ansuz
52019dc763
make get and set pad attribute return only cloned data
2017-08-31 18:02:44 +02:00
yflory
89b7b644f3
Enable drag & upload in code2 and prepare filepicker
2017-08-31 16:32:26 +02:00
Caleb James DeLisle
e2719d9098
Add media-tag-nacl to cryptpad so it will be hosted on the server
2017-08-31 16:28:48 +02:00
yflory
885282ddea
Fix undefined friend
2017-08-31 15:49:20 +02: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
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
a2ed266048
Move the code app in a secure iframe
2017-08-30 11:10:57 +02:00
ansuz
a34d1793e0
drop 'loading' text from loading screen
2017-08-29 18:15:40 +02:00
ansuz
181a19a9a0
polyfill for array.fill
2017-08-29 11:49:10 +02:00
yflory
51fa6287c1
Enable notifications in secure pads
2017-08-29 11:20:02 +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
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
430a6f7b77
lint compliance
2017-08-28 17:51:50 +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
yflory
d4589c4699
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-28 12:22:38 +02:00
yflory
6c65e5ff72
Fix the ghost icon in the drive and add missing text
2017-08-28 12:22:31 +02:00
ansuz
5c2b58e703
log error synchronously so we get a trace when pinPads has no callback
2017-08-28 11:47:01 +02:00
ansuz
841e3af8da
handle unfriends. clean up. better input validation
2017-08-28 11:46:05 +02:00
ansuz
c66a0c55e0
ensure that function signatures are correct
2017-08-28 11:40:31 +02:00
ansuz
91f6e3e543
remove a lot of dead code
2017-08-28 11:28:45 +02:00
ansuz
57d0c6c973
Merge branch 'new-messaging' into staging
2017-08-25 14:42:34 +02:00
ansuz
9e04d039d7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-25 14:42:23 +02:00
ansuz
22d754d514
handle user renames
2017-08-25 14:42:05 +02:00
Caleb James DeLisle
0a6f81850f
Handle infinite-spinner errors and properly inform the user
2017-08-25 14:24:43 +02:00
ansuz
f58d4c941f
clean up a bit
2017-08-24 17:19:57 +02:00
ansuz
b75a951a98
encode messages with 'author' field instead of 'channel'
2017-08-24 17:14:03 +02:00
Caleb James DeLisle
7bbea28831
minor anti-xss changes...
2017-08-24 13:53:42 +02:00
ansuz
013b75ae67
implement history range requests
2017-08-24 11:34:05 +02:00
ansuz
b71f1860db
make uid function reusable
2017-08-24 11:31:20 +02:00
Caleb James DeLisle
75fde58846
Well that was stupid... (fix bug introduced in acfaaa7d56
when trying to make jshint compliance)
2017-08-23 16:18:47 +02:00
Caleb James DeLisle
5d9599c9b7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-23 12:15:01 +02:00
Caleb James DeLisle
cbac5e417c
Make loading screen come much earlier on pad2
2017-08-23 12:14:51 +02:00
yflory
b6881349be
Fix an issue with the notifications in secure pads
2017-08-23 11:39:53 +02:00
yflory
ec64ac485d
Fix 'not a function' error
2017-08-23 11:06:55 +02:00
Caleb James DeLisle
acfaaa7d56
jshint compliance
2017-08-23 11:04:44 +02:00
Caleb James DeLisle
2ad9fcee17
Manual merge of notify.js
2017-08-23 10:45:55 +02:00
Caleb James DeLisle
8a9755611a
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-23 10:21:53 +02:00
Caleb James DeLisle
2dacd57e76
fix caching on favicon
2017-08-23 10:21:41 +02:00
yflory
33025a9df9
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-22 18:19:06 +02:00
yflory
c33b128bf4
Enable feedback in pad2
2017-08-22 18:18:58 +02:00
yflory
e81bb3fe08
Fix profile link in the userlist
2017-08-22 18:18:48 +02:00
ansuz
002eed0d6f
make most of the messenger api async
2017-08-22 15:55:00 +02:00
Caleb James DeLisle
d9f5e3638e
Big caching improvements :D
2017-08-22 15:50:10 +02:00
yflory
b4864b96ac
Add a recent pads category in the drive
2017-08-22 14:28:17 +02:00
Caleb James DeLisle
4f3b4a30ee
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-21 18:38:16 +02:00
Caleb James DeLisle
4b70fc9f49
Use resources from the original origin in pad2
2017-08-21 18:38:07 +02:00
yflory
aa9e0d3cd3
Enable AppConfig in pad2
2017-08-21 18:30:51 +02:00
yflory
f40d2c0b20
Add templates to pad2
2017-08-21 18:21:53 +02:00
yflory
8d020833af
Add missing file
2017-08-21 18:21:25 +02:00
yflory
8d837d22ea
Add history to pad2
2017-08-21 17:40:21 +02:00
yflory
b2e6df1f9d
Add import & export in pad2
2017-08-21 15:34:21 +02:00
yflory
e2d39de143
Forget button in pad2
2017-08-21 15:20:38 +02:00
yflory
e4020ba8d4
Fix pad creation in pad2
2017-08-21 14:41:56 +02:00
yflory
140c6f3776
Add limit warning in pad2
2017-08-21 12:24:33 +02:00
yflory
30aef71603
Enable avatars in pad2
2017-08-21 12:01:38 +02:00
yflory
f88a6f63fe
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-21 11:08:38 +02:00
yflory
fb4808e1e1
Fix queries callback arguments
2017-08-21 11:08:27 +02:00
Caleb James DeLisle
6dd1643738
Manual merge work done on loading page to pad2
2017-08-21 10:53:40 +02:00
Caleb James DeLisle
8b702e0150
wip
2017-08-21 10:34:49 +02:00
yflory
e65b2f4e9f
Add shareButton to pad2
2017-08-18 18:43:04 +02:00
yflory
beb45740d0
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-18 16:34:50 +02:00
yflory
90f892de9c
Useradmin menu, notifications and share button in pad2
2017-08-18 16:34:41 +02:00
ansuz
253ab68d8d
Merge branch 'staging' into new-messaging
2017-08-18 15:31:06 +02:00
Caleb James DeLisle
498c8229e9
Make following a link inside of the iframe only fail rather than carrying the iframe away from the pad.
2017-08-18 14:12:30 +02:00
ansuz
0693a98890
create a thumbnail when uploading images from whiteboard
2017-08-18 12:53:02 +02:00
ansuz
b17044ad98
add support for thumbnails in metadata
2017-08-18 12:47:04 +02:00
yflory
dd9b38066e
Change display name in useradmin menu
2017-08-18 11:07:42 +02:00
yflory
a96d447e8b
Add notifications in pad2
2017-08-18 10:47:30 +02:00
Caleb James DeLisle
cf6d8c83b2
Fix title setter logic and separate it from UI
2017-08-17 19:58:48 +02:00
Caleb James DeLisle
ec87f3f897
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-17 19:01:40 +02:00
Caleb James DeLisle
415399ef64
Changes to support title change in metadata
2017-08-17 19:01:33 +02:00
yflory
d1affebd14
Title in pad2
2017-08-17 19:01:03 +02:00
yflory
604415b32c
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-17 18:29:24 +02:00
yflory
fab3d67b75
Enable title in pad2
2017-08-17 18:28:05 +02:00
Caleb James DeLisle
909bda4302
This should fix laxy metadata
2017-08-17 18:26:58 +02:00
ansuz
a4dbf39c4a
fix pdf display problems in chrome
2017-08-17 18:11:46 +02:00
Caleb James DeLisle
2490ee253f
Added setDisplayName RPC
2017-08-17 18:09:17 +02:00
yflory
887a26b1a6
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-17 17:34:47 +02:00
Caleb James DeLisle
0b34ceb0eb
Added RPC setPadTitleInDrive()
2017-08-17 17:34:08 +02:00
ansuz
bed7d95bf3
use latest compiled cryptpad media-tag
2017-08-17 17:31:52 +02:00
ansuz
3a5526e247
infer pdfjs document title from iframe url
2017-08-17 17:30:28 +02:00
yflory
25466aa2f9
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-17 17:26:27 +02:00
yflory
1d237735ef
Useradmin menu in pad2
2017-08-17 17:26:20 +02:00
Caleb James DeLisle
3b5af3ea74
sframe common changes
2017-08-17 16:56:18 +02:00
yflory
d1157c4d72
Add missing file
2017-08-17 16:28:54 +02:00
yflory
d237c76f6c
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-17 16:25:31 +02:00
yflory
f5855a2870
Add account name in metadata manager
2017-08-17 16:25:25 +02:00
Caleb James DeLisle
3c0197cbf4
Firefox fails to boot the iframe if there is no number on setInterval
2017-08-17 16:17:57 +02:00
yflory
d88704fb50
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-17 15:44:41 +02:00
Caleb James DeLisle
a4850a7fcc
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-17 15:42:28 +02:00
yflory
fc5bdd3bed
Add lazy metadata to fix parse errors in pad2
2017-08-17 15:42:26 +02:00
Caleb James DeLisle
ad9f2ff223
Made pad2 server more generic and easy to implement
2017-08-17 15:41:04 +02:00
ansuz
a125253cde
lint compliance
2017-08-17 15:13:05 +02:00
ansuz
290763d6c5
don't complain about bad realtime state just because you disconnected
2017-08-17 15:07:34 +02:00
yflory
226ef1fd00
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-17 14:55:53 +02:00
yflory
fb512c8923
Toolbar in pad2
2017-08-17 14:55:44 +02:00
ansuz
3b20dcd435
add optional cache-busting to favicon
2017-08-17 14:34:22 +02:00
ansuz
ee874878dd
clear tooltips when the userlist is redrawn
2017-08-17 12:50:40 +02:00
ansuz
f207edfd28
handle errors when deriving keys. fix incorrect reference
2017-08-17 12:50:12 +02:00
Caleb James DeLisle
e04c0b89a1
manual merge of staging
2017-08-17 12:14:19 +02:00
ansuz
130b330ede
refactor messaging
2017-08-16 10:04:50 +02:00
ansuz
736288a85b
lint compliance
2017-08-14 14:02:57 +02:00
ansuz
5037f444e9
update markdown sanitization strategy
2017-08-14 13:12:43 +02:00
Caleb James DeLisle
878a565f89
tiny little performance improvement in something that really doesn't need it
2017-08-11 17:34:51 +02:00
Caleb James DeLisle
7a698d092e
When Cryptpad.clearTooltips() gets called, don't clear tooltips unless their associated element has gone missing so it won't clear a tip someone is trying to read.
2017-08-11 17:28:23 +02:00
Pierre Bondoerffer
17b986a6ca
fix toolbar drive link (oops)
2017-08-11 12:56:06 +02:00
ansuz
284124a32d
WIP
2017-08-11 10:59:54 +02:00
Caleb James DeLisle
4acd9957a9
Set the url if there is none
2017-08-11 10:40:57 +02:00
Caleb James DeLisle
33e73dd5e5
fixed one last fight
2017-08-10 21:40:34 +02:00
Caleb James DeLisle
9c0b0cc6a8
Merge branch 'staging' into pad2
2017-08-10 18:39:16 +02:00
Caleb James DeLisle
1e56fa31c0
yay, they talk and they don't fight
2017-08-10 18:31:44 +02:00
ansuz
1c526feffb
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-10 18:06:58 +02:00
Caleb James DeLisle
b3d349bf80
Merge branch 'staging' into pad2
2017-08-10 14:53:12 +02:00
Caleb James DeLisle
8efac4e661
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
2017-08-10 14:49:41 +02:00
Caleb James DeLisle
0dde1d7507
wip
2017-08-10 14:49:21 +02:00
Pierre Bondoerffer
baf64114a6
point to homepage in drive
2017-08-10 14:45:56 +02:00
Caleb James DeLisle
c304071492
wip
2017-08-09 17:37:55 +02:00
Caleb James DeLisle
e49a42db18
Merge branch 'staging' into pad2
2017-08-09 16:28:51 +02:00
Caleb James DeLisle
1f9bd866c3
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
2017-08-09 16:06:46 +02:00
Pierre Bondoerffer
edad5deeac
fix logo not showing sometimes in chrome
2017-08-09 16:06:29 +02:00
Caleb James DeLisle
52565076b9
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
2017-08-09 14:48:06 +02:00
Caleb James DeLisle
4b25ab80d6
wip
2017-08-09 14:45:39 +02:00
ansuz
844967a880
continued refactoring
2017-08-09 14:20:37 +02:00
Pierre Bondoerffer
a4aeada585
make the file dialog placeholder visible, center file list
2017-08-09 11:20:46 +02:00
Pierre Bondoerffer
e08ed72653
generate the tooltip after the button
2017-08-09 11:11:53 +02:00
Pierre Bondoerffer
665e81912e
put the tooltip on the actual button to prevent tippy from popping when not intended
2017-08-09 11:06:06 +02:00
Pierre Bondoerffer
34ba673cd3
improve file upload UI
2017-08-09 10:54:20 +02:00
ansuz
34a5a32c44
lint compliance
2017-08-08 20:29:02 +02:00
ansuz
cdf3cee9c8
split out message rendering into ui
2017-08-08 18:21:03 +02:00
ansuz
fcdfa52aa9
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-08 17:13:38 +02:00
ansuz
58b3b32cc3
big messaging refactor. split UI from logic
2017-08-08 17:13:10 +02:00
Pierre Bondoerffer
6ca6755d02
more missing titles in toolbar
2017-08-08 16:51:23 +02:00
Pierre Bondoerffer
d3f2398865
bump tippy to 1.2.0, add dynamicTitle option
2017-08-08 16:19:44 +02:00
ansuz
8301bd44be
Merge pull request #164 from pbondoer/staging
...
UI improvements
2017-08-08 14:46:25 +02:00
Pierre Bondoerffer
f585ddccdf
fix image sizes in /slide/
2017-08-08 11:44:01 +02:00
ansuz
fc95f1b6a8
lint compliance
2017-08-08 10:32:25 +02:00
ansuz
ba9696ba33
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-08 10:03:54 +02:00
Caleb James DeLisle
a612f02be2
Merge branch 'staging' into pad2
2017-08-07 17:49:03 +02:00
ansuz
c63807fd2b
implement channel.send
2017-08-07 17:24:16 +02:00
Caleb James DeLisle
35a55a15ed
wip
2017-08-07 17:23:28 +02:00
ansuz
d835005905
simplify in-memory message format
2017-08-07 17:22:56 +02:00
Pierre Bondoerffer
8f285eba9f
make file picker ui even prettier
2017-08-07 17:22:54 +02:00
ansuz
797cc2b105
handle messages which fail to decrypt
2017-08-07 17:21:23 +02:00
Caleb James DeLisle
65dfd99171
major wip
2017-08-07 16:27:57 +02:00
Pierre Bondoerffer
c53e738054
improve file picker ui
2017-08-07 16:27:29 +02:00
ansuz
bad5160885
fix bad reference
2017-08-05 09:14:36 +02:00
ansuz
05aa5ed347
hide new feature until it is finished
2017-08-04 18:07:47 +02:00
ansuz
395f6e1b27
reset confirm text for alertify
2017-08-04 15:54:15 +02:00
ansuz
9865359bb0
don't tell users about new versions
2017-08-04 14:05:00 +02:00
ansuz
c8c44d3bfc
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-04 11:22:22 +02:00
Caleb James DeLisle
0d1f19f5d4
Big manual merge
2017-08-04 11:20:17 +02:00
Pierre Bondoerffer
f6d45d05f6
use logo in toolbar
2017-08-04 11:01:26 +02:00
ansuz
11c72499a0
don't add duplicate messages to the history
2017-08-03 17:06:28 +02:00
ansuz
52854c5a8e
ignore history range responses
2017-08-03 15:05:04 +02:00
ansuz
e786117110
get new messages when reconnecting and WIP get more history
2017-08-03 15:04:29 +02:00
ansuz
2ce341fed6
disable input field when disconnected
2017-08-03 14:12:07 +02:00
ansuz
66d81429bd
integrate file embed into code editor
2017-08-03 11:47:54 +02:00
ansuz
8b0831ac5d
save images drawn with whiteboard to your CryptDrive
2017-08-02 16:51:41 +02:00
ansuz
fe826133b3
make some markdown styles reusable
2017-08-02 11:03:06 +02:00
ansuz
35cf23ce2c
clear tooltips when redrawing the userlist
2017-08-01 11:50:43 +02:00
ansuz
4c6f8d71e1
don't invoke spinner if it does not exist
2017-08-01 11:08:25 +02:00
ansuz
311f709dc4
lint compliance
2017-07-31 17:15:17 +02:00
ansuz
c147d342a3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-31 15:45:50 +02:00
ansuz
542d0cd17f
drop support for legacy pad list
2017-07-31 15:34:56 +02:00
Pierre Bondoerffer
93e007b52a
reduce png sizes
2017-07-31 15:11:35 +02:00
ansuz
3fa010027c
implement clearTooltips
2017-07-31 12:29:41 +02:00
ansuz
a68a225d79
fix read-only synchronization bug
2017-07-31 12:21:48 +02:00
CatalinScr
796bf89491
Update of the front-page
2017-07-24 17:56:54 +03:00
Nicolas Lemoine
658b00814b
TodoApp - Style and translations
2017-07-23 16:08:49 +03:00
ansuz
ae693ff5a7
lint compliance
2017-07-23 09:01:12 +02:00
ansuz
6622735db0
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-22 14:15:15 +02:00
ansuz
55cb0734e2
make bad state timeout configurable
2017-07-22 10:56:39 +02:00
yflory
469f49fc0a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-20 18:32:12 +02:00
yflory
a80b00a765
Move the file picker in common
2017-07-20 18:32:03 +02:00
ansuz
d44f0696af
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-20 18:24:53 +02:00
ansuz
2d0635a409
use custom version of tippy
2017-07-20 18:23:51 +02:00
yflory
09793e0d7d
jshint
2017-07-20 18:21:10 +02:00
yflory
683769f30a
Fix tooltips
2017-07-20 18:19:59 +02:00
yflory
9633025afe
CSS for the removeHistory button in contacts
2017-07-20 17:26:33 +02:00
yflory
97f1bbedc5
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-20 17:08:28 +02:00
yflory
b9bba76b4e
Make the delay for tooltips configurable
2017-07-20 17:08:11 +02:00
ansuz
dd98e2222a
WIP erase chat history button
2017-07-20 17:04:11 +02:00
ansuz
128d5b2c6d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-20 15:55:17 +02:00
ansuz
b22127f10c
add history removal
2017-07-20 15:55:04 +02:00
yflory
a5a73ce326
Fix print button in slide
2017-07-20 14:41:51 +02:00
yflory
140964478e
Enter + shift key to add a new line in chat
2017-07-20 09:54:44 +02:00
yflory
e26e041a5b
fix jshint errors
2017-07-19 17:24:35 +02:00
yflory
c33d2a2db0
New tooltips
2017-07-19 17:14:10 +02:00
yflory
b56a782f01
Store the userlist state when it is closed using the icon
2017-07-19 14:38:46 +02:00
yflory
82c87144cb
Remove the friend request button when the request is sent
2017-07-19 14:14:34 +02:00
yflory
5ce49af57b
Make CryptDrive fast again
2017-07-19 11:36:00 +02:00
yflory
e2d031c76a
Add support for markdown syntax in contacts
2017-07-19 10:29:59 +02:00
yflory
cba113a2b0
Lint
2017-07-18 15:52:46 +02:00
yflory
91ebbdfdb4
View contact status
2017-07-18 15:50:21 +02:00
ansuz
39fd0d0f5f
notify if you're focused on a conversation in a bacgkrounded tab
2017-07-18 10:57:37 +02:00
yflory
f719b34e09
Add tab notification in contacts
2017-07-18 10:42:23 +02:00
yflory
baf439648e
Add the contacts app in the dropdown menu
2017-07-18 10:22:51 +02:00
yflory
36d792874a
Fix initial text not removed in /contacts
2017-07-18 10:13:29 +02:00
ansuz
df0442c2bf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-17 18:40:27 +02:00
ansuz
eb4b5ca77c
stub history removal. coming soon
2017-07-17 18:39:44 +02:00
yflory
aa8181ab2b
Contacts app translations
2017-07-17 18:34:46 +02:00
yflory
73e32f273e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-17 18:08:07 +02:00
yflory
009d01abde
Fix friend removal and update user data
2017-07-17 18:07:58 +02:00
ansuz
1aecdeb075
fresh media tag build
2017-07-17 11:08:39 +02:00
ansuz
7114bfaa52
lint compliance
2017-07-13 21:09:29 +02:00
ansuz
e2c17dbeb4
resolve conflicts
2017-07-13 17:52:00 +02:00
yflory
557f13f796
Unfriend and update username - beta
2017-07-13 17:32:57 +02:00
ansuz
96d2ff67e1
user-plus as icon for add-friend
2017-07-13 15:22:11 +02:00
ansuz
c3ba7cd792
fix race condition
2017-07-13 12:55:08 +02:00
ansuz
d0d38aa2a3
feedback on first visit
2017-07-13 11:03:56 +02:00
ansuz
9527a5def7
avoid a CSP error. silence pdfjs warnings
2017-07-13 10:58:45 +02:00
ansuz
9707433944
comment out debugging info
2017-07-13 10:57:51 +02:00
ansuz
575d4612f9
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-12 18:56:12 +02:00
ansuz
eda9908c3b
prevent accessing attributes of null
2017-07-12 18:56:04 +02:00
ansuz
eeb2ee2d17
add clear channel rpc
2017-07-12 18:55:29 +02:00
ansuz
89af8e4472
fix funny off-by-one thing
2017-07-12 18:49:33 +02:00
yflory
ac684a8dc7
Use the APP toolbar in profile
2017-07-12 18:34:16 +02:00
yflory
2d509e3e25
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-12 14:34:57 +02:00
yflory
b3e225cb3b
Replace spinner by text and fix mobile UI
2017-07-12 14:33:28 +02:00
ansuz
f450a28d11
improve logic for guessing titles within code documents
2017-07-12 11:09:53 +02:00
ansuz
0483d15b8f
lint compliance
2017-07-12 10:55:42 +02:00
ansuz
c0cb5c4263
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-12 10:46:15 +02:00
ansuz
f4bca0f9c0
Modifications for latest media-tag
...
* use latest built media-tag
* include pdfjs and configure its path for media-tag
* check whether decryption events affect an avatar. crop it if so
2017-07-12 10:44:40 +02:00
ansuz
5b3cca58bd
modifications to handle latest media-tag
2017-07-12 10:44:03 +02:00
yflory
7f5c301734
Add display name in the settings useradmin menu
2017-07-11 18:50:41 +02:00
yflory
fb21a650ce
Lint errors
2017-07-11 17:40:13 +02:00
yflory
159ccc2866
Fix mediatag flickering
2017-07-11 17:39:08 +02:00
yflory
16d0527e92
Add a page title in drive, settings and file
2017-07-11 15:13:39 +02:00
yflory
a0b14faf89
Fix the font in settings and drive
2017-07-11 13:11:16 +02:00
yflory
8f5a244999
Replace mediatag markdown syntax by html. Enable file upload in /code.
2017-07-11 11:56:06 +02:00
yflory
438e7e6cf9
Fix display name in useradmin (friends app)
2017-07-10 13:04:33 +02:00
yflory
e6188bfb63
Fix useradmin dropdown position
2017-07-10 12:38:54 +02:00
yflory
97d8d86395
Fix avatar in static pages
2017-07-10 12:03:44 +02:00
yflory
e8f3df5a46
Clean less
2017-07-10 11:57:04 +02:00
yflory
159d72f33b
Merge branch 'msg' into staging
2017-07-10 11:48:22 +02:00
yflory
8e2e8b1653
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-10 11:46:16 +02:00
yflory
ff10c282d4
Avatar in the user admin button
2017-07-10 11:46:06 +02:00
yflory
be6ee672d3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-10 11:16:52 +02:00
yflory
f0523a0153
Avatar in the user admin menu
2017-07-10 11:16:44 +02:00
ansuz
e10de1219b
feedback on view hash usage
2017-07-10 11:13:56 +02:00
ansuz
52eb8e307c
feedback for language used
2017-07-10 10:59:32 +02:00
yflory
1c531ccd47
Pin the chat channels
2017-07-10 10:39:57 +02:00
ansuz
4a37bc4a1c
abort the realtime session if it does not synchronize for 30 seconds
2017-07-10 10:34:25 +02:00
ansuz
c096872467
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
2017-07-10 09:30:44 +02:00
ansuz
22fbc7e5d8
implement getter for public keys
2017-07-10 09:21:27 +02:00
yflory
df103c4074
Messaging app
2017-07-07 18:53:21 +02:00
ansuz
1c462d5c4a
use random token for feedback instead of date
2017-07-07 10:16:54 +02:00
yflory
21f1527c71
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
2017-07-06 18:39:06 +02:00
yflory
5c7441f82c
Display the friend list in the friend app
2017-07-06 18:38:58 +02:00
ansuz
fac715dd09
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
2017-07-06 18:35:21 +02:00
ansuz
4b23ef74d7
add support for curve message signing and curve validateKeys
2017-07-06 18:30:16 +02:00
yflory
a5e8f6ae81
Add friend app and fix avatar size
2017-07-06 18:00:03 +02:00
yflory
af31771e3a
Share a channel id, not a hash
2017-07-06 14:47:02 +02:00
yflory
852b2eaf1d
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
2017-07-06 14:27:32 +02:00
yflory
26a83003b5
Create an owned channel
2017-07-06 14:27:13 +02:00
yflory
5b5a7ab286
Hide the friend button when the resquest is accepted
2017-07-06 12:31:31 +02:00
ansuz
d3bbdc27c0
lint compliance
2017-07-06 10:33:31 +02:00
ansuz
bce0b03ba4
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
2017-07-06 10:25:53 +02:00
ansuz
909e00bbc3
create a listmap object using public key crypto
2017-07-06 10:25:43 +02:00
yflory
96fde4e5ed
Add missing file
2017-07-06 10:24:28 +02:00
ansuz
df53166b37
implement and use prototype curve encryptors
2017-07-06 10:22:20 +02:00
ansuz
d293ba4d44
add support for invite hashes
2017-07-06 09:44:39 +02:00
yflory
37d5b0afb9
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
2017-07-05 18:42:51 +02:00
yflory
95e2efab89
Add to friend list
2017-07-05 18:42:32 +02:00
ansuz
e353627204
log users out if they do not have curve keys. add curve keys to object on registration and login.
2017-07-05 17:19:28 +02:00
ansuz
4016a95540
prototype invite app
2017-07-05 16:01:50 +02:00
yflory
465ef74f2b
Fix rpc
2017-07-05 16:02:22 +02:00
yflory
bf17ad3f1e
Friend button in the userlist
2017-07-05 15:59:36 +02:00
yflory
8dc8aa27ab
Lint
2017-07-05 12:27:40 +02:00
yflory
35e8c1a63b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-05 12:27:08 +02:00
yflory
43ac71603c
Move pad attributes in pad data
2017-07-05 12:26:42 +02:00
ansuz
9f6ecea5d9
fix nacl reference error in media tag
2017-07-05 11:57:53 +02:00
yflory
69f4ce2abd
Fix middle click on the drive button
2017-07-04 17:03:54 +02:00
ansuz
cbd9fc4076
Merge branch 'staging'
2017-07-04 17:03:20 +02:00
ansuz
3fe0baa956
disable pin limit caching
2017-07-04 15:50:52 +02:00
ansuz
9c1eaf9c1a
lint compliance
2017-07-04 15:48:20 +02:00
yflory
cab595f959
Fix duplicate folders in the drive
2017-07-04 14:51:35 +02:00
ansuz
ac8da0d52d
load codemirror in the correct context. fix selection events
2017-07-04 12:37:24 +02:00
ansuz
43b877ad27
fix styling on media tag download button
2017-07-04 10:28:50 +02:00
ansuz
1fd0ba488a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-04 10:21:35 +02:00
ansuz
04a28433ae
replace inner content of media tag download buttons
2017-07-04 10:21:29 +02:00
ansuz
f85af7ef4c
hide useless messages
2017-07-04 10:19:18 +02:00
ansuz
a59853f9c2
use new media tag
2017-07-04 10:15:45 +02:00
yflory
8cf694bea6
Lint
2017-07-03 18:41:41 +02:00
yflory
47c6c64b8a
Allow emojis in default avatars
2017-07-03 18:37:50 +02:00
yflory
ffd184d50e
Fix overflowing names in the new userlist
2017-07-03 17:41:34 +02:00
ansuz
92d88d1644
don't change allowed media types until we have media-tag scoping
2017-07-03 16:45:40 +02:00
yflory
fa2d857d70
Fix css issues with Safari
2017-07-03 16:11:41 +02:00
yflory
81c8949aee
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-03 14:43:17 +02:00
ansuz
8b0210baf1
hide useless error
2017-07-03 12:26:34 +02:00
yflory
991cb896bd
Fix avatar in /pad
2017-07-03 12:25:05 +02:00
ansuz
6ac056e314
make explicit file size RPCs unauthenticated
2017-07-03 11:38:39 +02:00
yflory
5694505719
Fix syntax highlighting
2017-07-03 11:16:28 +02:00
yflory
335898a4c7
Hack the drawer to close it when clicking outside
2017-06-30 18:23:23 +02:00
yflory
472a62730b
Fix profile creation and add a link to the profile app
2017-06-30 17:24:22 +02:00
yflory
b153dda6ff
Add avatars in the user list
2017-06-30 16:57:23 +02:00
yflory
555d0a09f8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-30 12:36:34 +02:00
yflory
568ce70afd
Add a spinner for the history and update history buttons
2017-06-30 12:36:21 +02:00
Caleb James DeLisle
2144587919
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-30 12:11:55 +02:00
Caleb James DeLisle
c25f2df721
Added caching versions to some of the images which are loaded by js
2017-06-30 12:11:44 +02:00
yflory
7e69d051c4
Lint errors
2017-06-30 11:46:20 +02:00
yflory
26193aeaa7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-30 11:42:59 +02:00
yflory
b9320e6005
Toolbar improvements
2017-06-30 11:42:54 +02:00
ansuz
75c2a1fd73
jshint compliance
2017-06-30 11:20:56 +02:00
ansuz
b8934c0b97
smarter redraws of drive/settings usage bar
2017-06-30 11:20:40 +02:00
yflory
cc5b7615ad
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-29 18:05:49 +02:00
yflory
ed0121d172
Lint errors
2017-06-29 18:05:34 +02:00
ansuz
b7cb1a8d5f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-29 17:54:29 +02:00
yflory
8279ef3130
Fix conflict between ckeditor toolbar and userlist on small screens
2017-06-29 17:51:30 +02:00
ansuz
b037cfbfdb
set usage tips relative to bottom of screen, not top
2017-06-29 17:25:06 +02:00
ansuz
1763cf72d1
tell anonymous users they can't upload
2017-06-29 16:28:58 +02:00
yflory
7a87775372
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-29 15:21:09 +02:00
ansuz
45f180955b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-29 15:20:46 +02:00
yflory
56a25e1036
Small fixes for the new toolbar
2017-06-29 15:15:40 +02:00
ansuz
1179992a90
update feedback key name
2017-06-29 14:48:33 +02:00
ansuz
39149a052b
add new feedback keys
2017-06-29 14:16:20 +02:00
ansuz
9b8866ed72
handle RPC_NOT_READY error for logged out users
2017-06-29 11:13:48 +02:00
ansuz
a9f8f42e3c
use minified less compiler
2017-06-29 10:50:21 +02:00
yflory
877c5a8d0e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-28 17:15:42 +02:00
yflory
19ff8a345d
Avatar upload in the profile app
2017-06-28 16:59:35 +02:00
ansuz
5e56ad912e
remove the last bit of compiled css
2017-06-28 14:51:49 +02:00
ansuz
7a7307d560
fix logging when resetting
2017-06-28 12:08:16 +02:00
yflory
6c94605b9b
File upload in the profile
2017-06-28 10:59:29 +02:00
ansuz
1c1869a22c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-27 18:26:10 +02:00
ansuz
f232675cc9
create a favicon if it does not already exist
2017-06-27 18:07:03 +02:00
ansuz
3be6433fdf
send feedback on name changes
2017-06-27 18:06:32 +02:00
ansuz
bb74935b08
allow pin limit caching to occur at api level
2017-06-27 15:37:42 +02:00
yflory
00a554ca0d
Fix the donate button style with the new toolbar
2017-06-27 14:36:49 +02:00
ansuz
e9bfaa9a60
compile less clientside. remove compiled css
2017-06-27 14:25:02 +02:00
ansuz
67a096a8a4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-27 09:57:32 +02:00
ansuz
7b37146034
don't let spacebar keyups propagate outside of the title
2017-06-26 18:32:29 +02:00
ansuz
9195c0cd12
is isOverPinLimit in toolbar
2017-06-26 18:13:06 +02:00
ansuz
fce0a37f50
cache pin data once retrieved from the server
2017-06-26 17:32:31 +02:00
yflory
33ea8cb183
Make sure we don't call both the yes and no handlers in prompts
2017-06-26 16:23:55 +02:00
ansuz
51e06e68a7
don't change slides when navigating through history
2017-06-26 14:40:48 +02:00
yflory
38f568635d
Fix duplicate media-tag in slides when adding or removing a slide
2017-06-26 14:08:14 +02:00
yflory
cc341ca6d4
Lint error
2017-06-23 17:57:29 +02:00
yflory
0d4d104e08
Mobile support for the new toolbar
2017-06-23 17:56:14 +02:00
ansuz
b4b851959f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-22 17:42:32 +02:00
ansuz
61a891267f
more feedback
2017-06-22 17:42:24 +02:00
yflory
c1d2fa6b52
Unhack validateKey for the history mode
2017-06-22 17:35:54 +02:00
yflory
2710279904
Use the new share button in the file app
2017-06-22 17:03:51 +02:00
yflory
684269fdda
Userlist in polls
2017-06-22 16:14:54 +02:00
yflory
a11befaa0f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-22 15:52:31 +02:00
yflory
13288ee18b
Update the userlist in code, slide and pad
2017-06-22 15:52:25 +02:00
ansuz
852c028822
don't allow editing if pad type is wrong
2017-06-22 14:31:55 +02:00
yflory
92b6e60573
Small improvements for the new toolbar
2017-06-22 11:13:53 +02:00
ansuz
eddfb936f2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-22 11:12:51 +02:00
ansuz
115813c191
Merge branch 'new-templates' into staging
2017-06-22 11:11:32 +02:00
ansuz
ab54dcf84d
make libs pass jshint
2017-06-22 10:03:58 +02:00
yflory
8d956c3de6
New toolbar
2017-06-21 18:04:35 +02:00
ansuz
48f9745619
clientside templating
2017-06-21 18:02:38 +02:00
yflory
b7a0547b77
New toolbar colors
2017-06-20 17:59:11 +02:00
yflory
3052ec8abb
Merge branch 'newCk' into staging
2017-06-20 14:57:19 +02:00
yflory
c22f610d5c
Fix the drive integrity check
2017-06-20 12:59:44 +02:00
yflory
fb388f2610
Fix an issue with invalid drive before migration
2017-06-20 12:42:30 +02:00
yflory
59fb5bd8be
One toolbar color per app
2017-06-20 12:33:50 +02:00
yflory
5a248db267
Merge branch 'staging' into newCk
2017-06-20 10:57:40 +02:00
yflory
728272d936
Fix undefined function
2017-06-20 10:29:03 +02:00
yflory
a38819f5b9
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-19 14:41:38 +02:00
yflory
1ad1b78c64
Fix the history mode with readOnly and old URLs
2017-06-19 14:41:31 +02:00
ansuz
f29f430e7c
better handling of non-rpc messages
2017-06-19 12:38:24 +02:00
yflory
e40f43bd20
Migrated pads were not displayed instantly in the drive
2017-06-19 11:52:57 +02:00
yflory
a5924cb803
Make sure the initial title is set in the userDoc when creating a new pad
2017-06-15 18:50:39 +02:00
ansuz
0e9ebddf11
fix the things
2017-06-15 18:13:24 +02:00
ansuz
c0e2c1060e
don't reload when slide hash changes
2017-06-15 17:54:35 +02:00
yflory
594405de73
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-15 15:36:23 +02:00
yflory
cbe21959b4
Update UI for the file/media app
2017-06-15 15:35:52 +02:00
ansuz
17146d7af9
send feedback for uploads
2017-06-15 15:34:13 +02:00
yflory
2068a8b85b
Embed the mediatag library in the file app
2017-06-15 14:58:18 +02:00
yflory
66b076111e
Add an upload button to the slide's file picker
2017-06-15 12:32:44 +02:00
ansuz
b480346f5b
more efficient media-tag
2017-06-15 12:05:25 +02:00
ansuz
0d47e68d3e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-15 11:19:24 +02:00
ansuz
0eb50b8b6c
drop pdf.js dependency
2017-06-15 11:19:06 +02:00
yflory
a237eec41e
Add a file picker in the slide app
2017-06-15 11:04:58 +02:00
ansuz
d25a0893cf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-14 17:24:49 +02:00
ansuz
3184e5d235
don't reload page on hash mode change
2017-06-14 17:24:44 +02:00
yflory
1077b3b267
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-14 15:55:10 +02:00
yflory
a98353af6c
Add a button to upload a file in the drive
2017-06-14 15:55:03 +02:00
ansuz
295f9c00a6
send feedback on buttons
2017-06-14 15:36:46 +02:00
yflory
497ddeee6d
Upload files with drag&drop in the drive
2017-06-14 12:47:37 +02:00
ansuz
687b4d8307
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-14 11:10:26 +02:00
ansuz
69c3bd392f
update built media tag to latest XWiki version
2017-06-14 11:09:51 +02:00
yflory
d8ebe566d8
Don't call mediatag for non-image files
2017-06-13 18:38:53 +02:00
yflory
37d3d04f0e
Clean mediatag integration code
2017-06-13 17:57:27 +02:00
ansuz
802146e2af
don't put download buttons in a div
2017-06-13 17:54:15 +02:00
yflory
19cb920a7c
Don't redraw a media-tag everytime the content has changed
2017-06-13 17:21:22 +02:00
yflory
2032c08066
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-13 16:15:11 +02:00
yflory
f9c26645cf
Upload images using the slide app
2017-06-13 16:15:04 +02:00
ansuz
17e4e9be27
download anything that isn't an image in media-tag
2017-06-13 16:12:13 +02:00
ansuz
1b574da053
fix typo
2017-06-13 12:24:32 +02:00
ansuz
7ad89bd9af
don't interrupt boot because of localStorage failure
2017-06-13 12:02:36 +02:00
ansuz
3337e2133a
more thorough tests for localStorage presence
2017-06-13 11:57:21 +02:00
yflory
4eeea93265
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-13 11:38:16 +02:00
yflory
11e2226f1a
Fix lint errors
2017-06-13 11:38:04 +02:00
ansuz
c779e328e8
warn users if their browser does not support localStorage
2017-06-13 11:33:25 +02:00
yflory
d7292e69c6
Fix undefined variable
2017-06-13 11:25:12 +02:00
yflory
803bad1421
Move the file upload code in a separate file
2017-06-13 11:21:26 +02:00
yflory
a58162a617
Make the drive tests work when not logged in
2017-06-12 17:49:33 +02:00
yflory
2fb5e3ae35
Merge branch 'staging' into newToolbar
2017-06-12 17:00:07 +02:00
yflory
969cec5d60
Make sure everything is synced before migrating the drive
2017-06-12 16:19:45 +02:00
yflory
7dd9ed543a
Merge branch 'newDrive' into staging
2017-06-12 16:08:09 +02:00
yflory
376b60c21c
New toolbar temp
2017-06-12 15:59:24 +02:00
ansuz
c9725af508
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-12 14:34:01 +02:00
ansuz
db9b9547d9
don't complain about missing callbacks for messages which are not our responsibility
2017-06-12 14:33:50 +02:00
yflory
30bdb9881c
Fix undefined element in select dropdown menus
2017-06-12 14:23:06 +02:00
yflory
8471dab6b1
Provide hints in theme and language dropdowns
2017-06-12 12:47:25 +02:00
yflory
a5cb5f2ceb
Merge branch 'staging' into newDrive
2017-06-12 10:51:38 +02:00
yflory
9cc25d4c9f
Merge branch 'staging' into newDrive
2017-06-09 17:03:01 +02:00
yflory
a57f7c6ce7
Fix lint errors
2017-06-09 16:39:44 +02:00
ansuz
4bcad3e154
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-09 16:26:36 +02:00
ansuz
47857ec382
use cached pinned usage data
2017-06-09 16:17:20 +02:00
yflory
75c3c10b20
Merge branch 'soon' into staging
2017-06-09 15:56:45 +02:00
yflory
c1402fbb0a
Lint error
2017-06-09 15:56:18 +02:00
yflory
b36484931d
Lint
2017-06-09 15:55:46 +02:00
yflory
1fb638f519
clean the code
2017-06-09 15:50:13 +02:00
ansuz
23318357a6
make fewer RPC calls for usageBar
2017-06-09 15:33:03 +02:00
ansuz
df586a223c
update limits, usage, plan, and note whenever they are checked
2017-06-09 15:31:43 +02:00
ansuz
8bad0c556e
change log to error
2017-06-09 15:29:55 +02:00
ansuz
b0e00d337e
more careful validation
2017-06-09 15:28:53 +02:00
yflory
fd88162624
Merge branch 'staging' into newDrive
2017-06-09 14:47:37 +02:00
yflory
7c9e86e351
Merge branch 'soon' into staging
2017-06-09 14:47:15 +02:00
yflory
9694272083
Fix html code not parsed
2017-06-09 14:42:55 +02:00
yflory
9ca10ba524
Merge branch 'staging' into newDrive
2017-06-09 14:40:26 +02:00
yflory
7f120c8fc1
Merge branch 'soon' into staging
2017-06-09 14:38:36 +02:00
yflory
78e6118153
Merge branch 'staging' into newDrive
2017-06-09 14:38:21 +02:00
yflory
444c41974e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-09 14:37:54 +02:00
yflory
df5cbfb53e
Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon
2017-06-09 14:36:38 +02:00
yflory
6a96aa6819
Disconnect the network when migrating the drive in another tab
2017-06-09 14:36:35 +02:00
yflory
2a94bdaf05
test
2017-06-09 13:41:11 +02:00
yflory
ca95b5c42b
Remove unused console.log
2017-06-09 12:31:07 +02:00
yflory
f8c69573fd
Disconnect other tabs when migrating the drive
2017-06-09 12:23:28 +02:00
ansuz
c4e5741ae0
update upgrade button logic
2017-06-09 12:12:39 +02:00
ansuz
f1a9002417
use upgradeURL with usage bar
2017-06-09 10:46:11 +02:00
yflory
51e0d40572
Make sure the old storage key is removed after migration
2017-06-08 18:35:20 +02:00
yflory
b0fe04381d
Merge branch 'staging' into newDrive
2017-06-08 18:14:31 +02:00
yflory
1c2ea04f11
Drive refactoring
2017-06-08 17:52:00 +02:00
ansuz
fe42f5e88c
ask for new cookies and resend commands on NO_COOKIE errors
2017-06-08 14:19:14 +02:00
ansuz
da533b106a
improve type checking in getFileSize
2017-06-08 11:24:20 +02:00
ansuz
d25477e8c6
don't let tooltips interfere with DOM interaction
2017-06-06 18:08:23 +02:00
yflory
5641a4a839
Add the file app in the 'new' dropdown menus
2017-06-06 11:52:47 +02:00
yflory
ac91d2f413
Fix the upgrade and donate buttons in the home page
2017-06-06 11:37:54 +02:00
yflory
ee57458158
Remove the pin limit alert
2017-06-06 10:49:32 +02:00
ansuz
767793b5ca
fix stuck loading tip
2017-06-02 12:13:11 +02:00
ansuz
f631973f1f
optimize file upload
2017-06-01 18:16:02 +02:00
ansuz
55af84cc90
lower spinner timeout interval
2017-06-01 14:27:06 +02:00
ansuz
07279c8dc7
export boolean Test.testing
2017-06-01 10:23:24 +02:00
Caleb James DeLisle
71bd808e4f
Send everything through the test global function
2017-06-01 00:09:39 +02:00
Caleb James DeLisle
244bd7b378
;;;
2017-05-31 23:32:47 +02:00
Caleb James DeLisle
7d557df74b
a new and more horrible way of sniffing the logs out of the instance
2017-05-31 23:29:58 +02:00
Caleb James DeLisle
0d4b74cfba
;;;;;; keep these ;;; for later ;;;;;
2017-05-31 19:46:23 +02:00
Caleb James DeLisle
24f37ea414
Delicious testing
2017-05-31 19:40:17 +02:00
ansuz
7b94106bac
fix inverted conditional :/
2017-05-31 18:15:31 +02:00
ansuz
2e03485db4
remove known bad entries from localStorage.userHash...
2017-05-31 18:12:58 +02:00
ansuz
936bf8df9d
return falsey if userHash is junk
2017-05-31 18:08:41 +02:00
ansuz
105e5cdac9
fix 'undefined/' userHash
2017-05-31 18:01:12 +02:00
ansuz
401e908963
use media-tag with xhr error handling
2017-05-31 17:17:01 +02:00
ansuz
3465710237
Merge branch 'mediatag' of https://github.com/Regzox/cryptpad into tag
2017-05-31 12:55:05 +02:00
Daniel RADEAU
21c39572be
Update media-tag and fix bower dependencies
2017-05-31 11:53:25 +02:00
ansuz
ebfa228bc0
add upgrade button to all static pages
2017-05-30 18:39:41 +02:00
ansuz
149568689a
color donate button green
2017-05-30 17:58:31 +02:00
ansuz
ec6ad6772b
send feedback on donation
2017-05-30 17:25:36 +02:00
Daniel RADEAU
cb2efe138b
Media Tag integration, image, audio, video, pdf
2017-05-30 16:36:06 +02:00
ansuz
9ca5bc507e
add support for donate button
2017-05-30 15:42:53 +02:00
Caleb James DeLisle
66520b6041
cleaned up the accounts, limits and revenue sharing and unified the config in one place
2017-05-26 18:09:31 +02:00
ansuz
3f3d64992d
resolve merge conflicts
2017-05-26 12:44:58 +02:00
ansuz
57017c68fa
hacks for cross-domain safari
2017-05-26 12:42:12 +02:00
ansuz
cf658c1b3a
backport live changes
2017-05-26 12:41:30 +02:00
yflory
df2b00122a
New drive structure without file names
2017-05-24 18:59:44 +02:00
ansuz
d9f7470f06
copy user details into sessionStorage for safari
2017-05-24 18:28:16 +02:00
ansuz
fd83ae3e61
implement createRandomInteger
2017-05-24 11:34:40 +02:00
ansuz
dc80b6b11f
throttle markdown preview
2017-05-24 11:27:16 +02:00
ansuz
e6c04ccb49
bump server after paying for an account
2017-05-23 16:11:07 +02:00
ansuz
6324d9bbb0
feedback on template feature usage
2017-05-23 14:54:40 +02:00
yflory
c3437382fb
Fix the release version in the what's new popup
2017-05-23 11:22:32 +02:00
ansuz
4fae1b16c2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-22 18:43:14 +02:00
ansuz
70cae0d2c3
safely access pin reset response
2017-05-22 18:43:06 +02:00
yflory
d55b7e411c
Display an alert in the drive when the limit is reached
2017-05-22 17:56:27 +02:00
ansuz
71dc0af6c7
better test for success error codes
2017-05-22 14:37:57 +02:00
yflory
9c00a730f2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-22 10:41:55 +02:00
yflory
538aec6ef5
Display a message when pinPads returns an error
2017-05-22 10:41:47 +02:00
ansuz
ba5ef5157e
show pretty representations of storage usage
2017-05-19 18:37:31 +02:00
ansuz
e78299aed6
use async file decryption, listen for progress events.
2017-05-19 11:46:47 +02:00
ansuz
ef155d8ccf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-19 09:13:38 +02:00
yflory
d014fccfce
Fix lint error
2017-05-18 18:52:14 +02:00
yflory
2082b328b4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-18 18:51:21 +02:00
yflory
814c81fb13
Display an alert when CryptPad has a new version
2017-05-18 18:51:08 +02:00
ansuz
34606ea8ba
use newest xwiki media-tag
2017-05-18 18:24:24 +02:00
ansuz
2cee9534c5
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-18 17:58:33 +02:00
ansuz
164342920e
fix inverted condition
2017-05-18 15:39:24 +02:00
yflory
620f4dc512
Add translations for the markdown preview button title
2017-05-18 15:05:37 +02:00
yflory
51bd41d4e8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-18 14:57:12 +02:00
yflory
0bd4caeb7e
Add the task list code to the markdown renderer
2017-05-18 14:57:04 +02:00
ansuz
d187945e94
jshint compliance
2017-05-18 14:55:16 +02:00
yflory
2b60b81a68
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-18 14:27:10 +02:00
yflory
d13dde856a
Add the markdown renderer file and change code's default content
2017-05-18 14:26:56 +02:00
ansuz
73ec91aa5e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-18 12:46:36 +02:00
ansuz
7befaccd88
move more rpc calls into pinpad
2017-05-18 12:36:12 +02:00
yflory
56bcdff890
Add a preview of the markdown content in the code editor
2017-05-18 12:16:26 +02:00
yflory
b72415b56b
Fix old hashes not working with the new parser
2017-05-18 10:13:08 +02:00
yflory
6b7aeb9121
Fix the text example
2017-05-17 15:48:09 +02:00
yflory
fe0f21594a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-16 14:41:51 +02:00
yflory
953e7155f0
Send only the hostname to the accounts server
2017-05-16 14:41:40 +02:00
ansuz
afef456b18
fix undefined reference
2017-05-16 14:15:42 +02:00
yflory
1a7c4d5ebe
Store the FS_hash in the user object after the merge
2017-05-16 11:25:37 +02:00
yflory
87fa28180a
Display an upgrade button in the settings page
2017-05-16 10:34:50 +02:00
yflory
c1b43db363
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-15 18:21:25 +02:00
ansuz
1542aa96bc
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-15 18:17:56 +02:00
yflory
dc2cdb7c08
Add the usage bar in the settings page
2017-05-15 18:16:22 +02:00
ansuz
2dd04f7631
get limits from the server
2017-05-15 18:03:12 +02:00
yflory
8172f117a7
Fix Hash.alert not a function
2017-05-15 14:21:15 +02:00
yflory
0e58859393
Fix lint error
2017-05-15 13:55:40 +02:00
yflory
771348720b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-15 13:54:25 +02:00
yflory
57979f6314
Display the public key using a href in the settings page
2017-05-15 13:53:43 +02:00
ansuz
a9b670fdf5
don't parse trailing slash as part of encryption key in old hashes
2017-05-15 11:17:46 +02:00
ansuz
06f3d0eefe
shim isArray if not exists. correctly report how often this occurs
2017-05-15 10:26:52 +02:00
yflory
50d9f72b3a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-12 18:06:37 +02:00
yflory
601226115b
New anonymous drive
2017-05-12 18:06:29 +02:00
ansuz
30f6ef3f85
handle more response codes, use metadata
2017-05-12 17:34:29 +02:00
ansuz
18d959ef16
handle non-200 status codes
2017-05-12 17:07:30 +02:00
yflory
ed95bbb08f
Fix lint errors
2017-05-12 16:43:01 +02:00
yflory
89a993be3c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-12 16:33:56 +02:00
yflory
0f13198119
Move the parseHash code into parsePadUrl
2017-05-12 16:33:45 +02:00
ansuz
42f3a62cac
handle errors with XHR
2017-05-12 16:13:09 +02:00
ansuz
6c68b5e6ca
use new media-tag, listen for decryption events
2017-05-12 15:42:01 +02:00
ansuz
7dd5907ff0
Merge branch 'limit' into staging
2017-05-12 14:21:46 +02:00
ansuz
a993ab6616
use new encrypted file encoding in media-tag
2017-05-12 11:25:07 +02:00
ansuz
8c49150725
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-12 10:54:32 +02:00
yflory
e0293a1162
Merge branch 'master' into staging
2017-05-11 18:26:09 +02:00
yflory
57ee7de7d4
Update and return the storage limit
2017-05-11 16:12:44 +02:00
yflory
371edff943
Fix an error when moving unsorted files to root in the drive
2017-05-11 14:24:16 +02:00
yflory
b76dcba1d6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-11 12:43:49 +02:00
ansuz
6d30d7f89f
strip junk bytes from base64 more safely
2017-05-10 18:15:33 +02:00
ansuz
8f5989b6b0
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-10 17:05:13 +02:00
yflory
cf81b02096
Make sure the spinner is always centered in the loading screen
2017-05-10 16:11:41 +02:00
yflory
5c8586f8a3
Fix typo in file upload
2017-05-10 15:00:05 +02:00
yflory
96ccb94397
Add the share button when a file upload is complete
2017-05-10 14:44:01 +02:00
yflory
c00158d23a
Move code to common-history
2017-05-10 13:39:14 +02:00
ansuz
922e7803e9
remove extraneous slashes from hashes when parsing
2017-05-10 11:54:05 +02:00
ansuz
a338b23f40
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-09 18:36:27 +02:00
ansuz
df47b913e3
fetch array buffers in cryptpad-common
2017-05-09 18:36:18 +02:00
yflory
ff16084719
Fix lint errors
2017-05-09 18:10:02 +02:00
yflory
50c8a859e6
Move the CodeMirror cursor code to common-codemirror
2017-05-09 17:57:27 +02:00
yflory
9eb8e55cf6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-09 17:48:07 +02:00
yflory
c79a6e3b2b
Move Metadata, CodeMirror and title functions in separate files
2017-05-09 17:47:47 +02:00
yflory
63710e1ccc
Move the code related to the title in another file
2017-05-09 14:32:41 +02:00
yflory
ce5cdce917
Fix an issue where the username was lost on websocket reconnect
2017-05-09 14:31:28 +02:00
ansuz
42dcfb9661
unceremoniously kick web clients when you 'log out everywhere'
2017-05-05 18:25:55 +02:00
yflory
9206d89531
Fix lint errors
2017-05-05 17:58:32 +02:00
yflory
bbc08bbcfd
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-05 17:57:05 +02:00
yflory
5a883d5a57
Use the new toolbar and move the userlist code in a separate file
2017-05-05 17:56:49 +02:00
yflory
6847906ac9
Move the userlist code in a separate file
2017-05-05 15:47:46 +02:00
ansuz
3a338e0890
fix undefined reference
2017-05-05 15:20:41 +02:00
ansuz
a173e4c7a0
add 'log out everywhere' functionality in settings
2017-05-05 15:09:07 +02:00
yflory
5a5b02b82b
Don't store in the drive pads without a hash
2017-05-05 11:55:19 +02:00
ansuz
3e118c6a38
allow instance-wide custom salt for login
2017-05-05 09:10:31 +02:00
yflory
706120ae5b
Display images uploaded in the File app with the Media app
2017-05-04 18:24:58 +02:00
yflory
28cb40d7ee
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-04 17:14:30 +02:00
yflory
1b6fae4dd2
Update mediatag
2017-05-04 17:14:24 +02:00
ansuz
a0c420af8e
jshint compliance
2017-05-04 16:37:25 +02:00
ansuz
1864dac84f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-04 16:16:16 +02:00
ansuz
78b11584f8
remove unused variables
2017-05-04 16:16:09 +02:00
yflory
4335b050af
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-04 16:08:21 +02:00
yflory
a190c99426
Toolbar refactoring
2017-05-04 16:08:12 +02:00
ansuz
7573b86946
call back with error if an RPC is made while disconnected
2017-05-04 11:36:24 +02:00
ansuz
410a9dfb17
temporary solution for testing pin limits
2017-05-04 11:20:52 +02:00
yflory
ef89451a83
Display the storage limit in the drive
2017-05-02 17:14:53 +02:00
ansuz
f2672d587a
fix variable redefinition
2017-05-02 09:42:51 +02:00
ansuz
0e7eeb285c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-29 14:24:14 +02:00
yflory
f414d480a9
Add the history mode to the CryptDrive
2017-04-28 18:23:41 +02:00
ansuz
cf4dee28f7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-28 17:13:18 +02:00
ansuz
28e4ef1b13
WIP RPC code
2017-04-28 17:11:50 +02:00
yflory
afb0061d7b
Fix an issue with anonymous user unable to store new pads
2017-04-28 17:11:07 +02:00
yflory
56aaeea003
Fix the drive toolbar not displaying the displayName
2017-04-28 17:03:47 +02:00
ansuz
3fa0a73025
prevent using string methods on undefined variable
2017-04-28 16:09:46 +02:00
ansuz
1b3ce5aa96
fix typo
2017-04-28 16:08:47 +02:00
yflory
a51a35da70
Fix an issue with hashes ending with a slash
2017-04-28 15:47:31 +02:00
yflory
ef58120819
Prevent multiple concurrent clicks to get the history
2017-04-28 14:09:59 +02:00
yflory
16f6ab813c
Make it clear that the number is the history represents a version
2017-04-28 13:06:55 +02:00
yflory
c820b3485c
Fix function undefined when loading a template
2017-04-28 12:16:45 +02:00
yflory
0ef1c14d7f
Fix lint errors
2017-04-28 12:12:17 +02:00
yflory
fc760b4820
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-28 12:08:21 +02:00
yflory
a165332c15
Don't store a pad in the drive if the limit has been reached
2017-04-28 12:08:05 +02:00
ansuz
e51c7f9cf0
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-28 11:46:24 +02:00
yflory
bf7c7c45d0
Add the storage limit warning in the toolbar
2017-04-27 18:46:46 +02:00
ansuz
aedc46bdaf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-27 12:47:27 +02:00
ansuz
a97e7223f1
implement getBlobPathFromHex
2017-04-27 12:47:21 +02:00
yflory
520dabe094
Remove the unsorted files category
2017-04-26 18:46:40 +02:00
yflory
f50aa5c29b
Move the mediatag viewer into a media app
2017-04-26 14:55:06 +02:00
yflory
6a8274518b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-25 18:42:33 +02:00
yflory
9882a3a923
Add support for the file applicaiton in the drive
2017-04-25 18:42:21 +02:00
ansuz
12898b3358
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-25 18:28:48 +02:00
ansuz
74bcec8b31
programming is hard okay
2017-04-25 18:28:39 +02:00
yflory
2a417ddae8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-25 17:22:07 +02:00
yflory
d985b144cc
Add a new hash version for the file viewer
2017-04-25 17:19:13 +02:00
ansuz
3309087277
send feedback if isArray is not supported
2017-04-25 17:09:39 +02:00
ansuz
5194677443
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-25 14:57:34 +02:00
yflory
c9c7d61ad1
Media tag viewer
2017-04-25 14:55:38 +02:00
ansuz
729d1460b9
Merge branch 'master' into staging
2017-04-25 14:35:24 +02:00
ansuz
a840fb9e85
add example hashes and start working on hash v2
2017-04-25 14:33:57 +02:00
ansuz
d1fa68e30d
build UCF Media Tag
2017-04-24 17:13:32 +02:00
yflory
fdd51ec18d
Don't remove a folder moved into unsorted or into itself
2017-04-24 15:38:03 +02:00
ansuz
4fdc5f897e
only feedback migration if user had legacy store
2017-04-24 14:26:55 +02:00
ansuz
218f2ff76c
feedback when logging in or registering
2017-04-24 14:15:17 +02:00
yflory
4c3e842664
Fix focus issues with the history input in ckeditor
2017-04-24 13:55:03 +02:00
ansuz
f7e96b4e8c
resolve merge conflicts and jquery errors
2017-04-24 13:43:18 +02:00
yflory
5fc2e4cf71
Remove the toolbar in ckeditor history mode + history configurable
2017-04-24 11:41:00 +02:00
ansuz
18e2e66b06
jshint compliance
2017-04-24 11:39:39 +02:00
yflory
92ea03d7d9
View and restore the history of a pad
2017-04-21 17:31:47 +02:00
ansuz
4c0d7bf8e8
support multiple calls to cryptpad.ready
2017-04-21 16:51:32 +02:00
ansuz
ec041c88e2
console.log when providing feedback
...
also notify server if a users browser does not support proxies
2017-04-21 15:53:13 +02:00
ansuz
c51073f211
support batch getFileSize calls
2017-04-21 14:51:20 +02:00
ansuz
3afaf029cb
feedback about how often we migrate an old drive
2017-04-20 17:06:09 +02:00
ansuz
e8b053e48b
use bootloader in feedback.html
2017-04-18 17:31:35 +02:00
ansuz
347459781c
show the size of your files, if you're logged in
2017-04-18 15:49:04 +02:00
ansuz
2b8579e8b7
add pretty-printers for byte-counts
2017-04-18 15:44:15 +02:00
ansuz
2a25afae5f
Merge branch 'soon' into staging
2017-04-18 12:24:45 +02:00
Caleb James DeLisle
c341fa8e94
Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter
2017-04-18 12:14:32 +02:00
ansuz
da69c1822c
ask users to sign back if signing keys are missing
2017-04-18 11:58:41 +02:00
ansuz
821c1a3ec6
annotate code which we hope to be able to deprecate in the future
2017-04-14 18:44:08 +02:00
yflory
43c045721c
Get the channel history
2017-04-14 18:36:36 +02:00
ansuz
a27cc76fc0
uppercase LOL
2017-04-14 15:35:02 +02:00
ansuz
402ce2db93
better validation of inputs
2017-04-14 15:34:22 +02:00
ansuz
c7eae9675b
keep exporting isArray for backwards compatibility
...
but prevent internal use
2017-04-14 15:34:05 +02:00
ansuz
fbebbf0dca
minor clean up
2017-04-14 15:32:12 +02:00
ansuz
525d35c9ec
redefine alert
2017-04-14 14:54:43 +02:00
ansuz
f694a81a5c
move more interface code out of cryptpad-common
2017-04-14 12:25:32 +02:00
ansuz
a4157b9908
remove more unused functions
2017-04-14 12:14:10 +02:00
ansuz
e10901edb2
begin to move interface code out of cryptpad-common
2017-04-14 12:09:00 +02:00
ansuz
95789d3cbe
expose rpc for pinned usage
2017-04-14 11:41:51 +02:00
ansuz
8f4dbcf4c6
remove getPadTitle
2017-04-14 11:41:18 +02:00
ansuz
f42da4ecd8
move hashChannelList into common-hash.js
2017-04-14 11:40:28 +02:00
ansuz
63960bd38c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-13 19:47:04 +02:00
ansuz
520ae822fc
correct undefined reference
2017-04-13 19:46:52 +02:00
yflory
633d60ccd0
Remove a TODO
2017-04-13 17:19:32 +02:00
yflory
81d83897ec
Rename hash.js
2017-04-13 17:04:15 +02:00
yflory
07705cd5c1
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-13 15:04:23 +02:00
yflory
eb2a3c1bbf
Fix lint errors
2017-04-13 15:04:17 +02:00
ansuz
607d9652f5
jshint compliance
2017-04-13 14:48:15 +02:00
yflory
3ba90332bb
Merge branch 'refactor' into staging
2017-04-13 14:44:55 +02:00
yflory
daabb0b3ad
Integrate and fix the new fileObject (userObject)
2017-04-13 14:06:40 +02:00
ansuz
df4a250359
use feedback api instead of app=
2017-04-13 12:18:08 +02:00
ansuz
86c37bfa37
fix find+replace error
2017-04-13 11:11:45 +02:00
ansuz
e618483395
extract all code for encoding and decoding hashes
2017-04-13 11:05:28 +02:00
ansuz
fdd2716ad5
move constants to the top of cryptpad-common.js
2017-04-13 10:31:08 +02:00
yflory
c1e0316d43
Refactor fileObject
2017-04-12 18:54:22 +02:00
ansuz
5212539a16
move standalone functions from common into their own file
2017-04-12 17:54:44 +02:00
ansuz
7437d6b902
remove unused function
2017-04-12 17:09:42 +02:00
ansuz
4e590a9dd1
remove even more dead code
2017-04-12 16:16:58 +02:00
ansuz
85fcaa9bbc
remove more dead code
2017-04-12 16:13:25 +02:00
ansuz
401936a91e
move singly-used css file out of /common/
2017-04-12 16:09:05 +02:00
ansuz
7a59183bb1
pinpad.create should always be async
2017-04-12 16:02:42 +02:00
ansuz
8de3610532
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-12 16:02:09 +02:00
ansuz
9aa0548b1f
remove dead cursor code
2017-04-12 15:59:30 +02:00
yflory
4e61b79f9a
Clean fileObject
2017-04-11 15:11:33 +02:00
yflory
cde724399c
Pin the pads
2017-04-11 14:53:44 +02:00
ansuz
2c8d1b8183
jshint compliance
2017-04-10 19:12:22 +02:00
ansuz
05a50b1f4c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-10 17:42:43 +02:00
ansuz
a14bb1480a
progress for implicit pinning
2017-04-10 17:42:35 +02:00
ansuz
f82278a25c
handle return of undefined hash
2017-04-10 17:38:25 +02:00
ansuz
1d933be5a6
make reset return the hash, not an array with containing it
2017-04-10 15:57:38 +02:00
yflory
f34492be94
Remove duplicates uid in the user list
2017-04-10 15:27:01 +02:00
yflory
cfc5d634f4
Merge branch 'templates' into staging
2017-04-10 14:19:48 +02:00
yflory
bd16e0f0e7
Templates in polls and canvas, and ability to disable templates
2017-04-10 14:19:15 +02:00
yflory
84d8615cf1
Save and use templates in pad, code and slides
2017-04-07 18:20:03 +02:00
ansuz
bd2034c47b
prepare rpc before 'ready' if pinning is enabled
2017-04-07 17:24:25 +02:00
ansuz
a70388284d
disable unnecessary messages
2017-04-07 17:21:04 +02:00
ansuz
abd87e1322
jshint compliance
2017-04-07 16:33:14 +02:00
ansuz
e4b15bc616
implement 'getCanonicalChannelList'
2017-04-07 15:52:34 +02:00
ansuz
a2f692b9a3
clean up serverside and clientside pinning logic
2017-04-07 15:20:30 +02:00
ansuz
fdede0d1fd
remove some dead code
2017-04-07 12:18:03 +02:00
ansuz
e87992c7ec
implement atomic pin reset rpc
2017-04-07 11:37:19 +02:00
ansuz
3380cf0348
implement getTotalSize rpc
2017-04-07 10:09:59 +02:00
ansuz
5c292fb1fa
jshint compliance
2017-04-06 08:32:31 +02:00
ansuz
64089c5f6b
implement pad pinning
2017-04-05 17:28:04 +02:00
yflory
13514dff63
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-05 15:00:10 +02:00
yflory
46a5eee597
Display the spinner in the toolbar for local changes
2017-04-05 14:57:07 +02:00
ansuz
6c7cdc90a9
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-05 12:24:17 +02:00
ansuz
212baeb3a6
better cookie schema. expire old sessions
2017-04-05 12:24:01 +02:00
yflory
54d271c4e7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-05 12:04:18 +02:00
yflory
a9777ce560
Fix input losing focus in polls with Chrome 57
2017-04-05 12:04:01 +02:00
ansuz
3e47b8a38d
remove dead code
2017-04-05 10:42:24 +02:00
ansuz
182dbfc874
implement pinning logic in pinpad.js
2017-04-04 12:13:31 +02:00
ansuz
a5e5ddae08
rpc all the things
2017-04-03 19:24:57 +02:00
ansuz
04069cc7f4
fix font size
2017-03-31 13:28:30 +02:00
ansuz
6e9968f989
add 'lol' code theme
2017-03-31 09:19:45 +02:00
ansuz
9b4b642d4a
protect against subtly corrupted user objects
2017-03-30 17:19:49 +02:00
ansuz
d4ce3dc6b9
don't rewrite css rules. FOUC is too long
2017-03-29 16:02:04 +02:00
ansuz
3cfd0a4326
commit some garbage
2017-03-29 15:40:34 +02:00
ansuz
ed89a13fe6
progress on adding version string to some css
2017-03-29 12:55:36 +02:00
ansuz
76990ac1b2
version toolbar.css for cache-busting
2017-03-29 11:56:03 +02:00
ansuz
a0c17d7c9b
latest rpc code
2017-03-27 18:15:15 +02:00
ansuz
59a80d5fde
remove silly TODO
2017-03-27 12:08:19 +02:00
yflory
a8ffac5dcd
Remove old code
2017-03-27 11:30:09 +02:00
ansuz
fa9249ef29
don't notify for userlist changes if a user joins twice
2017-03-24 13:17:51 +01:00
ansuz
40f5e1706f
add a unique id to user objects, define a getter
2017-03-24 12:17:49 +01:00
yflory
994d640f8b
Fix an issue causing the lag icon to lose its color
2017-03-21 14:52:49 +01:00
yflory
6fbd1f0028
Store the dates as number and not strings to avoid ot issues
2017-03-21 14:46:40 +01:00
yflory
51033ab70a
Remove useless links in the context menu and properties for readonly pads in the drive
2017-03-21 12:09:07 +01:00
yflory
7afde2309d
Add properties to the files not in the trash
2017-03-21 11:34:18 +01:00
ansuz
b542245086
fix lint error
2017-03-20 18:11:26 +01:00
ansuz
cc43bb8362
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-20 18:05:39 +01:00
ansuz
98027dad27
jshint compliance
2017-03-20 18:02:11 +01:00
ansuz
4a173e30dc
set user's cursor to either the beginning or end of the document
2017-03-20 17:51:56 +01:00
yflory
29174b2922
Update the lag icon
2017-03-20 16:39:33 +01:00
yflory
26edb77cf0
Fix style and usability issues in slides
2017-03-20 15:20:42 +01:00
ansuz
d422c7e165
support old hashes in getUserChannelList
2017-03-16 17:14:54 +01:00
ansuz
5ed6223313
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-16 14:47:03 +01:00
ansuz
c9c9dd0999
use userChannelList if a list is not supplied to pinpad
2017-03-16 14:46:17 +01:00
ansuz
e8c3cf6aa5
implement rpc message signing
2017-03-16 14:45:38 +01:00
ansuz
d85a42c776
include User_hash in user channel list
2017-03-16 14:43:57 +01:00
yflory
7761aaa89f
Add search UI
2017-03-16 14:16:42 +01:00
ansuz
c3c866fa2b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-15 18:59:53 +01:00
yflory
d19bbcb001
Add support for search in the drive
2017-03-15 18:59:55 +01:00
ansuz
5eb32b33ee
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-15 18:59:38 +01:00
ansuz
298725b3c2
don't show usage tips on error screens
2017-03-15 18:58:39 +01:00
ansuz
0a6373852e
add signing keys to user object at login and register time
2017-03-15 18:57:13 +01:00
yflory
b9c64a526a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-15 17:15:03 +01:00
yflory
15e9af77bb
Remove the langauge selector from toolbar and add it in settings
2017-03-15 17:14:49 +01:00
ansuz
8129b8cdc1
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-15 16:05:05 +01:00
ansuz
15a67afc75
jshint compliance
2017-03-15 16:04:52 +01:00
yflory
13d7b3cadc
Merge branch 'd' into staging
2017-03-15 16:01:29 +01:00
ansuz
7187d3c550
implement getUserChannelList
2017-03-15 15:55:55 +01:00
ansuz
306f6ce806
resolve merge-conflict with accounting branch
2017-03-14 15:52:04 +01:00
yflory
f10149db1c
Make sure the tip is always visible when the loading screen is removed
2017-03-14 12:49:22 +01:00
ansuz
71db08eac2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-14 12:40:25 +01:00
ansuz
09afba80db
add support for logging in from register page
2017-03-14 12:39:50 +01:00
yflory
16e5788011
Call the callback if we can't parse the local Drive to import it
2017-03-14 12:09:52 +01:00
ansuz
413d9a6f0b
add a style-callback to confirm
2017-03-14 12:01:42 +01:00
ansuz
803e57c958
add more parameters to confirm dialogs
2017-03-13 19:30:56 +01:00
yflory
ceaf757680
Allow right click on the CryptPad logo/link in the top left corner
2017-03-13 18:49:30 +01:00
ansuz
f2aa531f27
apply styles to confirm buttons if provided
2017-03-13 18:18:38 +01:00
ansuz
df6298eeb6
apply styles to confirm buttons if provided
2017-03-13 18:18:17 +01:00
ansuz
07a2d8e189
apply translations on feedback page
2017-03-13 12:56:49 +01:00
yflory
b7986ff6b1
Replace the spinner code with a font awesome spinner
2017-03-13 11:52:39 +01:00
ansuz
d9996cc874
current work for pinning
2017-03-13 10:56:08 +01:00
ansuz
b3cc8da315
implement basic clientside RPC infrastructure
...
and provide a basic example for testing it
2017-03-10 18:03:52 +01:00
ansuz
81027b4200
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into accounting
2017-03-10 10:49:33 +01:00
yflory
459b18c97b
Add the loading screen in the HTML so that it is displayed before JS is loaded
2017-03-08 18:05:15 +01:00
yflory
404fa378e6
Move the store to the 'common' folder, it is not customizable anymore
2017-03-08 16:47:38 +01:00
yflory
0c1efd361b
Make sure the href is updated everywhere when importing a stronger link
2017-03-08 15:49:02 +01:00
yflory
b701e3cc85
Fix lint errors
2017-03-08 14:59:51 +01:00
yflory
4206382865
Fix the settings app to allow backup for unregistered users
2017-03-08 14:45:39 +01:00
yflory
f62267f8a1
Ability to import local pads in the user object
2017-03-07 18:39:21 +01:00
ansuz
e2418a6be2
sketch of how pinning rpc will look
2017-03-07 17:33:31 +01:00
ansuz
dc567fa7f3
signing keys are stored in hex so encode and decode them
2017-03-07 17:30:32 +01:00
yflory
9ad33574e9
Fix the function returning the pads list in the drive
2017-03-07 14:30:07 +01:00
yflory
d93a270336
Ability to display tips in the loading screen
2017-03-06 17:20:09 +01:00
yflory
77d09f64e1
Display anonymous users in the user list
2017-03-06 14:56:41 +01:00
yflory
cb88227e2b
Autocomplete on key press in some dropdown menus
2017-03-06 12:20:23 +01:00
yflory
2a1b241592
Display a button to open the editing link while in read-only mode if we know it
2017-03-03 18:14:53 +01:00
yflory
ed9bcca96f
Close the websocket network when CryptGet/CryptPut is done
2017-03-03 12:48:00 +01:00
ansuz
0bb10a8a0a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-02 17:59:35 +01:00
ansuz
e1303a16da
add support for title attributes on dropdowns
2017-03-02 17:40:29 +01:00
yflory
52793385ea
Fix lint errors
2017-03-02 17:17:55 +01:00
ansuz
01c4d7d4a7
Merge branch 'maybe' into staging
2017-03-02 17:09:06 +01:00
ansuz
c884782d57
here are some changes
2017-03-02 17:08:50 +01:00
yflory
9a7c2dd5e2
Add a 'settings' link to the user menu in static pages
2017-03-02 16:38:22 +01:00
yflory
c5f983ecd7
Convert read-only link to editing link in the drive
2017-03-02 16:01:34 +01:00
ansuz
a9afa24428
return empty string instead of blowing up when fixing HTML
2017-03-02 11:38:20 +01:00
yflory
8bdc8415ab
Find a pad in the drive
2017-03-02 10:15:13 +01:00
Caleb James DeLisle
91eda5fa83
Implement stronger content-security-policy except in /pad/ which does not allow it.
...
Implement a "loader" which allows for applying a version number to everything.
Added a cache control for anything which has a version.
2017-03-01 21:06:53 +01:00
ansuz
7db0e14bc0
add 'force' flag to override removal of html elements
2017-03-01 17:05:57 +01:00
ansuz
cb5e01815c
validate all alertify strings by default. require 'force' argument to bypass
2017-03-01 15:07:34 +01:00
yflory
2c5c6da0d9
Fix XSS in alertify logs
2017-03-01 13:09:14 +01:00
yflory
5797aab3f2
Fix XSS with display names in the user list
2017-03-01 13:08:36 +01:00
yflory
26e3971482
Fix XSS in the user dropdown menu
2017-03-01 13:08:09 +01:00
ansuz
5d39125004
Make onSettle Async Again
2017-02-28 13:12:04 +01:00
yflory
4f4075ed6e
Make the settings app available to anonymous users
2017-02-28 11:23:50 +01:00
ansuz
12aec60a12
hack around onSettle not doing its job
2017-02-28 11:05:59 +01:00
ansuz
1a259bb3aa
check if user has disallowed feedback api
2017-02-27 20:02:54 +01:00
yflory
498f4065cf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-27 14:29:55 +01:00
yflory
66dc166936
Make sure the realtime is synced with onSettle when using cryptget
2017-02-27 14:28:12 +01:00
ansuz
de5a21fe57
add a simple feedback api and text explaining what it is
2017-02-27 12:06:49 +01:00
yflory
88b29e8bdd
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-24 18:55:48 +01:00
yflory
5303e76ece
Make sure the content is correctly applied in onReady
2017-02-24 18:55:41 +01:00
ansuz
cc829d51f8
jshint compliance
2017-02-24 18:23:43 +01:00
yflory
42b6cca18d
Fix new pad not working
2017-02-24 16:55:43 +01:00
yflory
3fd5669647
Hide the trash icon for read-only pads if we have the edit link in drive
2017-02-24 16:51:15 +01:00
yflory
e15a6a347f
Fix the forget pad button
2017-02-24 15:22:26 +01:00
yflory
54b0a86c2e
Make sure we redirect to the drive if we access the login page from the homepage
2017-02-24 11:44:47 +01:00
yflory
ba0b314f5e
Fix the 'new' button in drive which was broken in non root categories
2017-02-23 18:15:44 +01:00
yflory
0ce17ebbad
CryptDrive usability improvements (new file in drive + context menu)
2017-02-22 12:25:29 +01:00
ansuz
7e77c6828a
more correct pluralization
2017-02-21 18:55:48 +01:00
yflory
c72bbd4c37
Use the file name as initial title
2017-02-21 17:42:58 +01:00
yflory
47b8fefd9e
Load messages.js only once, in cryptpad-common
2017-02-21 14:16:23 +01:00
yflory
11d9c9e813
Merge branch 'master' into staging
2017-02-21 10:44:03 +01:00
yflory
2103f0afa8
Merge branch 'master' of github.com:xwiki-labs/cryptpad
2017-02-21 10:42:35 +01:00
yflory
0bdf59c1dd
Fix broken link in the 'New' button on cryptpad.fr
2017-02-21 10:42:06 +01:00
yflory
d81d17b86c
Remove old translations keys no longer used
2017-02-17 17:39:27 +01:00
yflory
239e2bcc1f
Fix issue with null entries in Cryptpad_RECENTPADS
2017-02-17 15:18:09 +01:00
yflory
1540ae3f6f
Fix issue with null entries in Cryptpad_RECENTPADS
2017-02-17 15:16:30 +01:00
ansuz
94417d9a8b
jshint compliance
2017-02-17 14:28:18 +01:00
ansuz
c9b8889380
add cache-busting to chainpad-crypto
2017-02-17 11:26:43 +01:00
ansuz
09fade6127
add cache-busting to chainpad-crypto
2017-02-17 11:25:35 +01:00
yflory
2daa9f8658
Link to main page was opened in the inner iframe
2017-02-17 10:57:56 +01:00
yflory
deda40375a
Use the new onSettle from chainpad to determine if the realtime is synced
2017-02-17 10:31:07 +01:00
yflory
92d50ded64
Merge branch 'soon' into staging
2017-02-16 16:48:12 +01:00
yflory
97762f9f9a
Make sure all the elements in RECENTPADS are non-null objects
2017-02-16 16:07:43 +01:00
yflory
e4dbe97d71
Update display name in realtime across tabs and remember 'anonymous' name
2017-02-16 15:35:03 +01:00
yflory
7762ffcbff
Ability to use Ctrl+click on the cryptpad logo in apps
2017-02-15 18:31:36 +01:00
yflory
7497e0d1c5
Add a dropdown user menu to the top bar in static pages
2017-02-15 17:57:42 +01:00
yflory
7758d056fa
Ability to import/export a user realtime object
2017-02-15 12:40:28 +01:00
yflory
cd9cea8fa4
Create a settings app to manage user objects
2017-02-14 19:04:57 +01:00
yflory
71b84afdb2
Redirect to the pad when logging in or signing up from a pad
2017-02-14 11:29:08 +01:00
yflory
92050eb04f
Fix the trash button in toolbar not always working
2017-02-14 10:56:38 +01:00
yflory
aae3fba284
Fix the storage when the hash is invalid
2017-02-13 17:54:01 +01:00
yflory
b1b294aade
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-13 11:10:40 +01:00
yflory
3aa03225c9
Add a spinner when hashing the password and translate homepage
2017-02-13 11:09:30 +01:00
ansuz
fbcf4ccec4
force usernames to be lowercase
2017-02-13 11:01:30 +01:00
ansuz
5614bea271
redirect users to login and register from toolbar
2017-02-13 10:51:54 +01:00
ansuz
f723585758
add api to check whether the realtime has synced with the server
2017-02-13 10:42:17 +01:00
ansuz
d0edf75c89
signup link directs users to register page, not user
2017-02-10 16:48:28 +01:00
ansuz
1232aa8a79
jshint compliance
2017-02-10 14:25:02 +01:00
yflory
8eec7ec7c8
Fix typo
2017-02-10 11:00:34 +01:00
ansuz
f92ba193c3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-09 17:16:03 +01:00
ansuz
e100110741
implement log in as an api
2017-02-09 16:31:57 +01:00
yflory
f8366e0cfc
Remove support for legacy store and add a way to import legacy pads
2017-02-09 15:23:09 +01:00
yflory
67d881b2cf
Remove the drive entry from the user menu if already in drive
2017-02-08 16:25:52 +01:00
yflory
914c442615
Do not redirect to home page when logging out from another tab
2017-02-08 12:54:07 +01:00
yflory
702798f65a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-07 18:47:24 +01:00
yflory
1e2cc6bea4
Fix race condition with the iframe store
2017-02-07 18:47:10 +01:00
ansuz
6e97082ff9
remove dead code from login function
2017-02-07 17:27:36 +01:00
ansuz
8a1acc3c37
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-07 10:40:03 +01:00
ansuz
6f07a3b7b4
erase lingering sessionStorage values when logging out
2017-02-07 10:39:42 +01:00
yflory
ac79fbb5a2
Improve mobile support for the toolbar and the drive
2017-02-06 18:06:59 +01:00
yflory
9f1789b2d2
Fix creation of pads from non-root category in the drive
2017-02-06 14:47:37 +01:00
yflory
ad82a275bc
Replace the Apps button by a New button again
2017-02-06 11:39:04 +01:00
yflory
fd33ffd56f
Fix issue creating a patch everytime the user clicked in an app
2017-02-06 11:12:08 +01:00
yflory
87abfac5e0
Fix lint error
2017-02-03 16:53:47 +01:00
yflory
02439e0f61
Improve the homepage with new images and translations
2017-02-03 16:03:36 +01:00
yflory
2c6b4b9c6a
Hide disabled applications from the context menu in drive
2017-02-02 18:40:39 +01:00
yflory
91299f5f30
Ability to access the drive from any pad
2017-02-02 18:22:59 +01:00
yflory
b0fb56fa63
Allow logge din users to access the home page
2017-02-02 18:09:27 +01:00
yflory
65054119cf
Fix a bug preventing reconnection in drive
2017-02-01 17:21:54 +01:00
yflory
757ae7a3ad
Fix a cross origin frame issue with dropdowns
2017-02-01 12:19:54 +01:00
yflory
39c85ca3f7
Fix race condition causing missing translations in homepage
2017-01-31 12:01:33 +01:00
yflory
5e69b78334
Remove the domain from the href in store
2017-01-30 18:52:27 +01:00
yflory
58d8a30b5b
Redirect to the main page when logging out
2017-01-30 15:26:32 +01:00
yflory
5ef074370b
Name a place before creating it in the drive
2017-01-27 17:51:08 +01:00
yflory
0e9e0e545f
Load the new pad when the hash is changed
2017-01-27 14:57:45 +01:00
yflory
e41cbb92d8
Use default FILES_DATA name if not provided
2017-01-26 16:52:23 +01:00
yflory
c44f3a1044
Delete multiple elements could also remove unselected ones
2017-01-26 16:18:43 +01:00
yflory
3f44444f41
Display the 'New' button in the trash
2017-01-26 13:19:40 +01:00
yflory
11f0a9ae5f
Revert the changes adding anonymous pads
2017-01-25 15:35:40 +01:00
yflory
f42665ba49
Remove the unowned pads category
2017-01-25 14:27:06 +01:00
yflory
cb85ad3fdf
Merge branch 'newtoolbar' into ownedpads
2017-01-25 10:23:03 +01:00
yflory
373b07ed28
Fix lint errors
2017-01-25 10:21:31 +01:00
yflory
015e6fc262
Make sure we have the same hash in all the tabs when disconnecting
2017-01-24 18:17:23 +01:00
yflory
88021f2264
Anonymous pads fo anonymous users
2017-01-24 18:14:29 +01:00
yflory
9d275daebb
Backport changes for the login page from hpbs branch
2017-01-24 12:47:53 +01:00
yflory
99b8898e54
Apply new title when clicking on the page without pressing enter
2017-01-19 15:41:25 +01:00
yflory
88d5b4cc9c
Add a 'New pad' button in the toolbar
2017-01-18 11:00:46 +01:00
yflory
a9063e0459
Reload all tabs when the user logs in or out
2017-01-16 14:08:44 +01:00
yflory
efed1f5efe
Add handlers to login and logout buttons
2017-01-13 17:39:41 +01:00
yflory
767ba8b549
Select what we want to display in the toolbar
2017-01-13 17:14:44 +01:00
yflory
2afdc11327
Replace the username button by a dropdown menu
2017-01-13 17:11:12 +01:00
yflory
4adde0f0c0
Use the new dropdown for userlist and share
2017-01-13 15:05:00 +01:00
yflory
efffd4974f
Add createDropdown and createLanguageSelector in cryptpad-common
2017-01-12 18:28:38 +01:00
yflory
29c8f0bbef
Use a FontAwesome spinner to replace the old unaligned one
2017-01-12 17:05:16 +01:00
yflory
3f1e287811
Fix an issue causing a user object to be turned into a pad
2017-01-12 11:09:45 +01:00
yflory
569ea21705
Replace the language selector by our custom dropdown menu
2017-01-11 10:59:09 +01:00
yflory
26dd4ea11f
Fix lint errors
2017-01-10 15:33:21 +01:00
yflory
4278ac7637
Merge branch 'soon' into fileManager
2017-01-10 15:07:48 +01:00
yflory
2be5db9540
Ability to open files in readonly mode
...
Fix CSS issues
2017-01-10 15:04:02 +01:00
yflory
f74d0a46a4
Remove the alert when pressing del in 'all files'
2017-01-09 18:38:05 +01:00
ansuz
1c3f1a15cd
make sure that /pad is resized after loading
2017-01-09 17:02:01 +01:00
yflory
5b08fed7fa
Ability to add files from the drive toolbar
...
Fix CSS issues with the different toolbars
Translate the backup URL button alert
2017-01-09 16:29:16 +01:00
yflory
d5561910d4
Move the file manager into /drive and add a toolbar
2017-01-06 18:26:41 +01:00
yflory
1e70af0c16
Use the same network for the apps and the file store
2017-01-06 13:52:53 +01:00
ansuz
e56cc49f79
catch errors that popped up because of a cross-origin iframe
2017-01-05 14:14:26 +01:00
ansuz
5cd714b18a
configure filestore usage via customize/application_config.js
2017-01-03 12:10:11 +01:00
ansuz
91a806ab86
focus on OK button when we pop an alert
2016-12-29 17:10:59 +01:00
ansuz
89e5830409
make alertify display time configurable
2016-12-28 17:13:00 +01:00
ansuz
5e1d8292c5
guard against trying to parse special fragments
2016-12-26 14:23:17 +01:00
ansuz
52a593c2c2
fix jshint complaints
2016-12-22 17:27:56 +01:00
ansuz
53a4d4738a
really make sure you're logged out
2016-12-22 17:22:32 +01:00
ansuz
5534da8abf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login
2016-12-22 16:54:51 +01:00
yflory
9b6c9e3891
Add support for templates in the file manager
2016-12-22 16:53:38 +01:00
ansuz
29d406b7a9
implement cryptput
2016-12-22 16:00:13 +01:00
yflory
87abfff66b
Fix Flash Of Unstyled Content (fouc)
2016-12-21 18:33:21 +01:00
ansuz
1682d23c1c
remove old user prototype
2016-12-21 18:06:05 +01:00
yflory
c359c27997
Use user object as default store in file manager
2016-12-20 17:27:45 +01:00
yflory
4aed585574
Fix style issues in the toolbar
2016-12-20 14:40:00 +01:00
ansuz
bd6992da0a
create a random hash
2016-12-20 11:13:15 +01:00
ansuz
2cd50498c2
add log(in|out) functions to common
2016-12-20 11:11:40 +01:00
ansuz
7df460c766
implement createChannelId api
2016-12-19 14:55:39 +01:00
ansuz
5a14db9f07
Merge branch 'test-filemanager' into login
2016-12-19 12:37:28 +01:00
ansuz
303953a431
Merge branch 'soon' into login
2016-12-19 11:04:46 +01:00
ansuz
6b9529b121
implement ajax-like functionality for zk docs
2016-12-19 10:59:18 +01:00
yflory
5bc7766f44
Use a consistent toolbar across all apps
2016-12-16 18:35:49 +01:00
ansuz
2968488278
convert uint8 arrays to hex
2016-12-16 15:18:06 +01:00
yflory
8e6830d080
Fix file manager with a chosen hash
2016-12-12 18:24:45 +01:00
yflory
ee56f5608f
Fix the infinite spinner bug with the file manager store
2016-12-08 18:52:36 +01:00
yflory
43ccd11adc
Merge branch 'infiniteSpinner' into fileManagerMerge
2016-12-08 16:03:18 +01:00
yflory
05fd6c1563
Fix the infinite spinner problem
2016-12-08 16:01:46 +01:00
yflory
cb43eb9ca1
Merge branch 'newpoll' into fileManagerMerge
2016-12-07 16:59:43 +01:00
yflory
9b3719e0ae
Merge branch 'soon' into fileManagerMerge
2016-12-07 16:59:32 +01:00
yflory
6dff82ede2
Improve UI, scrollbar in the table, publish/admin buttons
2016-12-05 18:54:46 +01:00
yflory
90804ed9e0
Add usernames/userlist in the toolbar and fix publish button
2016-12-01 18:40:09 +01:00
yflory
5a5451d94c
Sort elements in the trash, add properties in the context menu, fix issue with Edge
2016-11-23 18:21:45 +01:00
yflory
a957b72598
Create a new pad from the file manager
2016-11-21 18:49:13 +01:00
yflory
d6e1215166
Refresh the directory if needed when the object has changed
2016-11-18 17:17:48 +01:00
yflory
118829617f
Use the FS store as default store
2016-11-17 18:27:55 +01:00
ansuz
c2770a7a74
set correct hash even if browser does not implement replaceState
2016-11-07 15:03:17 +01:00
ansuz
303c65f2c3
use replaceState if available, instead of setting the hash
2016-11-07 11:20:30 +01:00
ansuz
2d5448458b
export messages
2016-11-03 12:45:11 +01:00
ansuz
d512b113cd
address failure to parse url when hash is not present
2016-11-02 18:28:19 +01:00
yflory
ab1d3958ce
Add a pencil icon when hovering the title
2016-10-26 17:49:16 +02:00
yflory
6d1e06cca3
Add notifications when a user joins or leaves the channel
2016-10-26 15:02:30 +02:00
yflory
54a63267cd
Add a share button and merge the viewers and editors buttons
2016-10-25 18:34:23 +02:00
yflory
87d86384ac
Fix broken elements in the new toolbar
2016-10-25 17:29:13 +02:00
yflory
6351d1856f
Remove the top bar and move its content in the applications' toolbars
2016-10-25 15:22:35 +02:00
yflory
3d74290c7d
Merge branch 'usability5' into staging
2016-10-24 18:33:10 +02:00
yflory
9e92a597b3
Ability to edit the title in the toolbar by clicking it
2016-10-24 18:32:43 +02:00
ansuz
a8612ed1c7
Merge branch 'usability5' of github.com:xwiki-labs/cryptpad into staging
2016-10-24 14:54:35 +02:00
Yann Flory
10bb5e1607
Add the title in the toolbar
2016-10-21 18:16:27 +02:00
Yann Flory
1e003b13a8
ask anonymous, first-time users to set their name when they first join a pad
2016-10-21 15:17:15 +02:00
yflory
51a79c5218
Remove unused dependency
2016-10-18 13:38:48 +02:00
yflory
9a733bb360
Fix dropdown menus with Edge
2016-10-13 15:00:53 +02:00
yflory
39bbf8a6c1
Fix the new userlist button and make the toolbar responsive
2016-10-13 14:24:59 +02:00
yflory
24fbe22c9d
Improve the toolbar style and the way the userlist is displayed
2016-10-12 18:40:26 +02:00
yflory
d2389a5729
Change the userlist in the toolbar
2016-10-11 18:39:43 +02:00
yflory
91b4446c0b
Merge branch 'fix-chrome-style-bug' into soon
2016-10-10 17:07:50 +02:00
ansuz
bb2317d8e6
fix chrome style bug by forcing reload of style sheet
2016-10-07 17:41:52 +02:00
yflory
765498e88e
Remove the support for old.cryptpad.fr
2016-10-07 10:39:48 +02:00
yflory
c322aa440e
Fix the username icon hcih was not working anymore
2016-10-05 18:19:52 +02:00
yflory
8575f3f79f
Fix the "rename" feature which was not working anymore in some cases
2016-10-05 17:22:56 +02:00
yflory
a989b51d74
Fix race conditions with Alertify
2016-10-05 16:04:21 +02:00
yflory
74df38f94f
Fix race conditions that could prevent applications from being loaded
2016-10-05 11:19:18 +02:00
ansuz
dbc8f01b8b
fix merge errors and reach full jshint compliance
2016-10-04 16:58:10 +02:00
yflory
a30e17121d
Merge branch 'readonlyButton' into soon
2016-10-04 15:48:52 +02:00
yflory
e84a54556c
Move the toolbar buttons' events handlers in cryptpad-common
2016-10-04 15:44:12 +02:00
ansuz
2ac1b02572
Merge branch 'config-sockets' into soon
2016-10-04 14:38:50 +02:00
ansuz
3dfa19b786
more flexible websocket configuration (WIP)
2016-10-03 19:19:38 +02:00
yflory
76fdadee7f
Store only the strongest hash in the localstorage
2016-10-03 18:23:59 +02:00
yflory
17b4f91810
Do not share the title in the doc if it is the default title
2016-10-03 16:05:39 +02:00
yflory
391728ee6d
Use CodeMirror in /slide #2
...
Fix title errors in the slide app caused by the present mode
2016-10-03 14:21:39 +02:00
yflory
8c33218ceb
Move the codemirror themes in /common
2016-10-03 14:19:37 +02:00
Yann Flory
2609af2105
Use the CodeMirror editor in the slide application
2016-09-30 17:39:16 +02:00
yflory
f03018f3bc
Improve the top bar and use the font awesome icons in /code
2016-09-28 15:28:25 +02:00
yflory
3d54413343
Improve the UI with FontAwesome icons
2016-09-27 18:33:03 +02:00
ansuz
d6525087c7
jshint compliancy
2016-09-23 17:53:24 +02:00
yflory
d46bd1af5c
Improve the toolbar UI with the username displayed
2016-09-22 17:56:51 +02:00
yflory
79884e2400
Use the same username for all pads
2016-09-22 17:12:46 +02:00
yflory
dde519795d
Merge branch 'newhash' into newhashNoConflict
2016-09-22 16:14:48 +02:00
ansuz
f29e3d7b0d
don't let notifications interfere with document titles
2016-09-21 14:34:56 +02:00
yflory
83705ae058
Improve the UI in read-only mode
2016-09-20 18:22:40 +02:00
ansuz
fa8199bc75
don't try to use experimental user code
2016-09-20 16:22:00 +02:00
Yann Flory
99b50465c7
Add the read-only mode for /pad and /code
2016-09-19 17:52:37 +02:00
Yann Flory
42f14873cd
Merge branch 'translations' into newhashmerge
2016-09-19 14:53:40 +02:00
Yann Flory
391b7690e6
Set the pad to readonly mode when using a 'view' url
2016-09-19 14:52:36 +02:00
Yann Flory
368e253c9f
Ability to send a read-only URL
2016-09-16 18:45:40 +02:00
yflory
5c63585952
Complete the French translation
2016-09-15 18:35:09 +02:00
yflory
0d9f63b977
Merge branch 'translations' - part one
2016-09-15 10:36:05 +02:00
yflory
f086492e50
Improve the localization system
...
Improve and enable the French translation
2016-09-14 18:08:52 +02:00
yflory
25c8d16bf5
Use a new version-prefixed hash parser
2016-09-13 17:43:56 +02:00
yflory
c736caceba
Use a better default pad title
2016-09-13 12:24:06 +02:00
ansuz
97415d8158
Merge branch 'users'
2016-09-01 17:38:25 +02:00
ansuz
8e86be81b2
Merge branch 'better-slides'
2016-09-01 16:01:21 +02:00
ansuz
fb21b4e46b
fix up /render/
2016-09-01 15:54:21 +02:00
ansuz
4941c1493e
better user integration. a few more common utils
2016-09-01 12:15:30 +02:00
ansuz
30ea1b59b7
integrate users into common utilities
2016-08-30 18:09:53 +02:00
ansuz
6d775f61c6
add missing functions
2016-08-30 10:06:14 +02:00
ansuz
168338b898
add missing functions
2016-08-29 18:10:15 +02:00
ansuz
f47a6f1cbb
Merge branch 'master' of github.com:xwiki-labs/cryptpad
2016-08-25 17:59:37 +02:00
ansuz
f40b798d88
Merge pull request #30 from xwiki-labs/reconnect
...
Ability to reconnect after a connection failure
2016-08-25 17:57:45 +02:00
yflory
c168ce2d1c
Ability to reconnect after a connection failure
2016-08-25 17:56:17 +02:00
ansuz
1bec02239c
coerce dates into strings
2016-08-25 11:19:09 +02:00
ansuz
0add01a940
remove dead code
2016-08-25 11:08:15 +02:00
ansuz
8c914dfe1f
better filenames
2016-08-19 10:47:07 +02:00
ansuz
7eaa4ce733
recognize pads with the same type and hash as identical no matter their domain
2016-08-05 17:17:49 +02:00
ansuz
5131f47cca
jshint compliance
2016-08-03 17:03:50 +02:00
ansuz
306d524416
fix broken removal call
2016-08-03 16:53:41 +02:00
ansuz
dd3a5d47be
migrate localStorage so people go to cryptpad.fr
2016-08-03 11:08:45 +02:00
ansuz
a094e3c02e
use correct store api calls in frame.js
...
also don't log unnecessarily
2016-08-03 11:02:40 +02:00
ansuz
dcc9810a42
avoid extra call to store if there are no keys to remove
2016-08-03 09:42:49 +02:00
ansuz
9a5294016d
fix incorrect usage of store api
2016-08-03 09:35:16 +02:00
ansuz
4e5f381325
add spinner to API. update bower deps
2016-08-02 18:56:35 +02:00
ansuz
fa654a7646
slightly better regex
2016-08-02 17:08:46 +02:00
ansuz
cd18075ac7
add some redirection logic to support old hash types
2016-08-02 15:17:20 +02:00
ansuz
600f3151e9
don't use the store until it's ready to be used
2016-08-02 12:11:40 +02:00
ansuz
fffa9acf15
remove unused files from fs and jshintignore
2016-08-02 11:59:54 +02:00
ansuz
551d38c930
let the abstraction take care of stringification
2016-07-29 18:05:58 +02:00
ansuz
0ada6a3d0a
jshint compliance. gotta keep those tests green
2016-07-28 17:52:26 +02:00
ansuz
1f24d7126c
big ugly commit that will be really hard to audit
...
This changeset applies new styles to the poll.
it also uses the new asynchronous wrappers around the localStorage api.
this is necessary because we're migrating to a storage system that will
use an async api.
The changes to the poll just happened to coincide with the async stuff.
My apologies to anyone who wants to read this whole thing
2016-07-28 17:44:40 +02:00
ansuz
7f02c899ea
add snippet for copying text to the clipboard
2016-07-28 10:08:51 +02:00
ansuz
42eafe9e29
don't create duplicate stylesheets in the document head
2016-07-25 15:39:54 +02:00
ansuz
c6bdb7506d
forget everything about a pad when you forget it
2016-07-22 15:18:09 +02:00
ansuz
e84fbf0bc3
more helpers in common
2016-07-22 12:24:54 +02:00
ansuz
ff74a67a09
translate alertify button messages
2016-07-12 16:43:33 +02:00
ansuz
d39ab5c250
point to the actual translation file
2016-07-12 15:52:36 +02:00
ansuz
dea8e225db
fix double scrollbar issue
2016-07-12 15:45:49 +02:00
ansuz
3eccec7054
better effort for translation
2016-07-11 17:36:53 +02:00
ansuz
cbeaa8d609
major refactoring for toolbar. CAN HAZ LESS
2016-07-08 16:45:48 +02:00
ansuz
7504f79e05
add log and warn methods to cryptpad common
2016-07-08 16:45:15 +02:00
ansuz
3ad5d71ab1
make sure the regular favicon is set
2016-07-07 13:43:08 +02:00
ansuz
fd3cd73d0b
try to fix favicon bug
2016-07-07 13:40:03 +02:00
ansuz
589b0087a1
listen for keyup events while alertify prompts are active
2016-07-07 13:27:45 +02:00
ansuz
deae7ac78f
don't hide the notification until it has been seen
2016-07-07 10:45:09 +02:00
ansuz
3d3c6e4800
add wrappers for alertifyjs
2016-07-06 22:20:15 +02:00
ansuz
73d2b6561a
add small modules for page visibility api and notification apis
2016-07-06 22:16:17 +02:00
ansuz
d8b467422a
fix default title in localStorage migration
2016-07-04 16:43:39 +02:00
ansuz
7a5877d12a
don't filter pads after 30 days
2016-07-04 15:34:43 +02:00
ansuz
d844551fba
add a forget button. clean up toolbar a bit
2016-06-30 17:24:25 +02:00
ansuz
8a82e11306
make sure title is defined for home page usage
2016-06-30 15:53:13 +02:00
ansuz
71b1f71ba0
fix migration to include ctime
2016-06-30 15:15:38 +02:00
ansuz
7da58a0de9
improve pad naming UX, slight refactoring
...
* prevent naming conflicts
* migrate localestorage to use named attributes
* use ctime and atime
* display default names in table
* sort pads by most recent atime
* move more functions into cryptpad common
* change table styles
2016-06-30 15:10:32 +02:00
ansuz
a3da10766a
add rename button to /code/ and /pad/
2016-06-30 10:51:19 +02:00
ansuz
93dcf29c15
more functions for working with localstorage
2016-06-30 10:43:56 +02:00
ansuz
d025d13295
address some jshint complaints
2016-06-23 16:44:20 +02:00
ansuz
12bbf3e8f6
don't drop values onto the window
2016-06-23 16:38:40 +02:00
ansuz
ca45e3533d
pass loaded file to callback when importing
2016-06-23 16:38:24 +02:00
ansuz
1a5905d9fd
more work on highlighting modes in codemirror
...
* style the select menu
* add more modes
* preset language selection to 'javascript'
* don't prompt the user with a silly hash when changing their name
2016-06-23 12:07:51 +02:00
ansuz
31aa09d6f6
work a bit more on import/export and code highlighting
2016-06-22 20:58:50 +02:00
ansuz
242c9a99e3
implement import and export in /pad/
2016-06-22 17:00:07 +02:00
ansuz
0a8137e7eb
move rememberPad to cryptpad common and simplify it a bit
2016-06-21 18:46:19 +02:00
ansuz
c3d2568d3c
add file export for codepad
...
addresses #24
2016-06-17 10:59:45 +02:00
ansuz
2b8c21d292
set styles with setAttribute. fixes style fights
2016-06-16 13:00:48 +02:00
ansuz
1746a4e732
use crypto from bower
2016-06-06 12:35:06 +02:00
ansuz
2a3ff256b9
remove libraries which are now in bower
2016-06-06 12:29:45 +02:00
ansuz
f72cb24fc5
rm LORIA
2016-06-06 12:27:42 +02:00
ansuz
2c3de49922
remove realtime-input, since it's in bower now
2016-06-06 12:15:00 +02:00
ansuz
2798d1b1f9
all of the list/map api's dependencies are now on bower
2016-06-06 11:54:37 +02:00
ansuz
58c968b319
minor cleanup in realtime-input
2016-06-03 18:55:32 +02:00
ansuz
288b4d5b66
depend on main passing in the crypto module for now
2016-06-03 18:52:35 +02:00
ansuz
85dbd5cb6e
pass in websocketURL from main
2016-06-03 17:27:01 +02:00
ansuz
d9a4f2f22c
missed one
2016-06-03 16:44:15 +02:00
ansuz
ff0f7d15dc
use json-ot from bower
2016-06-03 16:23:25 +02:00
ansuz
58633af943
listmap can be reused. put it in common/
2016-06-03 15:47:34 +02:00
ansuz
dbf1e2b870
support reusing the netflux network
...
export more internals from realtime input
2016-06-03 15:30:51 +02:00
ansuz
83696495a8
use chainpad from bower, not local
2016-06-02 16:54:47 +02:00
ansuz
954ee26f4d
fix undefined disconnect reason
2016-06-01 12:19:54 +02:00
ansuz
9336c4de5c
import latest chainpad
2016-05-31 12:35:01 +02:00
ansuz
058548b95a
revert my reversion
...
Revert "Revert "Added checkpoints with the new code from ChainPad""
This reverts commit 6e2e8bf21f
.
2016-05-30 14:58:20 +02:00
ansuz
6e2e8bf21f
Revert "Added checkpoints with the new code from ChainPad"
...
This reverts commit da2bfe2de9
.
2016-05-30 10:20:08 +02:00
ansuz
ce99bd9ba3
Merge branch 'two' of github.com:xwiki-labs/cryptpad into two
2016-05-28 13:15:33 +02:00
ansuz
a0c73c95d8
do away with a bit of boilerplate
2016-05-28 13:13:54 +02:00
Caleb James DeLisle
da2bfe2de9
Added checkpoints with the new code from ChainPad
2016-05-26 17:09:02 +02:00
ansuz
cf85de6113
remove old bencoding code
2016-05-25 11:54:36 +02:00
ansuz
d99bb8ff84
WIP : fallback to old parsing doesn't work
2016-05-20 17:46:48 +02:00
ansuz
f04be53d11
fall back to old parsing if the message is bencoded?
2016-05-20 16:45:25 +02:00
ansuz
976a08cc7a
move to chainpad version 2
2016-05-20 16:34:55 +02:00
ansuz
cae750cd75
update padrtc for to use bower libraries
2016-05-13 17:35:17 +02:00
ansuz
7faf57602b
implement log level settings from application layer
2016-05-10 09:39:20 +02:00
ansuz
523aff3067
use upstream chainpad.js
2016-05-09 15:50:19 +02:00
ansuz
c752e4a6e5
remove sharejs
2016-05-09 14:20:11 +02:00
ansuz
6b2e986789
remove deprecated textsocket library
2016-05-09 11:57:40 +02:00
ansuz
150ebaba7b
add ability to force text diffing
2016-04-27 17:58:55 +02:00
ansuz
ba17b78f7a
restyle name change button
2016-04-27 15:32:58 +02:00
Yann Flory
492054a938
Fix the cursor position when a remote patch is applied
2016-04-27 12:17:06 +02:00
Yann Flory
5bb2e12db2
Merge branch 'beta' into migrate
2016-04-27 10:51:51 +02:00
Yann Flory
cc51e6d6ed
Update CodeMirror pad to work with Netflux
2016-04-27 10:44:04 +02:00
Caleb James DeLisle
3b6fe44378
Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta
2016-04-26 14:31:57 +02:00
Yann Flory
85d5f5c47f
Convert netflux to es5
2016-04-25 15:29:39 +02:00
Caleb James DeLisle
5f16ad4a58
Update to most recent chainpad
2016-04-22 18:17:00 +02:00
ansuz
aa07dd31ee
have json-ot initialize its own debug module, instead of relying on a window variable's existence
2016-04-22 17:35:07 +02:00
Yann Flory
d3203d1c2a
Remove Crypto from the modules loaded with RequireJS in realtime-input
...
It now has to be passed in the config in the main JS file
2016-04-22 14:26:37 +02:00
Yann Flory
8ac69ca262
Add a missing "time" property in the netflux client causing incorrect
...
timeout errors
2016-04-22 11:46:27 +02:00
ansuz
b140b6429d
remove a little bit of dead code
2016-04-22 09:46:06 +02:00
ansuz
bbdc9da853
delete duplicated file
2016-04-22 08:19:28 +02:00
ansuz
5f4825f3a0
don't change the hash from realtime input
...
let applications handle that logic
2016-04-21 19:03:50 +02:00
ansuz
4f426651ad
remove TextPatcher from RealtimeTextSocket
2016-04-21 17:41:50 +02:00
ansuz
02ff1a63a4
Merge branch 'netflux' into beta
...
Conflicts:
www/assert/main.js
2016-04-21 15:47:07 +02:00
ansuz
a18c793f98
use latest hyperjson
2016-04-21 14:53:53 +02:00
ansuz
9efcc443cd
add 'format' to TextPatcher's API
2016-04-21 12:16:11 +02:00
ansuz
0769e50414
move TextPatcher to highest application layer
2016-04-20 18:56:18 +02:00
ansuz
1d70335228
provide all callbacks before starting
2016-04-20 18:27:20 +02:00
ansuz
a3787ee4dc
Merge branch 'netflux' into beta
2016-04-20 15:25:00 +02:00
ansuz
010566d3c3
pushDelta was mistakenly deprecated. restored.
2016-04-20 14:20:34 +02:00
ansuz
3598c93098
move new hyperjson into common
2016-04-20 14:14:06 +02:00
ansuz
103bb69daa
move custom hyperscript into common
2016-04-20 14:13:08 +02:00
ansuz
b83fb7b823
improve brFix logic
...
stop exporting functions which we wish to deprecate
2016-04-20 12:29:16 +02:00
ansuz
cb979844f6
implement text patching at application layer
2016-04-17 14:06:30 +02:00
ansuz
4a41575e6d
accept onLocal in config
2016-04-17 14:05:33 +02:00
ansuz
d3c2c901b6
implement cursor transformation in a common library
2016-04-17 14:02:45 +02:00
ansuz
92d89f6cac
start to factor sharejs into two modules
2016-04-15 18:17:45 +02:00
ansuz
13dc77b7f6
remove commented line
2016-04-15 18:16:54 +02:00
ansuz
41e635b2e5
realtime-input.js : turn on logging
2016-04-14 16:27:34 +02:00
Yann Flory
69e8e18283
Remove the pipe character in the hash
2016-04-14 16:10:08 +02:00
ansuz
d62e9fc1c9
add a missing semicolon
2016-04-14 15:41:02 +02:00
Yann Flory
c32045d7d0
Fix an issue with missing characters when several users were typing at the same time
2016-04-14 15:30:42 +02:00
Yann Flory
be09a1808d
Remove old code from realtime-input
2016-04-14 14:46:42 +02:00
Yann Flory
6884b0890a
Fix the typong tests not working properly
2016-04-14 12:24:17 +02:00
Yann Flory
e207d8b579
Merge branch 'diffdom' into netflux
2016-04-13 16:19:56 +02:00
ansuz
f4c5b2a996
Add sane defaults to TextPatcher diffs
2016-04-13 14:51:15 +02:00
ansuz
259772dd62
Turn on TextPatcher logging for _socket
2016-04-13 13:54:25 +02:00
ansuz
0537c28919
Add switchable logging to TextPatcher.js
2016-04-13 13:53:20 +02:00
Caleb James DeLisle
8a36963582
Enable ChainPad PARANOIA mode but remove the part which causes most slowness
2016-04-13 13:51:01 +02:00
ansuz
19cd991dba
trim dead code, comment, very minor optimizations
2016-04-12 17:29:20 +02:00
ansuz
9f45ccb2d9
use console.error for stack traces
2016-04-12 16:47:30 +02:00
ansuz
368d72b337
add missing semicolons to TextPatcher.js
2016-04-12 15:39:53 +02:00
ansuz
851ccfbdb6
detect falsey operations in OT and ignore them
2016-04-12 15:37:47 +02:00
ansuz
400f6efde1
json-ot.js : jshint compliance
2016-04-12 15:37:47 +02:00
ansuz
ca94d30386
detect falsey operations in OT and ignore them
2016-04-12 15:35:07 +02:00
ansuz
9f9cd8d8cd
realtime-input.js : fixes for jshint compliance
2016-04-12 15:07:05 +02:00
ansuz
793149a608
json-ot.js : jshint compliance
2016-04-12 15:00:46 +02:00
ansuz
06a3b63923
jshint compliance for toolbar.js
2016-04-12 14:58:24 +02:00
ansuz
5cead3fad3
add missing semicolons to TextPatcher.js
2016-04-12 14:51:06 +02:00
ansuz
94e57e4a26
update location of text-patcher.js
2016-04-12 14:21:31 +02:00
ansuz
b37dab1f49
Merge branch 'diffdom' into netflux
...
Simple cleanup and unit tests
2016-04-12 14:15:04 +02:00
ansuz
6b9d982d40
stabilize _socket/realtime-input.js
...
...as common/RealtimeTextSocket.js
2016-04-12 13:10:57 +02:00
ansuz
39071021eb
stabilize typingTest.js as /common/TypingTests.js
2016-04-12 12:53:23 +02:00
ansuz
9805958ad7
stabilize text-patcher.js into /common/TextPatcher.js
2016-04-12 12:46:49 +02:00
ansuz
7782069dbd
Merge pull request #15 from xwiki-labs/diffdom
...
merge diffdom into netflux
2016-04-12 10:21:19 +02:00
ansuz
a1f9b10175
remove offending line from chainpad entirely
...
RTCHAINPAD-3
2016-04-12 10:02:11 +02:00
ansuz
4ba68eb2bf
fix leaky variable in chainpad
...
Patch.transform declared a 'toTransform' variable without using 'var'
this caused it to leak onto the window during operational transformations
2016-04-12 09:52:36 +02:00
ansuz
05108efdfa
correct chainpad's transformation function
...
addresses RTCHAINPAD-3
Pending further testing, this change will still need
to be corrected in https://github.com/xwiki-contrib/chainpad/
2016-04-12 09:44:08 +02:00
Yann Flory
713c90242b
Hide the usernames when they have not been changed
2016-04-11 15:00:22 +02:00
Yann Flory
0b3d6e15b8
Replace the Netflux old client (netflux.js) by the Netflux2 client.
...
Move the WebRTC peer-to-peer use case in /padrtc, which still uses the old
Netflux client
Use es6-promises.min.js to solve a issue with some browser and the new
Netflux client
2016-04-08 16:54:03 +02:00
Yann Flory
cf9f60bd57
The server don't send back anymore messages to their sender
2016-04-07 11:27:14 +02:00
Yann Flory
eb4ea7a6b0
Remove the content from the ACK messages sent by the server
2016-04-05 15:06:38 +02:00
Yann Flory
ba4faea939
Update the pads to run with the latest improvements to the websocket server
2016-04-05 12:17:43 +02:00
Yann Flory
5ef7e29a9b
Add the latest changes from _socket into the netflux pad
2016-04-01 17:58:33 +02:00
ansuz
b59a14c5ac
merge hyperjson changes from realtime xwiki
...
more resilient class serialization.
comments
2016-04-01 11:20:19 +02:00
Yann Flory
b41f0e8c50
Merge branch 'cjd-fixed-it-with-hax' into netflux2
2016-04-01 10:51:27 +02:00
ansuz
c50690349b
comments describing the role of each argument
2016-04-01 10:46:54 +02:00
ansuz
96e03fcfa4
Use latest chainpad without mutations
2016-03-30 15:29:28 +02:00
ansuz
d5772c6315
when json-ot produces json that fails to parse...
...
export the relevant data to a window variable so we can inspect it better
2016-03-30 14:39:41 +02:00
ansuz
6c340a6527
chainpad testing = true, reject non-compliant messages
2016-03-29 16:53:40 +02:00
ansuz
afa1104d85
Pull the cursor out of bogus BR tarpits when it gets stuck
2016-03-29 15:36:03 +02:00
ansuz
bac0e0ff88
implement hyperjson filtering
2016-03-29 15:35:40 +02:00
ansuz
478ccbf984
revert changes to chainpad
2016-03-29 11:04:34 +02:00
Caleb James DeLisle
b372b0b77c
small change to chainpad in order to make it more likely to fail if the authDoc goes into the wrong state
2016-03-25 17:35:07 +01:00
Caleb James DeLisle
98c85cef8b
xxx
2016-03-25 16:49:27 +01:00
Caleb James DeLisle
62eabbc7ae
If a message does not match parent hash, don't delete it from storage
2016-03-25 15:23:19 +01:00
Caleb James DeLisle
dbf31798d5
json-ot triggering PARANOIA errors in ChainPad
2016-03-25 15:01:17 +01:00
Caleb James DeLisle
03932d0169
small changes to chainpad for testing
2016-03-25 14:52:44 +01:00
Caleb James DeLisle
420a7098a6
more testing and crap
2016-03-25 12:45:51 +01:00
ansuz
e066730b68
add notes about how hyperjson is to be used
2016-03-24 12:46:35 +01:00
ansuz
c047d5310f
implement optional filtering in hyperjson
...
Implemented via callback, return falsey if you want to filter an element
and all of its children from the serialized result.
Conflicts:
www/common/convert.js
2016-03-24 12:16:42 +01:00
ansuz
0d33af773f
implement optional filtering in hyperjson
...
Implemented via callback, return falsey if you want to filter an element
and all of its children from the serialized result.
2016-03-24 12:11:31 +01:00
ansuz
475ca9bea8
hyperjson.js : used split instead of filter... oops
2016-03-23 12:33:05 +01:00
ansuz
1bd5cb9e27
hyperjson.js : used split instead of filter... oops
2016-03-23 12:31:16 +01:00
ansuz
b2753ef7b7
fix string manipulation off-by-one
2016-03-22 19:29:58 +01:00
ansuz
f98fda7604
fix string manipulation off-by-one
2016-03-22 19:28:50 +01:00
ansuz
4f3fcb08a4
better error reporting when the operational transform fails to parse JSON
2016-03-22 12:13:15 +01:00
ansuz
0ff4906f0e
implement better serialization of class names
...
RTWYSIWYG-27 : poorly formed yet valid HTML caused hyperjson to produce element
selectors which hyperscript could not parse.
2016-03-22 12:13:01 +01:00
ansuz
fbe6225681
Don't attempt to use the cursor selection when it has length 0
...
RTWYSIWYG-20
RTWYSIWYG-24
2016-03-22 12:12:46 +01:00
ansuz
0c6222b5f9
better error reporting when the operational transform fails to parse JSON
2016-03-22 10:19:13 +01:00
ansuz
79a9998b13
implement better serialization of class names
...
RTWYSIWYG-27 : poorly formed yet valid HTML caused hyperjson to produce element
selectors which hyperscript could not parse.
2016-03-22 10:16:14 +01:00
ansuz
bd24821c6c
Don't attempt to use the cursor selection when it has length 0
...
RTWYSIWYG-20
RTWYSIWYG-24
2016-03-22 10:06:42 +01:00
Yann Flory
38d797a4f1
Fix issue with Chrome and WebRTC
2016-03-16 17:38:26 +01:00
Yann Flory
7237c751d5
Move 'vdom' to the main 'pad'.
...
Hide the right-hand panel (can de bisplayed with a 'debug' button)
Hide the IDs of users if they don't change their name
2016-03-16 17:09:08 +01:00
Yann Flory
e77d85bc82
Trigger an onReady() method when the user's pad is fully synced (the history is loaded)
2016-03-16 14:00:14 +01:00
Yann Flory
eca4ec699c
Ability to change the username (the user ID is displayed by default)
2016-03-16 12:02:39 +01:00
Yann Flory
6e50ae94dd
Remove unused code
2016-03-15 10:51:19 +01:00
Yann Flory
5da8560e22
Fix the user list in the toolbar keeping old data with the WebSocket server
...
Chainpad is no longer responsible for the userlist or the ping
2016-03-15 10:37:27 +01:00
Yann Flory
3a188625e0
Improve the detection of a disconnected peer to update the user list with the WebRTC service
2016-03-14 15:20:00 +01:00
Yann Flory
77e7fb5724
Fix an issue with the WebRTC service where it was impossible to join a channel once someone had left this channel
2016-03-14 14:49:19 +01:00
Yann Flory
06e5c84702
Clean some code
2016-03-11 17:32:45 +01:00
Yann Flory
b1e8bcddef
Fix the user list not working with the WebRTC service and causing major issues
2016-03-11 17:09:27 +01:00
Yann Flory
c576241104
Add a Chainpad adapter to make Chainpad know the userList
2016-03-10 18:48:38 +01:00
Yann Flory
ae8f6f7f2c
Ability to choose which protocol to use (Websocket or WebRTC) with Netflux
2016-03-10 14:03:31 +01:00
Yann Flory
b7885eb539
Fix channel history
2016-03-09 18:35:39 +01:00
ansuz
8258018c1d
Revert "fix undefined reference"
...
This reverts commit 7d65540123
.
To restore functionality in convert.js
2016-03-09 10:32:57 +01:00
ansuz
c67451bc1a
Revert "remove broken functions from convert module"
...
Because I forgot that the /render/ page was still using vdom
This reverts commit 93fb944e1f
.
2016-03-09 10:29:51 +01:00
Yann Flory
c536ecbc1c
Temp commit
2016-03-08 15:13:57 +01:00
Yann Flory
870b2dbb7e
Add the WebRTC server in Cryptpad
2016-03-08 11:45:03 +01:00
Yann Flory
c4f62fb812
First try with WebRTC
2016-03-08 11:25:37 +01:00
Yann Flory
09a06a8bc5
Replace the chainpad server by the netflux server
2016-03-07 17:35:31 +01:00
Yann Flory
60c3aceb0d
Add chatflux server
2016-03-07 17:18:47 +01:00
Yann Flory
deb2084fc5
Add the socket connection checker
2016-03-07 12:00:45 +01:00
ansuz
d3e2a2f52e
make verbose logging switchable via a conditional
2016-03-07 11:59:36 +01:00
ansuz
fefb904261
realtime input changes
2016-03-07 11:34:16 +01:00
ansuz
fd99dba4a3
modify realtime-input api to take a single object as configuration. merge netflux API
2016-03-07 11:33:46 +01:00
Yann Flory
62ba579d4a
Add Netflux API with WebSocket service V1
2016-03-07 11:07:37 +01:00
ansuz
d7b34cf6be
don't call toolbar from within realtime-input.js
2016-03-04 16:45:11 +01:00
ansuz
5e1566eaec
fix incomplete 'onAbort' block
2016-03-04 11:07:12 +01:00
ansuz
1d6ccc99a1
add 'onAbort' hook to realtime-input.js
2016-03-03 18:04:14 +01:00
ansuz
6ff5b10486
remove local diffDOM version
2016-03-03 16:04:08 +01:00
ansuz
93fb944e1f
remove broken functions from convert module
2016-03-03 15:18:05 +01:00
ansuz
7d65540123
fix undefined reference
2016-03-03 15:12:43 +01:00
ansuz
6884fabda9
Use local diffDOM instead of bower_components
...
At least until the PR gets accepted
2016-02-29 17:05:04 +01:00
ansuz
f5a8727254
remove some unused functions from cursor.js
2016-02-29 16:52:07 +01:00
ansuz
db1515c445
cursor.js : commit before cleaning up
2016-02-29 16:27:55 +01:00
ansuz
91ada5ce7a
export Operation from chainpad. for use with OT
2016-02-29 15:28:32 +01:00
ansuz
5425699f43
check if possible parent exists before checking if it contains another element
2016-02-29 15:27:11 +01:00
ansuz
67bdb8a65a
fix a bad regex that occasionally threw an error
...
'nothing to repeat'
2016-02-25 12:35:11 +01:00
ansuz
39f56d4fd1
throw error when checking for the index of a node that has no parent.
...
it probably isn't in the dom if this is the case.
Check if it's there before using this function
2016-02-23 15:53:58 +01:00
ansuz
de46be85ba
add better helpers for finding and resetting the cursor
2016-02-23 15:52:58 +01:00
ansuz
c09036bd29
snapshot cursor.js, as some things are working quite well now
2016-02-22 18:00:46 +01:00
ansuz
4eee1f5210
add orderOfNodes function to tree library
2016-02-22 17:56:17 +01:00
ansuz
7689151fc0
pull json validation for OT into its own module for reuse
2016-02-22 17:54:59 +01:00
ansuz
2c8a2406c6
cursor.js : snapshot before code deletion
2016-02-19 14:07:43 +01:00
ansuz
1beb3f5355
snapshot of treesome.js before deletion
2016-02-19 14:07:16 +01:00
ansuz
8ead5ca129
realtime-input.js : add notes regarding integration of the netflux api
2016-02-16 15:14:38 +01:00
ansuz
d1885fbab6
better jshint compliance for common files
2016-02-15 15:42:08 +01:00
ansuz
539cc3a2fa
remove unused files from common directory
2016-02-15 15:41:36 +01:00
ansuz
afa2811472
remove local version of marked.js, prefer bower version
2016-02-15 11:49:47 +01:00
ansuz
a600ece5c5
fix jshint complaints in common directory
2016-02-12 16:22:20 +01:00
ansuz
2c5a2b6023
remove unused code, add todos, fix minor errors
2016-02-12 12:03:15 +01:00
ansuz
967d636df9
address more jshint complaints
2016-02-12 11:39:37 +01:00
ansuz
f6c848385f
hyperjson.js : jshint complains about var index in for loop
2016-02-12 11:21:33 +01:00
ansuz
7f92abc7bf
Merge branch 'diffdom' of github.com:xwiki-labs/cryptpad into demoEffect
2016-02-12 10:24:11 +01:00
Caleb James DeLisle
86c4a69a97
Switch to patching with DiffDOM for testing :D
2016-02-11 16:10:44 +01:00
ansuz
653ba33b65
Merge branch 'vdom' of github.com:xwiki-labs/cryptpad into demoEffect
2016-02-11 13:15:57 +01:00
Caleb James DeLisle
2031191261
testing=false
2016-02-11 13:13:58 +01:00
Caleb James DeLisle
37db31b09e
Attempt an operational transformation and if the result is not valid JSON then fail
2016-02-11 12:34:06 +01:00
ansuz
c22269e36e
cursor.js : make the console a little less noisy
2016-02-11 10:02:47 +01:00
ansuz
99a23154b7
files for unstubbing OT
2016-02-11 09:38:58 +01:00
ansuz
c740c0ec92
add stuff for walking the tree
2016-02-11 09:32:58 +01:00
ansuz
ad184b1114
add stuff to recover the cursor
2016-02-11 09:32:41 +01:00
ansuz
019750bea8
realtime-input.js : callback onInit if exists
2016-02-10 10:40:52 +01:00
ansuz
7102a0a164
make rainbows
2016-02-05 11:48:34 +01:00
ansuz
d2f6c63d8a
realtime-input.js : changed the api and left an undefined reference. fixed
2016-02-03 12:58:54 +01:00
ansuz
d96124229b
clean up realtime-input.js, break API
...
use an object for configuration, so as to be more extensible.
modify applications which use the API to match.
2016-02-03 12:45:45 +01:00
ansuz
ed03a48092
minor patches that make things a bit more reliable, still some bugs
2016-02-01 19:41:13 +01:00
ansuz
ac0f7852fc
committing latest changes for review
2016-02-01 15:28:33 +01:00
ansuz
2016550e01
virtual-dom.js : identify problem area?
2016-02-01 14:28:13 +01:00
ansuz
fd1e5d5735
better styling on render page
...
now solarized dark
2016-01-30 14:18:20 +01:00
ansuz
b18dfef656
sharejs textarea is used by realtime-input.js
2016-01-29 12:27:29 +01:00
ansuz
997ce1147f
realtime input wraps up basic realtime stuff
...
so we don't have to rewrite the realtime api for every application.
starting to move towards a portable api :D
2016-01-29 12:26:49 +01:00
ansuz
40b8c0efe8
drop in chjj's marked.js for a cool demo
2016-01-29 12:26:27 +01:00
ansuz
0c2e057f9d
export component APIs from convert
2016-01-27 10:10:47 +01:00
ansuz
b958caebdd
dom, vdom, hyperjson, and an api which provides a matrix of conversions
2016-01-26 17:26:33 +01:00
ansuz
2ed9f0867a
Merge branch 'master' of github.com:xwiki-labs/cryptpad into codepad
2016-01-15 11:24:21 -05:00
ansuz
ff52f050e5
chainpad.js : pull in upstream changes to chainpad.js. new APIs
2016-01-13 09:47:11 -05:00
ansuz
9fc44cdf0c
add notes to clientside js files
2016-01-13 05:43:58 -05:00
Yann Flory
9a932a3f56
Patch Realtime into CodeMirror in CryptPad
2015-11-25 10:09:23 +01:00
Caleb James DeLisle
88fb6772e8
Cleaned up the front page and added a little piece of code to show recent pads
2015-02-02 17:53:10 +01:00
Caleb James DeLisle
51544db9a2
Completed adding of customization system and bottom infobar
2015-02-02 16:01:33 +01:00
Caleb James DeLisle
0e44b10aeb
Seperated common crypto operations to common file and made common toolbar used for both pad and spreadsheet
2015-01-30 16:52:23 +01:00
Caleb James DeLisle
e039e90a24
upgrade to most recent chainpad
2015-01-30 16:41:01 +01:00
Caleb James DeLisle
50c10f818e
Added cryptsheet to cryptpad suite!
2015-01-29 17:55:18 +01:00