34914785eb
lint compliance
2018-06-28 16:15:38 +02:00
a537f7de8b
Fix infinite loading screen caused by some browser settings
2018-06-28 16:13:52 +02:00
470f404a24
temp
2018-06-28 15:31:30 +02:00
cfc81e8c96
allocate blockSeed as Uint8Array
2018-06-28 15:21:13 +02:00
554b4a978d
Load shared folders in the store
2018-06-28 14:15:30 +02:00
7aa7b82c60
merge staging
2018-06-28 13:33:54 +02:00
6dc7e7eff4
Disable WebWorkers by default
2018-06-26 14:15:25 +02:00
bfb850554d
Fix the contacts app with workers
2018-06-25 18:08:47 +02:00
87dc528a99
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-06-25 16:59:52 +02:00
6d8693ff8c
Fix history mode UI
2018-06-25 16:59:40 +02:00
7dc393a2d2
remove debug log
2018-06-25 15:33:54 +02:00
d76f3dceab
remove comment
2018-06-25 14:30:41 +02:00
fb5553f918
fix typo
2018-06-25 14:25:37 +02:00
76bc82ac13
lint compliance
2018-06-25 13:42:17 +02:00
0160ef30b7
Fix pad password change
2018-06-25 12:08:06 +02:00
fbe940c024
Fallback to async store in self.crypto doesn't exist in webworkers (ie/edge)
2018-06-22 19:43:07 +02:00
01614c4256
verify old user password before proceeding to change passwords
2018-06-22 15:34:50 +02:00
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
a146f6acc9
Change user account password function
2018-06-22 10:37:54 +02:00
6fde027a6c
add some TODOs
2018-06-21 10:26:46 +02:00
9a7abe0b1e
Merge branch 'modern-users' of github.com:xwiki-labs/cryptpad into modern-users
2018-06-21 10:16:25 +02:00
c2014c5906
a bit of cleanup, bug fixes, and lint compliance
2018-06-21 10:16:16 +02:00
36d1ae0f6c
Merge branch 'modern-users' of github.com:xwiki-labs/cryptpad into modern-users
2018-06-20 16:39:52 +02:00
71b085ba23
Owned drive migration UI
2018-06-20 16:39:01 +02:00
c3741f847d
resolve conflicts from merge with staging
2018-06-20 14:29:13 +02:00
d03339f20b
check for the presence of a blockHash in localStorage when logging in
2018-06-20 14:27:44 +02:00
3ba0ad3cf1
get, set, and clear blocks from localStorage
2018-06-19 18:08:14 +02:00
cb5fa72dba
implement removeLoginBlock rpc
2018-06-19 17:17:56 +02:00
7948fe2b70
Merge branch 'soon' into staging
2018-06-19 17:02:26 +02:00
29f577dfc6
Improve history to load it chunk by chunk
2018-06-19 17:02:16 +02:00
577dea4c75
clientside implementation of block signing and encryption
2018-06-19 16:38:49 +02:00
c802b761c7
Fix pads not stored in the correct folder the first time
2018-06-19 11:04:39 +02:00
60db53a993
Use framework in the whiteboard app
2018-06-18 12:14:16 +02:00
d37aa0646e
Change account password (clientside RPC)
2018-06-14 18:18:53 +02:00
54d63df1cf
Ability to change the password of a pad
2018-06-14 17:18:32 +02:00
d1e8baca68
Lint compliance
2018-06-12 18:26:21 +02:00
4896fe81fe
Merge branch 'serviceworker' into staging
2018-06-12 18:24:19 +02:00
1b49020753
Add support for async store when WebWorker is not available
2018-06-12 18:20:48 +02:00
ff25929c18
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-06-12 15:50:53 +02:00
54b52d681c
fix broken share menu resulting from adblock plus triggered by 'share'
2018-06-12 15:50:41 +02:00
d558b9e3e8
Fix 404 issues in media-tag
2018-06-12 15:21:57 +02:00
9fbf507cda
Fix new version detection
2018-06-12 14:23:54 +02:00
aa51463a9a
Merge branch 'soon' into staging
2018-06-12 12:00:51 +02:00
4dec2cca5c
Translations for new version detected
2018-06-11 18:18:39 +02:00
089e0361b6
Detect new version
2018-06-11 16:52:26 +02:00
da396b6528
Remove XXX
2018-06-11 15:40:36 +02:00
aeaf7d1950
Fix mediatag...
2018-06-11 15:06:43 +02:00
054ad9e741
Fix 404 in thumbnails creation with corrupted data in the drive
2018-06-11 11:46:27 +02:00
8f28621bb0
Remove unnecessary logs when logging in
2018-06-11 11:23:11 +02:00
e39c77e162
Merge branch 'staging' into serviceworker
2018-06-11 10:59:01 +02:00
921e6eb3c3
Fix wrong pad title in drive
2018-06-11 10:58:44 +02:00
996245ec3d
Merge branch 'staging' into serviceworker
2018-06-11 10:17:50 +02:00
47dee664da
Add support for login & logout while keeping the same shared worker
2018-06-08 17:35:44 +02:00
756681211b
update home page icons, allow for customization
2018-06-08 17:06:50 +02:00
02b282a1a5
Disconnect from shared/service worker
2018-06-08 16:45:07 +02:00
1775638d00
Merge commit '0c8ce27' into staging
2018-06-07 15:51:16 +02:00
0c8ce27f24
Make the less loader only load particular less files once
2018-06-07 15:49:59 +02:00
af2a13e5ae
Fix UI issue with PPF in the file picker
2018-06-07 15:42:16 +02:00
574d99f9db
Remove support for old media-tag
2018-06-07 15:09:35 +02:00
eac7d38655
test media-tag, and fix the bug the tests exposed
2018-06-07 14:29:09 +02:00
bc57f8c274
Replace media-tag.js with the new one
2018-06-07 14:12:33 +02:00
87f4fe9c84
Add error code to a feedback key
2018-06-07 10:48:38 +02:00
f05e2225d6
lint compliance
2018-06-06 18:22:48 +02:00
78ff55e34e
Fix race condition
2018-06-06 18:21:52 +02:00
48dc8c78b4
Fix cache and merge issues
2018-06-06 18:10:58 +02:00
305b47132c
lint compliance
2018-06-06 17:55:02 +02:00
14db9fad8e
Merge branch 'echidna' into serviceworker
2018-06-06 17:54:07 +02:00
a6d9ecb3ba
lint compliance
2018-06-06 17:48:10 +02:00
598d56c75e
Fix cache issues
2018-06-06 17:45:43 +02:00
cefe19b0e1
Merge branch 'echidna' into serviceworker
2018-06-06 17:25:24 +02:00
953d98be96
Fix reconnect
2018-06-06 17:25:06 +02:00
ce6779a06f
Remove debugging logs
2018-06-06 17:11:30 +02:00
6ab29f8f3a
Test service worker and shared worker store
2018-06-06 15:58:43 +02:00
3f8b6d3b8a
Fix default title issues when using a template
2018-06-04 16:02:58 +02:00
9c5ad795e1
Service worker test
2018-06-01 19:23:30 +02:00
b0311ccec1
Don't create file duplicates in the drive
2018-06-01 12:10:49 +02:00
21366c252d
Merge branch 'donkey' into staging
2018-06-01 12:07:10 +02:00
cc163f83c7
Fix an issue creating duplicate files in the drive
2018-06-01 10:52:54 +02:00
b9f5a0f52b
Move async store in a webworker!
2018-05-31 18:22:16 +02:00
8586d0c944
Merge branch 'staging' into donkey
2018-05-31 13:28:14 +02:00
ba0e000808
Add a file upload modal
2018-05-31 13:27:44 +02:00
85e5c495d9
Remove owned file
2018-05-30 14:36:29 +02:00
93ecc06964
Upload owned files
2018-05-29 19:42:20 +02:00
a6bac8ae41
Fix password prompt issue when the password was wrong in the file app
2018-05-28 18:18:25 +02:00
05bd41f256
Upload a password-protected file from apps
2018-05-28 18:03:35 +02:00
66655b4a23
Upload a file with a password
2018-05-28 17:50:28 +02:00
8aac7bad45
Make sure the ID is not used when uploading a file
2018-05-28 16:57:20 +02:00
3267268e20
Fix share modal not using the previous values
2018-05-28 15:33:49 +02:00
586193d6a1
Password-protected files: upload files with hashes V2
2018-05-28 15:31:18 +02:00
c7e08fedfb
Password-protected files
2018-05-25 18:00:10 +02:00
914da83b46
Fix missing edit hash in share modal when opening a pad in read-only mode
2018-05-23 16:55:23 +02:00
4df285fed5
Fix pads using version 0 hashes
2018-05-23 16:45:05 +02:00
bd66c8fee8
hacks to handle weird entries in drive
2018-05-18 10:28:31 +02:00
2170fcb9ad
Merge branch 'kanban' into staging
2018-05-18 10:19:55 +02:00
ef735d6fe6
Fix an issue when trying to create a pad with a password from a template
2018-05-17 18:15:10 +02:00
f218a9c119
correct a copy-pasted comment
2018-05-17 16:10:53 +02:00
b4638efe2d
Fix missing username when avatar is 404
2018-05-17 12:09:52 +02:00
31f9062422
Fix avatar pin
2018-05-17 11:46:16 +02:00
d950b34bdf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-05-17 10:35:59 +02:00
fb91f5df76
compare flat-dom output against hyperjson
2018-05-17 10:35:48 +02:00
5554c24b36
Remove dev console logging
2018-05-17 10:29:25 +02:00
b6ebc583ba
Add the kanban app to the list
2018-05-16 16:30:37 +02:00
65a2083afc
Suggest tags based on existing ones. Display existing tags in the drive.
2018-05-15 18:18:56 +02:00
e2052b4510
Fix multiple tippy tooltips displayed in poll's table
2018-05-15 10:59:53 +02:00
dcd27f0da4
finalize save button tooltips
2018-05-14 14:20:37 +02:00
6fde15247b
Fix UI issues in the loading screen with the loading bar
2018-05-14 14:02:46 +02:00
2d2701596a
Loading message and loading bar for migration
2018-05-04 18:41:54 +02:00
2b8e734cae
Add revealable password input to display or prompt the password
2018-05-04 15:42:29 +02:00
447230d42e
Clean migration logging
2018-05-03 18:17:18 +02:00
6c4c5c135b
Async migration
2018-05-03 17:59:22 +02:00
288b0c2df1
Lint compliance
2018-05-03 15:16:48 +02:00
10ce95087a
Merge branch 'password' into staging
2018-05-03 15:16:03 +02:00
ac09ba65ce
strip both old and new style checkpoint labels before decrypting when fetching history
2018-05-02 14:39:06 +02:00
2451174870
Lint compliance
2018-04-27 18:04:21 +02:00
d0c6746034
Merge branch 'mediatagplugin' into staging
2018-04-27 17:57:22 +02:00
009eb13fc3
Merge branch 'master' into staging
2018-04-27 17:51:12 +02:00
41583b7858
Merge branch 'checkpoint-bug' into merge-checkpoint-bug
2018-04-27 17:45:26 +02:00
64c85fe548
Don't return channel in parsePadUrl
2018-04-27 17:23:23 +02:00
43d046406f
Store the channel id as pad attribute
2018-04-27 11:54:23 +02:00
b26ae67df5
Fix issues with channel ID when using a password
2018-04-26 15:10:31 +02:00
1879c1829c
Add passwod prompt to access protected pads
2018-04-25 19:03:58 +02:00
811463b870
Add support for version 2 hashes needed for password-protected pads
2018-04-24 17:22:33 +02:00
5eab39ad75
Tets mediatag plugin using widgets
2018-04-19 17:45:08 +02:00
449ae579e5
Lint compliance
2018-04-19 14:22:10 +02:00
a773c47950
Fix loading screen in login and register
2018-04-19 14:21:26 +02:00
a51e41c883
Rename the image used in the new loading screen
2018-04-19 11:30:54 +02:00
9f5e5786f3
Merge branch 'pcs' into staging
2018-04-19 11:14:56 +02:00
206ac14438
Prevent users from creating a pad when visiting a deleted profile (read-only mode)
2018-04-18 18:54:46 +02:00
24dfaf766d
View more templates
2018-04-17 18:23:58 +02:00
842952fe1f
New checkboxes and radio input everywhere
2018-04-17 15:51:03 +02:00
68c26f3164
Custom radio inputs
2018-04-16 19:07:57 +02:00
7870dc05ca
Fix notification timeout
2018-04-16 16:07:40 +02:00
881c36214f
Lint compliance
2018-04-16 15:57:18 +02:00
ec0fc85b9f
Sort templates by usage in the PCS
2018-04-13 18:52:55 +02:00
52d6c9d468
New colortheme for alertify logs and modals
2018-04-13 17:47:33 +02:00
5ee5a93513
New tippy everywhere
2018-04-13 15:25:14 +02:00
9d57548f1d
New tooltips
2018-04-12 19:08:08 +02:00
4a23b57655
New loading screen
2018-04-11 18:56:03 +02:00
e1473dff79
Fix tests
2018-04-10 16:38:31 +02:00
e37aab492b
Validate messages not coming from history-keeper
2018-04-10 15:10:28 +02:00
a570a73e98
Send checkpoints' id to the server to avoid storing duplicates
2018-04-10 10:38:30 +02:00
8bf9617dd6
Fix typo
2018-04-05 10:58:58 +02:00
2381dd0e39
Remove owned profile and owned todo in automatic account deletion
2018-04-04 17:24:26 +02:00
f276915712
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-04-04 15:07:41 +02:00
b323989347
remove extraneous console statements
2018-04-04 14:49:33 +02:00
c43afcf629
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-04-04 14:38:40 +02:00
52e634885e
Hide the import template button if templates are disabled in appconfig
2018-04-04 14:38:24 +02:00
c24c06e90c
sign with your global private signing key
2018-04-04 14:17:48 +02:00
0993204d14
Disable thumbnails by default
2018-04-03 13:35:06 +02:00
0dfae72f88
Lock the UI for unregistered users
2018-04-03 12:04:49 +02:00
303adaea4c
Display only 5 items in the file upload table
2018-04-03 12:04:17 +02:00
cf22c58e39
Missing translations
2018-04-03 11:23:58 +02:00
a9d01ac864
Lock the UI when someone is editing
2018-04-03 11:00:46 +02:00
d12e5da1b7
Unpin old versions
2018-03-29 10:54:40 +02:00
c4a3e98123
Fix initial value in oo apps
2018-03-29 10:16:51 +02:00
fd1b4189be
Save and open oo docs
2018-03-28 19:35:49 +02:00
d5dce6ac22
Fix config
2018-03-27 14:03:30 +02:00
34f2d66b7e
Load OnlyOffice documents in the inner iframe
2018-03-26 18:32:40 +02:00
8c4ed76fa7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-03-23 18:05:33 +01:00
1f700a8374
fix confusing error message
2018-03-23 18:05:16 +01:00
1a950319a1
Fix broken links
2018-03-23 15:05:26 +01:00
f1c1d87d3f
Fix template importer
2018-03-23 10:53:31 +01:00
0c2987a6d1
Import template in existing pads
2018-03-22 17:01:01 +01:00
d4dfbddaa6
Add icons in the user menu
2018-03-22 15:19:14 +01:00
db9eee383c
Owned profile
2018-03-22 15:16:19 +01:00
9cba630700
lint compliance
2018-03-21 18:53:11 +01:00
01fb497e1b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-03-21 18:31:59 +01:00
a718603b36
Automatic account deletion
2018-03-21 18:27:20 +01:00
a794efe931
Merge branch 'staging' into oo
2018-03-21 11:32:59 +01:00
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
99712ec2f0
getMetadata RPC
2018-03-20 15:33:12 +01:00
44cd235f48
Fix CSS with Bootstrap 4
2018-03-20 11:05:43 +01:00
fa4b625f0d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-03-19 17:25:38 +01:00
67cdb6bd13
Fix initial values in the pad creation screen
2018-03-19 17:25:31 +01:00
bd6b6dcb49
actually fix weird checkbox logic, and lint compliance
2018-03-19 17:13:44 +01:00
dc783ce3e4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-03-19 16:56:15 +01:00
96a63a3b7b
fix weird checkbox logic in share menu
2018-03-19 16:56:09 +01:00
91b3ef45f3
Fix mobile detection
2018-03-19 16:27:33 +01:00
4f2a91b82d
Pad creation screen UI improvements
2018-03-19 16:17:19 +01:00
07e361b88d
Account deletion button
2018-03-19 14:04:44 +01:00
f1107ae6e5
Don't count other people's owned pads against your limit
2018-03-16 18:13:33 +01:00
ab8306f5d4
Merge branch 'soon' into staging
2018-03-14 17:17:00 +01:00
de97c5a3ff
Fix mobile detection when hiding the userlist
2018-03-14 17:02:41 +01:00
d6228a39bd
Fix userlist notifications missing for join events
2018-03-14 16:34:44 +01:00
03bcd2f00d
Lint compliance
2018-03-14 12:12:24 +01:00
3eec812aff
Merge branch 'staging' into creation
2018-03-14 12:07:04 +01:00
b1d5beca6f
Translations + UI for pad creation screen v2
2018-03-14 11:37:49 +01:00
e56d762409
Catch chainpad errors and display it in the UI
2018-03-13 14:38:56 +01:00
c9ed6d6bf8
New pad creation screen
2018-03-13 11:31:08 +01:00
7944bc1a82
merge staging branch
2018-03-09 12:08:18 +01:00
64afcb7c0b
comment out busyloop workaround for tippyjs
2018-03-09 10:12:12 +01:00
03ae9d5714
Merge branch 'soon'
2018-03-08 16:38:16 +01:00
442f15df98
Add help text in all the apps + french translation
2018-03-08 15:39:46 +01:00
cbd29794b8
Improve keyboard shortcuts in the pad creation screen
2018-03-08 12:16:40 +01:00
7a70d69d8e
Hide editor toolbars by default when using a small screen
2018-03-07 17:34:55 +01:00
f45023ed1f
Remove connection lost popup when websocket connection is lost
2018-03-07 16:48:49 +01:00
689368cdd7
Fix feedback for markdown toolbar and cke toolbar
2018-03-07 10:57:29 +01:00
0af90ef88d
resolve merge conflict
2018-03-05 15:00:57 +01:00
978b6b95df
WIP make oo encrypted
2018-03-05 14:05:53 +01:00
62186bd4bd
Remove tooltip when the element is removed from DOM
2018-03-05 11:19:05 +01:00
b0dba481d8
Fix small UI issues and IE issues
2018-03-02 18:33:43 +01:00
b7b560fcb8
Enable Cmd key support in shortcuts
2018-03-01 14:48:36 +01:00
12bfcbe701
Add fixed order for rightside icons in the toolbar
2018-03-01 14:32:14 +01:00
ee4d12bd57
abstract repeated call
2018-02-28 18:15:33 +01:00
2c90cb5907
Move help button in drawer and fix drawer style
2018-02-28 17:59:27 +01:00
753b7550ca
Save button in the pad creation screen
2018-02-28 17:02:35 +01:00
a4a6385e86
Add keyboard shortcuts for the Ctrl+E or Cmd+E modal
2018-02-28 16:38:28 +01:00
60b2384885
Move initial state into a help block
2018-02-27 17:38:29 +01:00
5c53868c3b
Delete pads after 3 months of inactivity
2018-02-26 18:34:05 +01:00
329fd61bb1
Remove lag when creating a pad from the pad creation screen
2018-02-26 10:49:35 +01:00
a697ad9762
Merge branch 'soon'
2018-02-22 17:05:58 +01:00
61dbf94f2d
Fix pad attributes not working for readonly pads if you know the edit hash
2018-02-22 15:56:23 +01:00
8c42125ea0
Merge branch 'soon'
2018-02-22 12:44:28 +01:00
7ff9bbe2b0
Fix share modal with new pads
2018-02-22 12:43:16 +01:00
acf09c807d
Fix fonts
2018-02-20 16:09:49 +01:00
9ba912d953
Clean onlyoffice files
2018-02-20 15:47:07 +01:00
db71fe5bf8
Rename font files
2018-02-20 15:23:24 +01:00
d53ea25111
Merge branch 'soon'
2018-02-20 14:42:32 +01:00
5f50bedce2
Fix empty properties for readonly pads
2018-02-20 14:42:11 +01:00
15a8196037
Enable pad creation screen
2018-02-20 10:39:02 +01:00
2eef1e96e6
Remove invalid error reports
2018-02-20 10:21:15 +01:00
7cb3282634
New apps for text, slide and spreadsheet
2018-02-19 18:52:57 +01:00
766fa72841
Fix initial value of the preview link in the share modal
2018-02-19 14:07:21 +01:00
5c1e5a3f49
Merge branch 'staging' into oo
2018-02-19 12:11:06 +01:00
649fefad54
Send cookie when history keeper has changed
2018-02-16 15:25:53 +01:00
2ac9c3ba66
Report RPC errors when deleting owned pads
2018-02-16 12:33:33 +01:00
037a6ccc35
Fix INVALID_RESPONSE error in the file app
2018-02-16 12:02:20 +01:00
70e014cdfc
Hide infinite spinner and disconnect modals when pad is deleted
2018-02-15 11:34:44 +01:00
e83e589cf0
Kick from pad when an owned channel is deleted + whiteboard and poll
2018-02-14 19:41:07 +01:00
728a6a868d
Manage expired channels
2018-02-13 18:20:13 +01:00
3bb6d5a83c
Remove full history timeout
2018-02-09 15:47:29 +01:00
d676a5e7db
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into keywords
2018-02-07 11:14:19 +01:00
5bba9b6c39
Refactor login to remove duplicate code
2018-02-06 18:45:12 +01:00
4df4c48fbd
Improve UI for pad creation screen
2018-02-06 17:36:37 +01:00
83eb304716
lint compliance
2018-02-01 11:16:34 +01:00
970122b41d
Send the channel id to the text analyzer
2018-02-01 11:08:04 +01:00
80df45f257
Get text from ckeditor
2018-02-01 10:09:08 +01:00
fb192a2c45
Add a configurable background color in the file app in view mode
2018-01-31 14:42:34 +01:00
91e42f1518
Fix the bug introduced in the share modal fix
2018-01-31 12:11:10 +01:00
0b1795e5a1
Fix an issue preventing the share modal to be used more than once
2018-01-31 12:08:55 +01:00
bdafc101c9
Ability to remove owned channels from the drive
2018-01-29 15:17:53 +01:00
b6e91c772e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-01-29 12:45:44 +01:00
a1d9f44bbd
Delete owned pads from server when removed from the owner's drive
2018-01-29 12:45:38 +01:00
f134f11b73
new getDeletedPads rpc
2018-01-29 12:40:09 +01:00
5089f1206d
Pad creation screen translations and link to settings
2018-01-29 10:38:00 +01:00
36550b781f
Don't check for stronger hash if we have an edit hash
2018-01-26 15:44:38 +01:00
86144eda22
Display a message about pads deleted from the server
2018-01-26 12:26:58 +01:00
9a317018e2
Remove deleted pads from the drive
2018-01-25 17:54:21 +01:00
3d3f58b3fc
Improve share modal customization to make it work with async functions
2018-01-25 14:20:55 +01:00
5827905dbd
Import OnlyOffice code from the 'onlyoffice' branch and sframe it
2018-01-25 11:06:58 +01:00
2b8414ca78
provide hints for running CryptPad
2018-01-24 16:16:46 +01:00
80cd3e208a
lint compliance
2018-01-24 11:35:05 +01:00
4e8335bfdd
fix support for custom button classes
2018-01-24 11:01:15 +01:00
2995782079
Different colors for ok and cancel in alertify
2018-01-23 17:02:32 +01:00
4de6bd6195
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-01-23 16:32:05 +01:00
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
69c33e2f83
Ability to disable profile
2018-01-23 14:24:40 +01:00
51587d1006
Ability to disable feedback on the entire instance
2018-01-23 13:47:30 +01:00
006d99e19a
Fix undefined friends
2018-01-23 12:09:54 +01:00
c90ba890ca
Add more configurable options and add a new way to use custom config
2018-01-22 16:56:37 +01:00
2e436f16c9
Refactor context menu in drive
2018-01-19 17:03:58 +01:00
4bea1aa2df
Display default avatars in IE
2018-01-18 15:25:45 +01:00
adf7e14891
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-01-18 15:04:17 +01:00
bc9a88fbe9
Add support for org-mode in th code app
2018-01-18 15:04:06 +01:00
b08c1d94a1
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-01-18 12:20:10 +01:00
02dbe9e458
enforce maxUploadSize
2018-01-18 12:19:58 +01:00
6a906e3770
Fix share modal extension point
2018-01-18 11:16:30 +01:00
51b4d269be
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-01-18 10:54:08 +01:00
6e086ee779
Add shortcuts in the share modal
2018-01-18 10:53:43 +01:00
fc8847dae4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-01-18 10:32:27 +01:00
08ae327386
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-01-17 18:40:09 +01:00
c5ebbe1a56
New share menu
2018-01-17 18:39:45 +01:00
e52c1fe65c
remove Symbol polyfill
2018-01-17 14:27:26 +01:00
a91a047d73
more polyfill for IE
2018-01-16 18:15:08 +01:00
50e3e3ce91
polyfill Symbol for IE
2018-01-16 18:12:33 +01:00
1dd07ea48a
polyfill MAX_SAFE_INTEGER everywhere
2018-01-16 18:03:55 +01:00
4c49cd7592
Fix template picker not displayed anymore in framework
2018-01-16 14:39:56 +01:00
2f74324dac
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-01-16 12:05:37 +01:00
f79e1dfda0
Fix a race condition that could wiped the content of coed and slide
2018-01-16 12:05:26 +01:00
3118dd8312
set logLevel to 2 by default for sframe apps
2018-01-16 11:52:04 +01:00
88a04fdb07
Don't create sfcommon a second time in code and slide
2018-01-16 11:26:16 +01:00
ee605183e5
Make sure we don't have duplicates in the webchannel members
2018-01-15 15:40:52 +01:00
20f05d2f6f
Fix Phantom viewers' revenge
2018-01-15 15:38:18 +01:00
47203c37f1
Remove console error caused by setTimeout called with undefined
2018-01-12 17:44:56 +01:00
a4b35728dc
Todo app has a hash in the omnibar
2018-01-12 17:08:41 +01:00
68ce7fe53d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-01-12 15:55:00 +01:00
d59bc4612d
Ability to disable the drive for anonymous users
2018-01-12 15:54:36 +01:00
844d04df87
allow custom logout hooks defined in app config
2018-01-12 15:49:01 +01:00
5b4e5480cb
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-01-12 14:51:53 +01:00
9b78580d8e
make usage-bar display optional
2018-01-12 14:50:56 +01:00
db0d2e161c
Hide pad creation screen features if it is disabled in app config
2018-01-12 14:50:39 +01:00
daef08a9b3
Add an advanced new pad modal
2018-01-12 09:50:11 +01:00
bd9c44dbb2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-01-11 16:02:18 +01:00
ef480fea79
Add a settings category for the pad creation screen
2018-01-11 16:02:05 +01:00
05ad38cfe1
add more config parameters to share menu extension
2018-01-11 15:55:57 +01:00
c31b5aa6c0
make extension point cover share menu for files
2018-01-11 15:55:57 +01:00
13b704d9f6
Fix undefined webchannel when uploading a file
2018-01-11 15:55:57 +01:00
ca3697ae3a
implement extension point for share menu
2018-01-11 15:55:57 +01:00
5346afe51f
step towards customizable login functionality
2018-01-11 15:55:57 +01:00
151d33db18
Added testing of /poll/ :D
2018-01-11 15:45:12 +01:00
8c9490868b
improve owned pads management in the drive
2018-01-10 17:57:40 +01:00
e5b9f089fb
Fix undefined webchannel when uploading a file
2018-01-10 11:47:52 +01:00
73126ed597
Display the owner and expiration time of a pad in the properties modal
2018-01-09 18:19:24 +01:00
ecd8ef6418
improve thumbnails creation performances in code
2018-01-09 15:25:11 +01:00
77dcc1c705
Fix a race condition when switching language in the code app
2018-01-09 12:44:25 +01:00
65ccfe39ef
Add a 'properties' button in pads to display pad data
2018-01-09 12:02:56 +01:00
071d385850
Remove an unnecessary websocket connection
2018-01-09 12:02:22 +01:00
7defde3c59
lint compliance
2018-01-08 17:41:10 +01:00
0cea5f4596
Create an owned pad and view owned pads in the drive
2018-01-08 17:36:44 +01:00
1ec41f4e09
Ability to pick a background image in slides
2018-01-04 17:22:01 +01:00
59c4df3d9b
Fix 'NaN' txid for RPC when using IE
2018-01-03 17:14:35 +01:00
0f02d76b56
Fix missing callback when uploading files to the drive
2018-01-03 15:08:26 +01:00
d2845b95b6
Fix multiple file upload prompt
2018-01-03 11:42:23 +01:00
10aaa06781
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-22 16:25:52 +01:00
869909b101
implement more reliable check for whether a channel on the server is new
2017-12-22 16:24:17 +01:00
b6430d640e
temporary measure to address infinite reload loop due to inaccurate inNewFile condition
2017-12-22 14:59:41 +01:00
2fd22c6db6
Fix task list in markdown when using one empty line between tasks
2017-12-22 14:56:01 +01:00
7164d2dfdd
lint compliance
2017-12-22 14:42:18 +01:00
26f5a1fe74
signal that onLocal is called by onRemote
2017-12-22 13:16:15 +01:00
888739e333
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-21 18:21:14 +01:00
fa6106a6bb
Use CSS to remove the loading screen
2017-12-21 18:21:10 +01:00
c0b5dc7536
make loading screen tip presence configurable
2017-12-21 18:09:49 +01:00
892dfb18f7
check if users have service workers
2017-12-21 17:30:54 +01:00
5f42a9749f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-21 17:23:58 +01:00
4aa8d92a53
handle errors when constructing thumbnails from file metadata
2017-12-21 17:18:10 +01:00
5532b779fd
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-21 15:56:28 +01:00
d1d75f2f25
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-21 15:53:16 +01:00
590e77aafa
lint, missing semicolon
2017-12-21 11:15:21 +01:00
4117eb71cc
Report the number of tests
2017-12-21 10:40:48 +01:00
c928be028a
Upgrade the testing framework to allow multiple tests
2017-12-20 18:36:53 +01:00
f4078d68f0
Remove the 'edit username' button in the userlist in readonly mode
2017-12-20 11:54:30 +01:00
78f738143b
Hide the markdown toolbar in read-only mode
2017-12-20 11:41:47 +01:00
cbd7351d53
Improved logging if there's a non-empty-newdoc
2017-12-19 19:08:01 +01:00
cfc9ce33d6
Hide the tags button for anonymous users
2017-12-19 11:58:45 +01:00
09433e0bf0
display existing tags in the prompt in drive
2017-12-19 10:16:53 +01:00
3c0806659b
Better logging if we trigger the doc emptystring issue
2017-12-18 18:28:48 +01:00
7842c730a4
support for testing on safari
2017-12-18 15:15:41 +01:00
e587e9cd57
allow specifying the browser in selenium
2017-12-18 11:39:59 +01:00
38e28ebc9a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-15 19:12:00 +01:00
3c2d6af4f0
save pending tags when clicking OK on tagPrompt
2017-12-15 19:11:53 +01:00
47e4ce623a
Fix import pads from anon drive at registration
2017-12-15 18:27:13 +01:00
d666e9e7ee
Remove tag and filepicker buttons for anon users
2017-12-15 18:16:01 +01:00
c18d4297e1
Fix friend requests from the userlist
2017-12-15 16:19:22 +01:00
6a2d79249d
Added some nice testing
2017-12-15 16:09:30 +01:00
50ddad5e41
Fix an issue with the tag prompt removing all keyup listeners
2017-12-15 15:33:53 +01:00
bb548b3428
Merge branch 'staging' into better-testing
2017-12-15 10:29:28 +01:00
6ac4fa4689
wip
2017-12-14 11:34:44 +01:00
afcf3d06b3
unpin pads when they are removed from your drive
2017-12-12 16:00:05 +01:00
1a0ac9830a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-12 14:53:17 +01:00
c0e49211c4
eat errors related to cursors
2017-12-12 14:51:51 +01:00
bba974947b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-12 14:45:39 +01:00
6bcc72ff83
Fix pads using an old URL
2017-12-12 14:45:25 +01:00
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
50b6a23067
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-12 13:47:35 +01:00
76af3b90a7
stub createUnpinnedWarning0
2017-12-12 13:47:24 +01:00
a863011a0c
Fix profile in read-only mode
2017-12-12 12:14:32 +01:00
b1765c6ae3
Fix pad creation screen with anonymous users
2017-12-11 17:58:59 +01:00
c269929319
Fix creation page not displayed in pad and slide
2017-12-11 17:17:06 +01:00
362104ec09
lint compliance
2017-12-11 14:49:41 +01:00
89cc583f53
Call the handler if onReady is called for a ready channel
2017-12-11 12:48:06 +01:00
dcfccf88cd
Merge branch 'creationpage' into staging
2017-12-11 12:21:21 +01:00
1922dbfd75
Creation page with mobile support
2017-12-11 12:19:44 +01:00
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
008b2cc67e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-08 14:01:02 +01:00
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
06422e6d5a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-08 11:47:55 +01:00
38bd27303b
WIP rpc framework
2017-12-08 11:47:07 +01:00
617c4b6044
CSS refactorings and pad-is-not-pinned work
2017-12-07 19:00:13 +01:00
e96d54e655
Add a pad creation page
2017-12-07 18:51:50 +01:00
4377f2cee7
Fix missing translations in the drive
2017-12-07 12:20:26 +01:00
203c5d64c1
Focus codemirror after using the markdown toolbar
2017-12-07 12:18:14 +01:00
e72270d4a4
Add feedback when sharedworker is defined
2017-12-07 10:50:45 +01:00
1ac4abc482
Remove old code
2017-12-07 10:35:48 +01:00
64303b4090
Merge branch 'refactor' into staging
2017-12-07 10:34:15 +01:00
3e064e6638
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-06 18:33:16 +01:00
604ea1c95f
Feedback about webworkers
2017-12-06 18:32:48 +01:00
ba74f9d37a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-05 18:32:29 +01:00
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
61935500f4
Lint compliance
2017-12-05 18:10:53 +01:00
9eb33e39e6
Enable change events in the drive
2017-12-05 18:09:43 +01:00
c702a23c77
Initial work on the 'pad will expire' logic
2017-12-05 17:48:30 +01:00
17636769e4
Remove the second network created for the drive
2017-12-05 16:40:04 +01:00
291eb57027
fix auth app
2017-12-05 15:07:35 +01:00
52712c4bb9
Use the network from the async store for pads
2017-12-04 19:16:38 +01:00
de7806504b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-04 15:03:57 +01:00
f52d987515
Ability to resize avatars before uploading them
2017-12-04 15:03:43 +01:00
34223e4b78
remove accidental inclusion
2017-12-04 13:59:57 +01:00
0b54a76211
lint compliance
2017-12-04 13:58:33 +01:00
cd29208267
fix toolbar's incorrect gotoDrive title
2017-12-04 11:46:15 +01:00
e85e2dcabd
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-04 11:41:45 +01:00
d3d9e2e771
WIP: refactoring rpc code
2017-12-04 11:10:25 +01:00
afcc888a8b
make flat dom quiet again
2017-12-04 10:16:17 +01:00
e164edec03
Fix the webworker app
2017-12-01 18:29:59 +01:00
c59c6072f3
Remove jquery from outer
2017-12-01 16:05:23 +01:00
c6b8bbea59
Fix tests
2017-12-01 14:56:34 +01:00
04e02871bc
Merge branch 'refactor2' into staging
2017-12-01 14:50:19 +01:00
4903bd0757
Enable messenger in async store
2017-12-01 14:49:21 +01:00
bd85f1b003
Fix file upload and remove unnecessary dependencies
2017-12-01 10:16:48 +01:00
5187b3f26c
Flow compliance and fix a few bugs in rpc.js
2017-11-30 18:32:20 +01:00
664625a6ef
Fix more async store issues
2017-11-30 18:22:26 +01:00
5c3237e093
Fix issues with the async store
2017-11-30 17:21:58 +01:00
b3688db202
Use async store
2017-11-30 15:01:17 +01:00
0840570fbf
Async store part 1
2017-11-30 10:33:09 +01:00
385ac9607c
pass 'self' into common-util instead of using window
2017-11-27 18:26:04 +01:00
74e59a513a
Add the markdown toolbar to the slide and poll apps
2017-11-27 17:55:20 +01:00
644f6e9985
Use the bounce app to open links from inner
2017-11-27 14:44:44 +01:00
812df7de6f
Merge branch 'merge-staging' into staging
2017-11-27 12:18:34 +01:00
be5c5831dd
lint compliance
2017-11-27 12:18:04 +01:00
b0f553e9ea
Add a markdown toolbar to help with the markdown syntax
2017-11-27 12:17:35 +01:00
4ff4ccd1d3
use faster and more correct 'find' implementation
2017-11-27 11:30:50 +01:00
701af29192
fix broken register/login process
2017-11-24 15:12:00 +01:00
a3c093838c
merge latest staging and resolve conflicts
2017-11-24 13:46:59 +01:00
56102d3689
use unified listmap
2017-11-24 13:40:21 +01:00
661db129b2
lint compliance
2017-11-24 10:32:58 +01:00
80978377f2
return transformed cursor value
2017-11-24 10:03:45 +01:00
ee6c2097f5
resolve merge conflicts
2017-11-23 16:56:49 +01:00
9795ac32cb
Ability to burn an anonymous drive from the browser
2017-11-23 14:36:42 +01:00
280a7c2765
Clean cryptpad-common
2017-11-23 12:28:49 +01:00
eba1c9dfac
Add chainpad log to the debug app
2017-11-21 18:50:33 +01:00
30cea8888d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-11-21 17:37:53 +01:00
06011065d2
Add a debug app
2017-11-21 17:37:38 +01:00
60c4973d62
resolve merge conflicts
2017-11-21 17:22:06 +01:00
585f9d2e4e
repair broken 'clear channel' button
2017-11-21 17:19:35 +01:00
000f3edd1d
Constants file
2017-11-21 16:47:19 +01:00
477f14bb8b
Put constants in a separate file
2017-11-21 16:46:19 +01:00
7f88d1d43a
Improve drive loading speed
2017-11-21 11:09:59 +01:00
06ede6b294
Fix export in apps using framework
2017-11-21 10:26:33 +01:00
c35e3d644e
Make sure dates are stored as numbers in the drive
2017-11-20 15:37:23 +01:00
655dfe971d
Add translation for the edit username button in the userlist
2017-11-20 14:28:35 +01:00
d1beb6493b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-11-20 12:20:13 +01:00
b96ea47f1f
strip tracking parameters when parsing urls
2017-11-20 12:09:17 +01:00
fc02f97d78
Use less2 classes in the user menu
2017-11-17 18:20:45 +01:00
41a082c46d
Fix video thumbnails
2017-11-17 18:20:02 +01:00
af8aa25228
Add an option to never rename a file during the session
2017-11-17 10:57:54 +01:00
31b31654ec
Lint compliance
2017-11-16 18:57:33 +01:00
25d3d321da
Ability to rename a file before uploading it to the server
2017-11-16 18:11:13 +01:00
2813b7219e
Fix the public key using the wrong domain in settings
2017-11-16 13:35:07 +01:00
a96e49d55a
Fix filepicker creating a new netflux network when initialized
2017-11-15 16:56:50 +01:00
630ac45948
Fix laggy and blinking tooltips
2017-11-15 16:31:26 +01:00
1f53304ad3
Display a dropdown menu inside another one
2017-11-15 15:35:28 +01:00
014e12b5b5
Ability to update the username from the userlist
2017-11-15 11:32:54 +01:00
7cfe64fc5b
Remove cryptpad-common dependency for some inner apps
2017-11-13 18:09:19 +01:00
1514ad5df3
Move the 'logged out' screen inside the sframe
2017-11-13 17:29:00 +01:00
5a2afb5c95
Remove Realtime and Messaging from common
2017-11-13 17:01:09 +01:00
30c8c253dd
Remove util and hash from common
2017-11-13 16:32:40 +01:00
c9e1de042c
Remove common-interface dependency from cryptpad-common
2017-11-13 12:00:26 +01:00
dc207393fd
Separate UI elements from cryptpad-common
2017-11-13 10:23:18 +01:00
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
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
354c63bd64
Clean old code
2017-11-09 18:17:49 +01:00
ac66511f0a
Merge branch 'staging' into new-diff
2017-11-09 17:44:45 +01:00
f931574dac
lint compliance
2017-11-09 17:23:13 +01:00
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
840cd91bcb
manual merge
2017-11-09 15:38:32 +01:00
75130150d5
Refactored out TextPatcher and JsonOT and replaced with new ChainPad
2017-11-09 15:36:49 +01:00
101482b8cc
Migrate settings to use a sandboxed iframe
2017-11-09 14:23:40 +01:00
c1ba08cfc6
Make sure thumbnails are .png
2017-11-07 15:04:45 +01:00
0956905ca8
Wipe localForage on log out
2017-11-07 14:56:50 +01:00
6b9ffe8dd1
Make thumbnails more secure
2017-11-07 14:51:53 +01:00
e07bb0f7b3
roll back to old transform function, except in pad
2017-11-06 17:18:10 +01:00
a592317e35
lint compliance
2017-11-06 15:49:40 +01:00
fef97ed60e
Fix an creating duplicates mediatags in markdown preview
2017-11-06 15:47:18 +01:00
9060464f37
Create thumbnails only when the tab is not focused
2017-11-06 13:36:54 +01:00
a37e6c7979
lint compliance
2017-11-03 18:39:06 +01:00
2a3a5c4342
Ability to disable thumbnails
2017-11-03 18:38:27 +01:00
1871749b6f
Fix -1 viewer in the userlist when disconnected
2017-11-03 15:14:23 +01:00
cf3024ef5b
Ability to display an error in the toolbar state
2017-11-03 14:30:59 +01:00
8de9a596f1
Fix cursor in thumbnails
2017-11-02 19:11:27 +01:00
fd7bb3aadb
Make sure the infinite spinner modal is not displayed multiple times
2017-11-02 17:47:19 +01:00
3ebb5ca493
Fix issue in diffMarked creating text nodes for each character
2017-10-31 18:19:30 +01:00
4250688856
Migrate profile to use sframe
2017-10-30 18:49:28 +01:00
4c0049ad55
don't log presence of other users as 'joins' when you have first joined
2017-10-27 14:20:31 +02:00
325f685f3e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-27 14:14:25 +02:00
1cbf1aec92
prevent undefined access in non-sframe apps
2017-10-27 14:14:19 +02:00
ac1b67ad67
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-27 13:31:54 +02:00
1245b4d244
Enable thumbnails in poll and whiteboard
2017-10-27 13:31:41 +02:00
df1a700cb2
disable thumbnail test. add test for flat dom
2017-10-27 11:01:22 +02:00
02cd7e5b58
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-27 10:44:53 +02:00
69890ebd8f
prototype alternate datastructure for trees in listmap
2017-10-27 10:43:44 +02:00
23c305f71f
implement removeItem so localForage doesn't complain
2017-10-27 10:37:44 +02:00
6f020b67ca
Add thumbnails to framework apps
2017-10-26 12:31:16 +02:00
bf817f20ee
Fix file upload in code and slide
2017-10-25 12:31:22 +02:00
24572a40d2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-24 18:50:19 +02:00
f4adbd980e
Thumbnails for the code app
2017-10-24 18:49:58 +02:00
69f9a7ebf3
make userlist change notifications configurable
2017-10-24 17:29:58 +02:00
027b9fa383
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-24 18:03:31 +03:00
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
bac608adfe
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-24 16:56:13 +02:00
dc90811090
only call onReady once in sframe-listmap
2017-10-24 16:56:08 +02:00
bac10472f3
lint compliance
2017-10-24 14:32:47 +02:00
39b4cb9226
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-24 14:31:56 +02:00
18b5b20d27
Add thumbnails for PDFs
2017-10-24 14:31:42 +02:00
aee51f1317
lint compliance
2017-10-24 14:02:29 +02:00
447b0a74ee
handle errors for videos when uploading
2017-10-24 13:45:27 +02:00
30a69fae13
Add thumbnails for videos
2017-10-24 12:26:04 +02:00
21f8ae7570
Keep the correct ratio for image thumbnails
2017-10-24 11:45:07 +02:00
2be22867c1
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-23 14:39:31 +02:00
13718d0263
Fix recent pads in chrome
2017-10-23 14:38:38 +02:00
2e5fdf709a
Merge branch 'soon' into staging
2017-10-23 14:29:01 +02:00
9b02b36724
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-23 14:22:54 +03:00
d7e9498143
Fix and then disable the new OT
2017-10-23 14:22:33 +03:00
288e141c1f
add missing sframe method
2017-10-23 12:33:50 +02:00
c1d05a00ba
Improve media-tag export in pad to work with existing CSP
2017-10-23 10:55:40 +02:00
3e4faf1be1
Add new state messages in the toolbar
2017-10-20 18:12:47 +02:00
6d080bcb45
Ability to export mediatag images in pad
2017-10-20 18:10:08 +02:00
a0dd867f33
Fix pending state not removed after friend invite rejected
2017-10-20 18:09:09 +02:00
c25be21138
Fix the upgrade button in the drive
2017-10-20 10:16:01 +02:00
cc6b2192e4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-20 10:26:27 +03:00
515214aed1
Use present mode in embed code
2017-10-19 11:59:07 +02:00
201c974df6
Merge branch 'thumbnails' into staging
2017-10-19 11:43:43 +02:00
81d0b3272d
Fix multiple infinite-spinner errors piling up on top of eachother
2017-10-18 14:49:50 +03:00
9e4c48f537
lint errors
2017-10-18 12:25:13 +03:00
a149152f11
Merge branch 'staging' into framework
2017-10-18 11:42:31 +03:00
4116d08dd1
Display thumbnails in the drive and then file picker
2017-10-17 17:17:31 +02:00
6920129126
Embed images from the drive in whiteboard
2017-10-17 12:19:57 +02:00
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
2fd120100a
Merge branch 'wb' into staging
2017-10-13 16:58:59 +02:00
15337603bb
Merge branch 'staging' into framework
2017-10-13 13:41:24 +03:00
854c1e94a4
make infinite spinner error message go away if ChainPad settles after it has been popped
2017-10-13 13:39:49 +03:00
6926d42292
Autoload template picker to make it faster to appear when used
2017-10-12 18:18:01 +02:00
1c8e1a36e8
Add file type in the pad attributes for existing files
2017-10-12 17:43:49 +02:00
b86f8e3f26
Fix uloaded files not moved to the correct folder in drive
2017-10-12 17:33:22 +02:00
753e2d797e
Merge branch 'staging' into framework
2017-10-12 17:07:10 +03:00
62bc72847f
Add an error message when trying to tag a deleted pad
2017-10-12 15:06:29 +02:00
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
69dd3a60ab
Hide template and fileupload buttons for anonymous users
2017-10-12 14:32:12 +02:00
8e1f15e88d
Get title suggestion based on poll's description
2017-10-12 14:12:26 +02:00
95ad25973e
Ability to delete a stronger pad from readonly mode
2017-10-12 11:41:53 +02:00
b28c1537e8
Fix history in readonly mode
2017-10-12 10:59:23 +02:00
f0bdc3b26f
second try
2017-10-09 16:57:30 +02:00
d50a692986
add note about tags to prompt
2017-10-09 16:51:57 +02:00
c8928a0811
Switch the transform function and also stop calling textPatcher without the metadata
2017-10-09 17:07:26 +03:00
035150614d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-09 15:38:08 +02:00
484e216054
Fix hashtag button in the toolbar
2017-10-09 15:37:37 +02:00
a12239405b
fix toolbar 'home link' to visit home page from drive
2017-10-09 15:10:38 +02:00
828a685ba8
Fix broken browser fight logging
2017-10-09 14:12:55 +03:00
aa744567ed
Fix thumbnails in sframe apps
2017-10-09 11:52:34 +02:00
5e7bf0cfb8
Embed an image in whiteboard
2017-10-09 10:32:24 +02:00
f0eb58ee95
Merge branch 'staging' into framework
2017-10-06 14:50:35 +03:00
1c7c37c121
Add the file class to pads in 'template' and 'recent' categories in the drive
2017-10-05 18:07:05 +02:00
ab3648a30a
Merge branch 'newpoll' into staging
2017-10-05 17:56:17 +02:00
503111d26a
use recompiled media-tag
2017-10-05 17:00:47 +02:00
427afc3954
override modified file name in pdfjs
2017-10-05 16:59:55 +02:00
d85db64939
add tags from drive
2017-10-05 16:58:34 +02:00
0aecfad854
Occasionally the language selector only says "Mode" rather than the language
2017-10-05 16:12:49 +03:00
1f35798194
stop event propagation from tag prompt
2017-10-05 15:08:34 +02:00
d9e97b86e6
Merge branch 'staging' into framework
2017-10-05 12:14:37 +03:00
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
26dfc65c25
Comments in polls
2017-10-04 19:06:16 +02:00
68bda92291
Use codemirror for description in poll
2017-10-03 19:04:29 +02:00
b8ce149db6
add hint about tag usage
2017-10-03 18:36:34 +02:00
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
5cf86bf74a
Update UI in poll and remove old code
2017-10-03 14:11:11 +02:00
09c0a473e2
fix function signatures
2017-10-03 14:08:40 +02:00
3337689630
Wrong translation key in toolbar
2017-10-03 14:04:07 +02:00
126742a1c3
Fix bugs in sframe poll and update UI
2017-10-02 19:02:31 +02:00
351b95d6a9
resolve merge conflicts
2017-10-02 18:59:47 +02:00
6c7b135f91
lint compliance
2017-10-02 18:58:18 +02:00
94c392b79f
secure messaging
2017-10-02 18:57:17 +02:00
53f65f6a87
Merge branch 'staging' into framework
2017-10-02 17:46:27 +03:00
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
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
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
48c49e5a75
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-28 10:23:59 +02:00
19e58cec94
prevent typeError
2017-09-28 10:23:48 +02:00
f95acda758
Minor refactoring of /pad/ ; moved /*/main.js into a common file ; framework'd /code/
2017-09-27 16:53:16 +02:00
6dbc02e81a
Merge branch 'staging' into framework
2017-09-27 12:01:18 +02:00
1c791b5b51
Fix framework by removing some async and also fix media tags
2017-09-27 11:58:14 +02:00
90d00c10b1
Make metadata-manager a bit more robust
2017-09-27 11:56:25 +02:00
8de1852ab9
Lint compliance
2017-09-27 10:36:16 +02:00
b4de31c827
Merge branch 'newdrive' into staging
2017-09-27 10:28:16 +02:00
342b6012f7
manual merge of staging into framework
2017-09-26 17:11:45 +02:00
cf6030ab8b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-26 15:58:33 +02:00
e62c5e1d07
Add some debugging lines to help synthesize error cases
2017-09-26 15:58:25 +02:00
345bfc1cea
Remove migration for pad attributes
2017-09-26 14:36:49 +02:00
b3e066eaca
show loading screen tips during loading screen
2017-09-26 10:59:25 +02:00
77fe6a9bba
small bug fixes
2017-09-26 10:23:35 +02:00
1b01855dd2
Merge branch 'staging' into framework
2017-09-25 18:11:57 +02:00
1fd7a6e2b3
Mistake in mkEvent which makes all events only work once
2017-09-25 18:03:31 +02:00
368a6b2406
manual merge, still wip
2017-09-25 17:35:25 +02:00
cdeac00633
Merge branch 'staging' into newdrive
2017-09-25 17:35:06 +02:00
a8eecee590
Fix access to undefined variable in drive
2017-09-25 17:29:31 +02:00
91e36171eb
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-25 17:09:41 +02:00
138ad17e3e
Fix 'import local pads' in settings creating duplicates
2017-09-25 17:09:26 +02:00
d2f1d0c0e9
Fix readme pad not added at registration in sframe drive
2017-09-25 16:09:54 +02:00
ae54cbca33
Refactor sframe-cpnf-inner to export chainpad
2017-09-25 15:46:04 +02:00
44018ee7e1
Improve the LessLoader check to hopefully stop the message saying cookies were blocked.
2017-09-25 15:45:56 +02:00
b15527565c
Allow passing arguments when firing events
2017-09-25 15:45:49 +02:00
0eb2165f31
Implement a new pad framework and make it work (seemingly) with /pad/
2017-09-25 15:45:08 +02:00
d9845d3450
Refactor sframe-cpnf-inner to export chainpad
2017-09-25 15:44:03 +02:00
f418ee9632
Improve the LessLoader check to hopefully stop the message saying cookies were blocked.
2017-09-25 15:43:02 +02:00
72f03b2a47
Allow passing arguments when firing events
2017-09-25 15:42:08 +02:00
6aeb366767
Lint
2017-09-25 14:47:19 +02:00
0600ce59ec
Display the 'spinner' when typing in sframe apps
2017-09-25 13:19:25 +02:00
1d7683503f
Fix link origin in sframe upload table
2017-09-25 12:44:05 +02:00
92c808812a
Fix missing style in toolbar/less2
2017-09-25 11:59:05 +02:00
4049931924
Lint
2017-09-25 11:51:24 +02:00
c364377d7c
Use less2 in sframe drive
2017-09-25 11:48:42 +02:00
47fe7b1c53
Drive in sandboxed iframe
2017-09-22 19:35:06 +02:00
dfdeb7b113
Fix style and race condition for history mode
2017-09-21 18:00:33 +02:00
a810d7bd85
Fix style and race condition for history mode
2017-09-21 18:00:11 +02:00
456370b1aa
Base for Drive in sandboxed iframe
2017-09-21 17:59:26 +02:00
95302366d1
lint compliance
2017-09-21 11:19:23 +02:00
68f7d4bc0a
more conformant tagPrompt behaviour
2017-09-20 17:55:05 +02:00
f990200996
drop any notion of crypto from sframe-listmap
2017-09-19 18:21:33 +02:00
a1c124f1be
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-19 15:38:21 +02:00
c9223cb942
listmap does not care about 'readOnly' mode anymore
2017-09-19 15:38:06 +02:00
88914ec6cc
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-19 15:36:38 +02:00
8a09e39f46
Enable tags in pads
2017-09-19 15:30:08 +02:00
d2b27f3588
resolve merge conflicts
2017-09-19 14:24:26 +02:00
4af01e6e9e
make listmap consume cpNfInner
2017-09-19 14:16:13 +02:00
6fdd66167a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-19 11:04:59 +02:00
732585ea7b
Sandboxed iframe for the whiteboard app
2017-09-19 10:27:31 +02:00
d72146ba7f
use setAttribute for assigning attributes in hyperscript
2017-09-19 10:27:19 +02:00
a1e7bf701d
Select the element after clicking 'show in folder' in the drive search
2017-09-18 15:24:25 +02:00
1131ef0172
Fix language selection in sandboxed iframes
2017-09-18 14:26:54 +02:00
018f71df04
Add drop handlers for mediatags in ckeditor
2017-09-18 10:59:40 +02:00
08e0ae424d
log errors in less compilation
2017-09-14 18:13:03 +02:00
5b45e92250
delete range requests after they have completed
2017-09-14 12:08:41 +02:00
47ce645897
implement slice
2017-09-14 11:51:33 +02:00
6ed4f2fc64
fix a thing
2017-09-14 11:27:10 +02:00
8a564bf350
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-14 11:23:51 +02:00
513f8e73d4
refactor cryptpad.ready to use nthen
2017-09-14 11:23:37 +02:00
b643ccc232
typo
2017-09-14 10:54:16 +02:00
652c916690
change the command in the documentation so that it will not change itself
2017-09-14 10:52:55 +02:00
845f75f8a7
remove a 100ms dead spot from page load
2017-09-14 10:48:59 +02:00
b24e9b84af
Manual merge, update the CSS in loading.js and document that loading.less does nothing.
2017-09-14 10:48:35 +02:00
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
4d688289cc
lint-compliance
2017-09-13 18:19:15 +02:00
2797a77f5d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 18:18:45 +02:00
47cfa0cf45
Focus the editable content when opening a codemirror pad
2017-09-13 18:09:55 +02:00
f039fc7ff5
develop a system for avoiding z-index problems
2017-09-13 17:43:17 +02:00
bafa401473
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 17:22:48 +02:00
fbd4be6135
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 16:32:41 +02:00
d360e2d0f4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 16:20:26 +02:00
ab64bf9e59
Use less2 for the loading screen
2017-09-13 16:19:26 +02:00
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
a332168926
fix some bugs in prompts, alerts, confirms
2017-09-13 15:52:31 +02:00
0db33d48fc
properly handle variable args in Cryptpad.alert
2017-09-13 14:52:58 +02:00
0d8c292fef
Merge branches 'staging' and 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 14:47:55 +02:00
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
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
e1f090bb9d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 12:33:05 +02:00
244e3ecba7
support forefront flag in alert config
2017-09-13 12:32:30 +02:00
63cb5dfc1e
Make less loader rewrite urls to use version parameter
2017-09-13 12:04:24 +02:00
d967df2cec
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 11:00:09 +02:00
e3c0ec29f7
Hopefully chase out a race in sframe-channel
2017-09-13 11:00:00 +02:00
8c41e0bdd6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-12 18:40:20 +02:00
437f50fd4a
Migrate the file to a sandboxed iframe
2017-09-12 18:40:11 +02:00
1713167a5d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-12 14:12:41 +02:00
981a919328
Added tooltips back to sframe land with hopefully a more robust removal.
2017-09-12 14:12:35 +02:00
7d720c73a9
Merge branch 'soon'
2017-09-12 11:34:12 +02:00
ddbda08c88
Fix an issue when cleaning the template category in the drive
2017-09-12 11:32:32 +02:00
9d229b8868
lint compliance
2017-09-12 11:30:43 +02:00
a87ccdc37e
remove redundant lines
2017-09-12 11:27:24 +02:00
da0e31fa54
guard against possible type errors
2017-09-12 11:20:50 +02:00
a0b3201df3
fix focus on alerts, prompts, and confirms. call back from alerts
2017-09-12 10:49:48 +02:00
5a4836fe6d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-11 16:36:41 +02:00
79094aa4bb
Fix closing the title input when the title is not modified
2017-09-11 16:36:24 +02:00
58c38dd77b
focus on the current window when you pop an alert
2017-09-11 16:34:00 +02:00
b9545f45f7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-11 16:26:21 +02:00
306fec2d0e
improve messages for template picker confirm
2017-09-11 16:25:58 +02:00
1943c83f69
clean up api for Cryptpad.confirm
2017-09-11 16:24:43 +02:00
8d3ebdbaf7
I'm stupid
2017-09-11 15:53:27 +02:00
041071e61c
manual merge
2017-09-11 15:52:14 +02:00
7334173b4a
Hopefully fix infinite spinner whenever there is a disconnect (pad)
2017-09-11 15:46:21 +02:00
304a8df808
Remove unneeded migration and fix attributes migration
2017-09-11 14:25:19 +02:00
5a1abc8986
let's try using actual js syntax
2017-09-11 14:04:40 +02:00
134c6057c1
Merge branch 'slide2' of github.com:xwiki-labs/cryptpad into origin/slide2
2017-09-11 14:01:05 +02:00
59d25b4c1a
use camel case, not snek case
2017-09-11 14:00:27 +02:00
520b8967fd
allow people with short passwords to log in
2017-09-11 13:54:48 +02:00
5bf966633c
Merge branch 'staging' into slide2
2017-09-08 18:21:38 +02:00
514bff7065
Add slide number in the title in slide2
2017-09-08 18:21:11 +02:00
0ed6846e07
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-08 17:41:46 +02:00
b5b9f931c7
don't use common-realtime
2017-09-08 17:41:05 +02:00
32e8c8ef4b
implement alertify without alertify
2017-09-08 17:40:25 +02:00
c3a07e879c
Merge branch 'staging' into slide2
2017-09-08 16:23:07 +02:00
fc069dac48
Ask the user before loading the template picker
2017-09-08 16:21:12 +02:00
05793c220c
Fix secure iframes on Edge
2017-09-08 15:55:01 +02:00
290d668ceb
Fix race condition preventing slide to work on Edge
2017-09-08 15:53:53 +02:00
739903d511
don't check account usage if you aren't logged in
2017-09-08 14:00:49 +02:00
bbf7ed3827
refactor drive to use dialog.selectable()
...
fix class on alertify-like boxes
2017-09-08 12:24:20 +02:00
f2aaaa9751
Move slide to secure iframe
2017-09-07 18:56:58 +02:00
809b56625d
refactor ui elements
2017-09-07 18:54:58 +02:00
bca9ba66cb
enforce a configurable minimum password length when registering
2017-09-07 17:44:04 +02:00
fab6264ce6
use loading screen from pages.js
2017-09-07 16:41:11 +02:00
e8298f165a
only display first letter of name if user has no avatar
2017-09-07 16:35:24 +02:00
85003f7a23
lint compliance
2017-09-07 14:21:54 +02:00
cca3c04d43
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-07 12:45:18 +02:00
15e24ebe4f
ui for hashtag picker
2017-09-07 12:45:07 +02:00
1b97996ef8
implement util.once
2017-09-07 12:26:05 +02:00
0423a5f4e2
Clean secure iframe code
2017-09-06 18:26:10 +02:00
04a04aef2b
Add setAttribute/getAttribute in secure iframes. Store attributes in settings
2017-09-06 16:05:20 +02:00
61b228db79
Fix double / when storing a file
2017-09-06 11:41:09 +02:00
3ca9f41290
Get embed code for pad and code
2017-09-06 10:56:27 +02:00
0bb6698399
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-05 18:40:18 +02:00
e85b34f127
Add embed options in the secure pad hashes
2017-09-05 18:38:51 +02:00
b3d5e04bb4
lint compliance
2017-09-05 17:23:16 +02:00
3d2a2da74e
add listAllTags api
2017-09-05 16:52:22 +02:00
0e8a26e8eb
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-05 15:37:02 +02:00
1c50bb3f61
clear hung tooltips
2017-09-05 15:36:46 +02:00
53eb9bb541
Remove the logo from the filepicker loading screen
2017-09-05 15:34:38 +02:00
729c013af7
Get mediatag embed code from the file app
2017-09-05 15:08:05 +02:00
4108520d20
Add contacts in the new menu if the user is logged in
2017-09-05 11:43:16 +02:00
78b338c379
Merge branch 'code2' into staging
2017-09-05 11:38:17 +02:00
db86a2dbee
Merge branch 'code2' of github.com:xwiki-labs/cryptpad into code2
2017-09-05 11:36:31 +02:00
d2787e3eff
Make code2 the default code app
2017-09-05 11:36:02 +02:00
4069945bc4
Merge branch 'code2' of github.com:xwiki-labs/cryptpad into code2
2017-09-05 11:27:11 +02:00
cd7b00d45b
make pixels 100px
2017-09-05 11:25:47 +02:00
b1a1f4ba13
add encrypted thumbnails to metadata for images.
...
correct decryption logic
2017-09-05 10:57:59 +02:00
b8e913c95a
more thumbnail methods
2017-09-05 10:46:00 +02:00
ffbb21dd2c
use cryptpad-september build of media-tag
2017-09-05 10:43:48 +02:00
86e23ac19f
Use less2 in secure iframes
2017-09-04 15:09:54 +02:00
f12f4bb925
Integrate filepicker secure iframe in the code2 app
2017-09-01 15:17:14 +02:00
1072e3e797
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-31 18:12:21 +02:00
ae60b5845f
implement search-by-tag for filesData
2017-08-31 18:12:13 +02:00
72ef730f23
implement tag-related functions
2017-08-31 18:06:26 +02:00
0302c06d0e
send feedback if client does not support symbols
2017-08-31 18:04:20 +02:00
52019dc763
make get and set pad attribute return only cloned data
2017-08-31 18:02:44 +02:00
89b7b644f3
Enable drag & upload in code2 and prepare filepicker
2017-08-31 16:32:26 +02:00
e2719d9098
Add media-tag-nacl to cryptpad so it will be hosted on the server
2017-08-31 16:28:48 +02:00
885282ddea
Fix undefined friend
2017-08-31 15:49:20 +02:00
a60709ff73
Infinite spinner popup leads to frame attempting to reload and failing
2017-08-30 19:23:01 +02:00
b8971cdc23
Add previewMode settings to code2
2017-08-30 18:47:50 +02:00
0d008aaa2e
Add indent settings to code2
2017-08-30 17:57:10 +02:00
f54dc7505c
Migrate indentation settings to a settings subobject
2017-08-30 17:19:50 +02:00
0893bcc0e5
Merge branch 'staging' into code2
2017-08-30 14:57:19 +02:00
f06683e949
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-30 12:26:23 +02:00
0ce32464fd
Fix flickering avatar in firefox
2017-08-30 12:26:11 +02:00
ba0e935add
stub localStorage, and handle errors that might come from touching localStorage
2017-08-30 11:31:49 +02:00
be8ea4102e
keep trying to parse the hash until it works
2017-08-30 11:26:51 +02:00
a2ed266048
Move the code app in a secure iframe
2017-08-30 11:10:57 +02:00
a34d1793e0
drop 'loading' text from loading screen
2017-08-29 18:15:40 +02:00
181a19a9a0
polyfill for array.fill
2017-08-29 11:49:10 +02:00
51fa6287c1
Enable notifications in secure pads
2017-08-29 11:20:02 +02:00
642dc17910
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-29 11:03:05 +02:00
901917983b
Fix an issue preventing pads to be stored in the drive
2017-08-29 11:02:56 +02:00
8fb7fef3f5
regular expressions are never falsey
2017-08-29 10:37:19 +02:00
24eac9b4a6
test for flakey tests
2017-08-28 18:42:04 +02:00
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
430a6f7b77
lint compliance
2017-08-28 17:51:50 +02:00
d9a4a32bf9
Fix avatar for anonymous users in secure pads
2017-08-28 16:57:10 +02:00
00fda0d7d7
Fix avatar in read-only mode (secure pads)
2017-08-28 16:49:28 +02:00
88cb4fd83c
Enable friend requests from secure pads
2017-08-28 16:21:05 +02:00
147d88d845
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-28 15:13:30 +02:00
e43c68aa48
Fix viewers number in secure iframe
2017-08-28 15:13:16 +02:00
f89015d9ed
Update the tab title to match the pad title in pad2
2017-08-28 14:49:33 +02:00
1280cd1659
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-28 14:49:01 +02:00
51c065d13c
Fix link to main in the new toolbar
2017-08-28 14:18:33 +02:00
d9bf2abcd8
Fix old hashes not working anymore in pad
2017-08-28 13:53:24 +02:00
536fe04790
emit notification when alert, confirm, or prompt are called
2017-08-28 13:46:28 +02:00
d4589c4699
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-28 12:22:38 +02:00
6c65e5ff72
Fix the ghost icon in the drive and add missing text
2017-08-28 12:22:31 +02:00
5c2b58e703
log error synchronously so we get a trace when pinPads has no callback
2017-08-28 11:47:01 +02:00
841e3af8da
handle unfriends. clean up. better input validation
2017-08-28 11:46:05 +02:00
c66a0c55e0
ensure that function signatures are correct
2017-08-28 11:40:31 +02:00
91f6e3e543
remove a lot of dead code
2017-08-28 11:28:45 +02:00
57d0c6c973
Merge branch 'new-messaging' into staging
2017-08-25 14:42:34 +02:00
9e04d039d7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-25 14:42:23 +02:00
22d754d514
handle user renames
2017-08-25 14:42:05 +02:00
0a6f81850f
Handle infinite-spinner errors and properly inform the user
2017-08-25 14:24:43 +02:00
f58d4c941f
clean up a bit
2017-08-24 17:19:57 +02:00
b75a951a98
encode messages with 'author' field instead of 'channel'
2017-08-24 17:14:03 +02:00
7bbea28831
minor anti-xss changes...
2017-08-24 13:53:42 +02:00
013b75ae67
implement history range requests
2017-08-24 11:34:05 +02:00
b71f1860db
make uid function reusable
2017-08-24 11:31:20 +02:00
75fde58846
Well that was stupid... (fix bug introduced in acfaaa7d56 when trying to make jshint compliance)
2017-08-23 16:18:47 +02:00
5d9599c9b7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-23 12:15:01 +02:00
cbac5e417c
Make loading screen come much earlier on pad2
2017-08-23 12:14:51 +02:00
b6881349be
Fix an issue with the notifications in secure pads
2017-08-23 11:39:53 +02:00
ec64ac485d
Fix 'not a function' error
2017-08-23 11:06:55 +02:00
acfaaa7d56
jshint compliance
2017-08-23 11:04:44 +02:00
2ad9fcee17
Manual merge of notify.js
2017-08-23 10:45:55 +02:00
8a9755611a
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-23 10:21:53 +02:00
2dacd57e76
fix caching on favicon
2017-08-23 10:21:41 +02:00
33025a9df9
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-22 18:19:06 +02:00
c33b128bf4
Enable feedback in pad2
2017-08-22 18:18:58 +02:00
e81bb3fe08
Fix profile link in the userlist
2017-08-22 18:18:48 +02:00
002eed0d6f
make most of the messenger api async
2017-08-22 15:55:00 +02:00
d9f5e3638e
Big caching improvements :D
2017-08-22 15:50:10 +02:00
b4864b96ac
Add a recent pads category in the drive
2017-08-22 14:28:17 +02:00
4f3b4a30ee
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-21 18:38:16 +02:00
4b70fc9f49
Use resources from the original origin in pad2
2017-08-21 18:38:07 +02:00
aa9e0d3cd3
Enable AppConfig in pad2
2017-08-21 18:30:51 +02:00
f40d2c0b20
Add templates to pad2
2017-08-21 18:21:53 +02:00
8d020833af
Add missing file
2017-08-21 18:21:25 +02:00
8d837d22ea
Add history to pad2
2017-08-21 17:40:21 +02:00
b2e6df1f9d
Add import & export in pad2
2017-08-21 15:34:21 +02:00
e2d39de143
Forget button in pad2
2017-08-21 15:20:38 +02:00
e4020ba8d4
Fix pad creation in pad2
2017-08-21 14:41:56 +02:00
140c6f3776
Add limit warning in pad2
2017-08-21 12:24:33 +02:00
30aef71603
Enable avatars in pad2
2017-08-21 12:01:38 +02:00
f88a6f63fe
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-21 11:08:38 +02:00
fb4808e1e1
Fix queries callback arguments
2017-08-21 11:08:27 +02:00
6dd1643738
Manual merge work done on loading page to pad2
2017-08-21 10:53:40 +02:00
8b702e0150
wip
2017-08-21 10:34:49 +02:00
e65b2f4e9f
Add shareButton to pad2
2017-08-18 18:43:04 +02:00
beb45740d0
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-18 16:34:50 +02:00
90f892de9c
Useradmin menu, notifications and share button in pad2
2017-08-18 16:34:41 +02:00
253ab68d8d
Merge branch 'staging' into new-messaging
2017-08-18 15:31:06 +02:00
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
0693a98890
create a thumbnail when uploading images from whiteboard
2017-08-18 12:53:02 +02:00
b17044ad98
add support for thumbnails in metadata
2017-08-18 12:47:04 +02:00
dd9b38066e
Change display name in useradmin menu
2017-08-18 11:07:42 +02:00
a96d447e8b
Add notifications in pad2
2017-08-18 10:47:30 +02:00
cf6d8c83b2
Fix title setter logic and separate it from UI
2017-08-17 19:58:48 +02:00
ec87f3f897
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-17 19:01:40 +02:00
415399ef64
Changes to support title change in metadata
2017-08-17 19:01:33 +02:00
d1affebd14
Title in pad2
2017-08-17 19:01:03 +02:00
604415b32c
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-17 18:29:24 +02:00
fab3d67b75
Enable title in pad2
2017-08-17 18:28:05 +02:00
909bda4302
This should fix laxy metadata
2017-08-17 18:26:58 +02:00
a4dbf39c4a
fix pdf display problems in chrome
2017-08-17 18:11:46 +02:00
2490ee253f
Added setDisplayName RPC
2017-08-17 18:09:17 +02:00
887a26b1a6
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-17 17:34:47 +02:00
0b34ceb0eb
Added RPC setPadTitleInDrive()
2017-08-17 17:34:08 +02:00
bed7d95bf3
use latest compiled cryptpad media-tag
2017-08-17 17:31:52 +02:00
3a5526e247
infer pdfjs document title from iframe url
2017-08-17 17:30:28 +02:00
25466aa2f9
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-17 17:26:27 +02:00
1d237735ef
Useradmin menu in pad2
2017-08-17 17:26:20 +02:00
3b5af3ea74
sframe common changes
2017-08-17 16:56:18 +02:00
d1157c4d72
Add missing file
2017-08-17 16:28:54 +02:00
d237c76f6c
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-17 16:25:31 +02:00
f5855a2870
Add account name in metadata manager
2017-08-17 16:25:25 +02:00
3c0197cbf4
Firefox fails to boot the iframe if there is no number on setInterval
2017-08-17 16:17:57 +02:00
d88704fb50
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-17 15:44:41 +02:00
a4850a7fcc
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-17 15:42:28 +02:00
fc5bdd3bed
Add lazy metadata to fix parse errors in pad2
2017-08-17 15:42:26 +02:00
ad9f2ff223
Made pad2 server more generic and easy to implement
2017-08-17 15:41:04 +02:00
a125253cde
lint compliance
2017-08-17 15:13:05 +02:00
290763d6c5
don't complain about bad realtime state just because you disconnected
2017-08-17 15:07:34 +02:00
226ef1fd00
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-17 14:55:53 +02:00
fb512c8923
Toolbar in pad2
2017-08-17 14:55:44 +02:00
3b20dcd435
add optional cache-busting to favicon
2017-08-17 14:34:22 +02:00
ee874878dd
clear tooltips when the userlist is redrawn
2017-08-17 12:50:40 +02:00
f207edfd28
handle errors when deriving keys. fix incorrect reference
2017-08-17 12:50:12 +02:00
e04c0b89a1
manual merge of staging
2017-08-17 12:14:19 +02:00
130b330ede
refactor messaging
2017-08-16 10:04:50 +02:00
736288a85b
lint compliance
2017-08-14 14:02:57 +02:00
5037f444e9
update markdown sanitization strategy
2017-08-14 13:12:43 +02:00
878a565f89
tiny little performance improvement in something that really doesn't need it
2017-08-11 17:34:51 +02:00
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
17b986a6ca
fix toolbar drive link (oops)
2017-08-11 12:56:06 +02:00
284124a32d
WIP
2017-08-11 10:59:54 +02:00
4acd9957a9
Set the url if there is none
2017-08-11 10:40:57 +02:00
33e73dd5e5
fixed one last fight
2017-08-10 21:40:34 +02:00
9c0b0cc6a8
Merge branch 'staging' into pad2
2017-08-10 18:39:16 +02:00
1e56fa31c0
yay, they talk and they don't fight
2017-08-10 18:31:44 +02:00
1c526feffb
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-10 18:06:58 +02:00
b3d349bf80
Merge branch 'staging' into pad2
2017-08-10 14:53:12 +02:00
8efac4e661
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
2017-08-10 14:49:41 +02:00
0dde1d7507
wip
2017-08-10 14:49:21 +02:00
baf64114a6
point to homepage in drive
2017-08-10 14:45:56 +02:00
c304071492
wip
2017-08-09 17:37:55 +02:00
e49a42db18
Merge branch 'staging' into pad2
2017-08-09 16:28:51 +02:00
1f9bd866c3
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
2017-08-09 16:06:46 +02:00
edad5deeac
fix logo not showing sometimes in chrome
2017-08-09 16:06:29 +02:00
52565076b9
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
2017-08-09 14:48:06 +02:00
4b25ab80d6
wip
2017-08-09 14:45:39 +02:00
844967a880
continued refactoring
2017-08-09 14:20:37 +02:00
a4aeada585
make the file dialog placeholder visible, center file list
2017-08-09 11:20:46 +02:00
e08ed72653
generate the tooltip after the button
2017-08-09 11:11:53 +02:00
665e81912e
put the tooltip on the actual button to prevent tippy from popping when not intended
2017-08-09 11:06:06 +02:00
34ba673cd3
improve file upload UI
2017-08-09 10:54:20 +02:00
34a5a32c44
lint compliance
2017-08-08 20:29:02 +02:00
cdf3cee9c8
split out message rendering into ui
2017-08-08 18:21:03 +02:00
fcdfa52aa9
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-08 17:13:38 +02:00
58b3b32cc3
big messaging refactor. split UI from logic
2017-08-08 17:13:10 +02:00
6ca6755d02
more missing titles in toolbar
2017-08-08 16:51:23 +02:00
d3f2398865
bump tippy to 1.2.0, add dynamicTitle option
2017-08-08 16:19:44 +02:00
8301bd44be
Merge pull request #164 from pbondoer/staging
...
UI improvements
2017-08-08 14:46:25 +02:00
f585ddccdf
fix image sizes in /slide/
2017-08-08 11:44:01 +02:00
fc95f1b6a8
lint compliance
2017-08-08 10:32:25 +02:00
ba9696ba33
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-08 10:03:54 +02:00
a612f02be2
Merge branch 'staging' into pad2
2017-08-07 17:49:03 +02:00
c63807fd2b
implement channel.send
2017-08-07 17:24:16 +02:00
35a55a15ed
wip
2017-08-07 17:23:28 +02:00
d835005905
simplify in-memory message format
2017-08-07 17:22:56 +02:00
8f285eba9f
make file picker ui even prettier
2017-08-07 17:22:54 +02:00
797cc2b105
handle messages which fail to decrypt
2017-08-07 17:21:23 +02:00
65dfd99171
major wip
2017-08-07 16:27:57 +02:00
c53e738054
improve file picker ui
2017-08-07 16:27:29 +02:00
bad5160885
fix bad reference
2017-08-05 09:14:36 +02:00
05aa5ed347
hide new feature until it is finished
2017-08-04 18:07:47 +02:00
395f6e1b27
reset confirm text for alertify
2017-08-04 15:54:15 +02:00
9865359bb0
don't tell users about new versions
2017-08-04 14:05:00 +02:00
c8c44d3bfc
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-04 11:22:22 +02:00
0d1f19f5d4
Big manual merge
2017-08-04 11:20:17 +02:00
f6d45d05f6
use logo in toolbar
2017-08-04 11:01:26 +02:00
11c72499a0
don't add duplicate messages to the history
2017-08-03 17:06:28 +02:00
52854c5a8e
ignore history range responses
2017-08-03 15:05:04 +02:00
e786117110
get new messages when reconnecting and WIP get more history
2017-08-03 15:04:29 +02:00
2ce341fed6
disable input field when disconnected
2017-08-03 14:12:07 +02:00
66d81429bd
integrate file embed into code editor
2017-08-03 11:47:54 +02:00
8b0831ac5d
save images drawn with whiteboard to your CryptDrive
2017-08-02 16:51:41 +02:00
fe826133b3
make some markdown styles reusable
2017-08-02 11:03:06 +02:00
35cf23ce2c
clear tooltips when redrawing the userlist
2017-08-01 11:50:43 +02:00
4c6f8d71e1
don't invoke spinner if it does not exist
2017-08-01 11:08:25 +02:00
311f709dc4
lint compliance
2017-07-31 17:15:17 +02:00
c147d342a3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-31 15:45:50 +02:00
542d0cd17f
drop support for legacy pad list
2017-07-31 15:34:56 +02:00
93e007b52a
reduce png sizes
2017-07-31 15:11:35 +02:00
3fa010027c
implement clearTooltips
2017-07-31 12:29:41 +02:00
a68a225d79
fix read-only synchronization bug
2017-07-31 12:21:48 +02:00
796bf89491
Update of the front-page
2017-07-24 17:56:54 +03:00
658b00814b
TodoApp - Style and translations
2017-07-23 16:08:49 +03:00
ae693ff5a7
lint compliance
2017-07-23 09:01:12 +02:00
6622735db0
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-22 14:15:15 +02:00
55cb0734e2
make bad state timeout configurable
2017-07-22 10:56:39 +02:00
469f49fc0a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-20 18:32:12 +02:00
a80b00a765
Move the file picker in common
2017-07-20 18:32:03 +02:00
d44f0696af
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-20 18:24:53 +02:00
2d0635a409
use custom version of tippy
2017-07-20 18:23:51 +02:00
09793e0d7d
jshint
2017-07-20 18:21:10 +02:00
683769f30a
Fix tooltips
2017-07-20 18:19:59 +02:00
9633025afe
CSS for the removeHistory button in contacts
2017-07-20 17:26:33 +02:00
97f1bbedc5
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-20 17:08:28 +02:00
b9bba76b4e
Make the delay for tooltips configurable
2017-07-20 17:08:11 +02:00
dd98e2222a
WIP erase chat history button
2017-07-20 17:04:11 +02:00
128d5b2c6d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-20 15:55:17 +02:00
b22127f10c
add history removal
2017-07-20 15:55:04 +02:00
a5a73ce326
Fix print button in slide
2017-07-20 14:41:51 +02:00
140964478e
Enter + shift key to add a new line in chat
2017-07-20 09:54:44 +02:00
e26e041a5b
fix jshint errors
2017-07-19 17:24:35 +02:00
c33d2a2db0
New tooltips
2017-07-19 17:14:10 +02:00
b56a782f01
Store the userlist state when it is closed using the icon
2017-07-19 14:38:46 +02:00
82c87144cb
Remove the friend request button when the request is sent
2017-07-19 14:14:34 +02:00
5ce49af57b
Make CryptDrive fast again
2017-07-19 11:36:00 +02:00
e2d031c76a
Add support for markdown syntax in contacts
2017-07-19 10:29:59 +02:00
cba113a2b0
Lint
2017-07-18 15:52:46 +02:00
91ebbdfdb4
View contact status
2017-07-18 15:50:21 +02:00
39fd0d0f5f
notify if you're focused on a conversation in a bacgkrounded tab
2017-07-18 10:57:37 +02:00
f719b34e09
Add tab notification in contacts
2017-07-18 10:42:23 +02:00
baf439648e
Add the contacts app in the dropdown menu
2017-07-18 10:22:51 +02:00
36d792874a
Fix initial text not removed in /contacts
2017-07-18 10:13:29 +02:00
df0442c2bf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-17 18:40:27 +02:00
eb4b5ca77c
stub history removal. coming soon
2017-07-17 18:39:44 +02:00
aa8181ab2b
Contacts app translations
2017-07-17 18:34:46 +02:00
73e32f273e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-17 18:08:07 +02:00
009d01abde
Fix friend removal and update user data
2017-07-17 18:07:58 +02:00
1aecdeb075
fresh media tag build
2017-07-17 11:08:39 +02:00
7114bfaa52
lint compliance
2017-07-13 21:09:29 +02:00
e2c17dbeb4
resolve conflicts
2017-07-13 17:52:00 +02:00
557f13f796
Unfriend and update username - beta
2017-07-13 17:32:57 +02:00
96d2ff67e1
user-plus as icon for add-friend
2017-07-13 15:22:11 +02:00
c3ba7cd792
fix race condition
2017-07-13 12:55:08 +02:00
d0d38aa2a3
feedback on first visit
2017-07-13 11:03:56 +02:00
9527a5def7
avoid a CSP error. silence pdfjs warnings
2017-07-13 10:58:45 +02:00
9707433944
comment out debugging info
2017-07-13 10:57:51 +02:00
575d4612f9
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-12 18:56:12 +02:00
eda9908c3b
prevent accessing attributes of null
2017-07-12 18:56:04 +02:00
eeb2ee2d17
add clear channel rpc
2017-07-12 18:55:29 +02:00
89af8e4472
fix funny off-by-one thing
2017-07-12 18:49:33 +02:00
ac684a8dc7
Use the APP toolbar in profile
2017-07-12 18:34:16 +02:00
2d509e3e25
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-12 14:34:57 +02:00
b3e225cb3b
Replace spinner by text and fix mobile UI
2017-07-12 14:33:28 +02:00
f450a28d11
improve logic for guessing titles within code documents
2017-07-12 11:09:53 +02:00
0483d15b8f
lint compliance
2017-07-12 10:55:42 +02:00
c0cb5c4263
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-12 10:46:15 +02:00
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
5b3cca58bd
modifications to handle latest media-tag
2017-07-12 10:44:03 +02:00
7f5c301734
Add display name in the settings useradmin menu
2017-07-11 18:50:41 +02:00
fb21a650ce
Lint errors
2017-07-11 17:40:13 +02:00
159ccc2866
Fix mediatag flickering
2017-07-11 17:39:08 +02:00
16d0527e92
Add a page title in drive, settings and file
2017-07-11 15:13:39 +02:00
a0b14faf89
Fix the font in settings and drive
2017-07-11 13:11:16 +02:00
8f5a244999
Replace mediatag markdown syntax by html. Enable file upload in /code.
2017-07-11 11:56:06 +02:00
438e7e6cf9
Fix display name in useradmin (friends app)
2017-07-10 13:04:33 +02:00
e6188bfb63
Fix useradmin dropdown position
2017-07-10 12:38:54 +02:00
97d8d86395
Fix avatar in static pages
2017-07-10 12:03:44 +02:00
e8f3df5a46
Clean less
2017-07-10 11:57:04 +02:00
159d72f33b
Merge branch 'msg' into staging
2017-07-10 11:48:22 +02:00
8e2e8b1653
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-10 11:46:16 +02:00
ff10c282d4
Avatar in the user admin button
2017-07-10 11:46:06 +02:00
be6ee672d3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-10 11:16:52 +02:00
f0523a0153
Avatar in the user admin menu
2017-07-10 11:16:44 +02:00
e10de1219b
feedback on view hash usage
2017-07-10 11:13:56 +02:00
52eb8e307c
feedback for language used
2017-07-10 10:59:32 +02:00
1c531ccd47
Pin the chat channels
2017-07-10 10:39:57 +02:00
4a37bc4a1c
abort the realtime session if it does not synchronize for 30 seconds
2017-07-10 10:34:25 +02:00
c096872467
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
2017-07-10 09:30:44 +02:00
22fbc7e5d8
implement getter for public keys
2017-07-10 09:21:27 +02:00
df103c4074
Messaging app
2017-07-07 18:53:21 +02:00
1c462d5c4a
use random token for feedback instead of date
2017-07-07 10:16:54 +02:00
21f1527c71
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
2017-07-06 18:39:06 +02:00
5c7441f82c
Display the friend list in the friend app
2017-07-06 18:38:58 +02:00
fac715dd09
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
2017-07-06 18:35:21 +02:00
4b23ef74d7
add support for curve message signing and curve validateKeys
2017-07-06 18:30:16 +02:00
a5e8f6ae81
Add friend app and fix avatar size
2017-07-06 18:00:03 +02:00
af31771e3a
Share a channel id, not a hash
2017-07-06 14:47:02 +02:00
852b2eaf1d
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
2017-07-06 14:27:32 +02:00
26a83003b5
Create an owned channel
2017-07-06 14:27:13 +02:00
5b5a7ab286
Hide the friend button when the resquest is accepted
2017-07-06 12:31:31 +02:00
d3bbdc27c0
lint compliance
2017-07-06 10:33:31 +02:00
bce0b03ba4
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
2017-07-06 10:25:53 +02:00
909e00bbc3
create a listmap object using public key crypto
2017-07-06 10:25:43 +02:00
96fde4e5ed
Add missing file
2017-07-06 10:24:28 +02:00
df53166b37
implement and use prototype curve encryptors
2017-07-06 10:22:20 +02:00
d293ba4d44
add support for invite hashes
2017-07-06 09:44:39 +02:00
37d5b0afb9
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
2017-07-05 18:42:51 +02:00
95e2efab89
Add to friend list
2017-07-05 18:42:32 +02:00
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
4016a95540
prototype invite app
2017-07-05 16:01:50 +02:00
465ef74f2b
Fix rpc
2017-07-05 16:02:22 +02:00
bf17ad3f1e
Friend button in the userlist
2017-07-05 15:59:36 +02:00
8dc8aa27ab
Lint
2017-07-05 12:27:40 +02:00
35e8c1a63b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-05 12:27:08 +02:00
43ac71603c
Move pad attributes in pad data
2017-07-05 12:26:42 +02:00
9f6ecea5d9
fix nacl reference error in media tag
2017-07-05 11:57:53 +02:00
69f4ce2abd
Fix middle click on the drive button
2017-07-04 17:03:54 +02:00
cbd9fc4076
Merge branch 'staging'
2017-07-04 17:03:20 +02:00
3fe0baa956
disable pin limit caching
2017-07-04 15:50:52 +02:00
9c1eaf9c1a
lint compliance
2017-07-04 15:48:20 +02:00
cab595f959
Fix duplicate folders in the drive
2017-07-04 14:51:35 +02:00
ac8da0d52d
load codemirror in the correct context. fix selection events
2017-07-04 12:37:24 +02:00
43b877ad27
fix styling on media tag download button
2017-07-04 10:28:50 +02:00
1fd0ba488a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-04 10:21:35 +02:00
04a28433ae
replace inner content of media tag download buttons
2017-07-04 10:21:29 +02:00
f85af7ef4c
hide useless messages
2017-07-04 10:19:18 +02:00
a59853f9c2
use new media tag
2017-07-04 10:15:45 +02:00
8cf694bea6
Lint
2017-07-03 18:41:41 +02:00
47c6c64b8a
Allow emojis in default avatars
2017-07-03 18:37:50 +02:00
ffd184d50e
Fix overflowing names in the new userlist
2017-07-03 17:41:34 +02:00
92d88d1644
don't change allowed media types until we have media-tag scoping
2017-07-03 16:45:40 +02:00
fa2d857d70
Fix css issues with Safari
2017-07-03 16:11:41 +02:00
81c8949aee
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-03 14:43:17 +02:00
8b0210baf1
hide useless error
2017-07-03 12:26:34 +02:00
991cb896bd
Fix avatar in /pad
2017-07-03 12:25:05 +02:00
6ac056e314
make explicit file size RPCs unauthenticated
2017-07-03 11:38:39 +02:00
5694505719
Fix syntax highlighting
2017-07-03 11:16:28 +02:00
335898a4c7
Hack the drawer to close it when clicking outside
2017-06-30 18:23:23 +02:00
472a62730b
Fix profile creation and add a link to the profile app
2017-06-30 17:24:22 +02:00
b153dda6ff
Add avatars in the user list
2017-06-30 16:57:23 +02:00
555d0a09f8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-30 12:36:34 +02:00
568ce70afd
Add a spinner for the history and update history buttons
2017-06-30 12:36:21 +02:00
2144587919
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-30 12:11:55 +02:00
c25f2df721
Added caching versions to some of the images which are loaded by js
2017-06-30 12:11:44 +02:00
7e69d051c4
Lint errors
2017-06-30 11:46:20 +02:00
26193aeaa7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-30 11:42:59 +02:00
b9320e6005
Toolbar improvements
2017-06-30 11:42:54 +02:00
75c2a1fd73
jshint compliance
2017-06-30 11:20:56 +02:00
b8934c0b97
smarter redraws of drive/settings usage bar
2017-06-30 11:20:40 +02:00
cc5b7615ad
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-29 18:05:49 +02:00
ed0121d172
Lint errors
2017-06-29 18:05:34 +02:00
b7cb1a8d5f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-29 17:54:29 +02:00
8279ef3130
Fix conflict between ckeditor toolbar and userlist on small screens
2017-06-29 17:51:30 +02:00
b037cfbfdb
set usage tips relative to bottom of screen, not top
2017-06-29 17:25:06 +02:00
1763cf72d1
tell anonymous users they can't upload
2017-06-29 16:28:58 +02:00
7a87775372
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-29 15:21:09 +02:00
45f180955b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-29 15:20:46 +02:00
56a25e1036
Small fixes for the new toolbar
2017-06-29 15:15:40 +02:00
1179992a90
update feedback key name
2017-06-29 14:48:33 +02:00
39149a052b
add new feedback keys
2017-06-29 14:16:20 +02:00
9b8866ed72
handle RPC_NOT_READY error for logged out users
2017-06-29 11:13:48 +02:00
a9f8f42e3c
use minified less compiler
2017-06-29 10:50:21 +02:00
877c5a8d0e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-28 17:15:42 +02:00
19ff8a345d
Avatar upload in the profile app
2017-06-28 16:59:35 +02:00
5e56ad912e
remove the last bit of compiled css
2017-06-28 14:51:49 +02:00
7a7307d560
fix logging when resetting
2017-06-28 12:08:16 +02:00
6c94605b9b
File upload in the profile
2017-06-28 10:59:29 +02:00
1c1869a22c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-27 18:26:10 +02:00
f232675cc9
create a favicon if it does not already exist
2017-06-27 18:07:03 +02:00
3be6433fdf
send feedback on name changes
2017-06-27 18:06:32 +02:00
bb74935b08
allow pin limit caching to occur at api level
2017-06-27 15:37:42 +02:00
00a554ca0d
Fix the donate button style with the new toolbar
2017-06-27 14:36:49 +02:00
e9bfaa9a60
compile less clientside. remove compiled css
2017-06-27 14:25:02 +02:00
67a096a8a4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-27 09:57:32 +02:00
7b37146034
don't let spacebar keyups propagate outside of the title
2017-06-26 18:32:29 +02:00
9195c0cd12
is isOverPinLimit in toolbar
2017-06-26 18:13:06 +02:00
fce0a37f50
cache pin data once retrieved from the server
2017-06-26 17:32:31 +02:00
33ea8cb183
Make sure we don't call both the yes and no handlers in prompts
2017-06-26 16:23:55 +02:00
51e06e68a7
don't change slides when navigating through history
2017-06-26 14:40:48 +02:00
38f568635d
Fix duplicate media-tag in slides when adding or removing a slide
2017-06-26 14:08:14 +02:00
cc341ca6d4
Lint error
2017-06-23 17:57:29 +02:00
0d4d104e08
Mobile support for the new toolbar
2017-06-23 17:56:14 +02:00
b4b851959f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-22 17:42:32 +02:00
61a891267f
more feedback
2017-06-22 17:42:24 +02:00
c1d2fa6b52
Unhack validateKey for the history mode
2017-06-22 17:35:54 +02:00
2710279904
Use the new share button in the file app
2017-06-22 17:03:51 +02:00
684269fdda
Userlist in polls
2017-06-22 16:14:54 +02:00
a11befaa0f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-22 15:52:31 +02:00
13288ee18b
Update the userlist in code, slide and pad
2017-06-22 15:52:25 +02:00
852c028822
don't allow editing if pad type is wrong
2017-06-22 14:31:55 +02:00
92b6e60573
Small improvements for the new toolbar
2017-06-22 11:13:53 +02:00
eddfb936f2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-22 11:12:51 +02:00
115813c191
Merge branch 'new-templates' into staging
2017-06-22 11:11:32 +02:00
ab54dcf84d
make libs pass jshint
2017-06-22 10:03:58 +02:00
8d956c3de6
New toolbar
2017-06-21 18:04:35 +02:00
48f9745619
clientside templating
2017-06-21 18:02:38 +02:00
b7a0547b77
New toolbar colors
2017-06-20 17:59:11 +02:00
3052ec8abb
Merge branch 'newCk' into staging
2017-06-20 14:57:19 +02:00
c22f610d5c
Fix the drive integrity check
2017-06-20 12:59:44 +02:00
fb388f2610
Fix an issue with invalid drive before migration
2017-06-20 12:42:30 +02:00
59fb5bd8be
One toolbar color per app
2017-06-20 12:33:50 +02:00
5a248db267
Merge branch 'staging' into newCk
2017-06-20 10:57:40 +02:00
728272d936
Fix undefined function
2017-06-20 10:29:03 +02:00
a38819f5b9
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-19 14:41:38 +02:00
1ad1b78c64
Fix the history mode with readOnly and old URLs
2017-06-19 14:41:31 +02:00
f29f430e7c
better handling of non-rpc messages
2017-06-19 12:38:24 +02:00
e40f43bd20
Migrated pads were not displayed instantly in the drive
2017-06-19 11:52:57 +02:00
a5924cb803
Make sure the initial title is set in the userDoc when creating a new pad
2017-06-15 18:50:39 +02:00
0e9ebddf11
fix the things
2017-06-15 18:13:24 +02:00
c0e2c1060e
don't reload when slide hash changes
2017-06-15 17:54:35 +02:00
594405de73
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-15 15:36:23 +02:00
cbe21959b4
Update UI for the file/media app
2017-06-15 15:35:52 +02:00
17146d7af9
send feedback for uploads
2017-06-15 15:34:13 +02:00
2068a8b85b
Embed the mediatag library in the file app
2017-06-15 14:58:18 +02:00
66b076111e
Add an upload button to the slide's file picker
2017-06-15 12:32:44 +02:00
b480346f5b
more efficient media-tag
2017-06-15 12:05:25 +02:00
0d47e68d3e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-15 11:19:24 +02:00
0eb50b8b6c
drop pdf.js dependency
2017-06-15 11:19:06 +02:00
a237eec41e
Add a file picker in the slide app
2017-06-15 11:04:58 +02:00
d25a0893cf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-14 17:24:49 +02:00
3184e5d235
don't reload page on hash mode change
2017-06-14 17:24:44 +02:00
1077b3b267
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-14 15:55:10 +02:00
a98353af6c
Add a button to upload a file in the drive
2017-06-14 15:55:03 +02:00
295f9c00a6
send feedback on buttons
2017-06-14 15:36:46 +02:00
497ddeee6d
Upload files with drag&drop in the drive
2017-06-14 12:47:37 +02:00
687b4d8307
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-14 11:10:26 +02:00
69c3bd392f
update built media tag to latest XWiki version
2017-06-14 11:09:51 +02:00
d8ebe566d8
Don't call mediatag for non-image files
2017-06-13 18:38:53 +02:00
37d3d04f0e
Clean mediatag integration code
2017-06-13 17:57:27 +02:00
802146e2af
don't put download buttons in a div
2017-06-13 17:54:15 +02:00
19cb920a7c
Don't redraw a media-tag everytime the content has changed
2017-06-13 17:21:22 +02:00
2032c08066
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-13 16:15:11 +02:00
f9c26645cf
Upload images using the slide app
2017-06-13 16:15:04 +02:00
17e4e9be27
download anything that isn't an image in media-tag
2017-06-13 16:12:13 +02:00
1b574da053
fix typo
2017-06-13 12:24:32 +02:00
7ad89bd9af
don't interrupt boot because of localStorage failure
2017-06-13 12:02:36 +02:00
3337e2133a
more thorough tests for localStorage presence
2017-06-13 11:57:21 +02:00
4eeea93265
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-13 11:38:16 +02:00
11e2226f1a
Fix lint errors
2017-06-13 11:38:04 +02:00
c779e328e8
warn users if their browser does not support localStorage
2017-06-13 11:33:25 +02:00
d7292e69c6
Fix undefined variable
2017-06-13 11:25:12 +02:00
803bad1421
Move the file upload code in a separate file
2017-06-13 11:21:26 +02:00
a58162a617
Make the drive tests work when not logged in
2017-06-12 17:49:33 +02:00
2fb5e3ae35
Merge branch 'staging' into newToolbar
2017-06-12 17:00:07 +02:00
969cec5d60
Make sure everything is synced before migrating the drive
2017-06-12 16:19:45 +02:00
7dd9ed543a
Merge branch 'newDrive' into staging
2017-06-12 16:08:09 +02:00
376b60c21c
New toolbar temp
2017-06-12 15:59:24 +02:00
c9725af508
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-12 14:34:01 +02:00
db9b9547d9
don't complain about missing callbacks for messages which are not our responsibility
2017-06-12 14:33:50 +02:00
30bdb9881c
Fix undefined element in select dropdown menus
2017-06-12 14:23:06 +02:00
8471dab6b1
Provide hints in theme and language dropdowns
2017-06-12 12:47:25 +02:00
a5cb5f2ceb
Merge branch 'staging' into newDrive
2017-06-12 10:51:38 +02:00
9cc25d4c9f
Merge branch 'staging' into newDrive
2017-06-09 17:03:01 +02:00
a57f7c6ce7
Fix lint errors
2017-06-09 16:39:44 +02:00
4bcad3e154
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-09 16:26:36 +02:00
47857ec382
use cached pinned usage data
2017-06-09 16:17:20 +02:00
75c3c10b20
Merge branch 'soon' into staging
2017-06-09 15:56:45 +02:00
c1402fbb0a
Lint error
2017-06-09 15:56:18 +02:00
b36484931d
Lint
2017-06-09 15:55:46 +02:00
1fb638f519
clean the code
2017-06-09 15:50:13 +02:00
23318357a6
make fewer RPC calls for usageBar
2017-06-09 15:33:03 +02:00
df586a223c
update limits, usage, plan, and note whenever they are checked
2017-06-09 15:31:43 +02:00
8bad0c556e
change log to error
2017-06-09 15:29:55 +02:00
b0e00d337e
more careful validation
2017-06-09 15:28:53 +02:00
fd88162624
Merge branch 'staging' into newDrive
2017-06-09 14:47:37 +02:00
7c9e86e351
Merge branch 'soon' into staging
2017-06-09 14:47:15 +02:00
9694272083
Fix html code not parsed
2017-06-09 14:42:55 +02:00
9ca10ba524
Merge branch 'staging' into newDrive
2017-06-09 14:40:26 +02:00
7f120c8fc1
Merge branch 'soon' into staging
2017-06-09 14:38:36 +02:00
78e6118153
Merge branch 'staging' into newDrive
2017-06-09 14:38:21 +02:00
444c41974e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-09 14:37:54 +02:00
df5cbfb53e
Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon
2017-06-09 14:36:38 +02:00
6a96aa6819
Disconnect the network when migrating the drive in another tab
2017-06-09 14:36:35 +02:00
2a94bdaf05
test
2017-06-09 13:41:11 +02:00
ca95b5c42b
Remove unused console.log
2017-06-09 12:31:07 +02:00
f8c69573fd
Disconnect other tabs when migrating the drive
2017-06-09 12:23:28 +02:00
c4e5741ae0
update upgrade button logic
2017-06-09 12:12:39 +02:00
f1a9002417
use upgradeURL with usage bar
2017-06-09 10:46:11 +02:00
51e0d40572
Make sure the old storage key is removed after migration
2017-06-08 18:35:20 +02:00
b0fe04381d
Merge branch 'staging' into newDrive
2017-06-08 18:14:31 +02:00
1c2ea04f11
Drive refactoring
2017-06-08 17:52:00 +02:00
fe42f5e88c
ask for new cookies and resend commands on NO_COOKIE errors
2017-06-08 14:19:14 +02:00
da533b106a
improve type checking in getFileSize
2017-06-08 11:24:20 +02:00
d25477e8c6
don't let tooltips interfere with DOM interaction
2017-06-06 18:08:23 +02:00
5641a4a839
Add the file app in the 'new' dropdown menus
2017-06-06 11:52:47 +02:00
ac91d2f413
Fix the upgrade and donate buttons in the home page
2017-06-06 11:37:54 +02:00
ee57458158
Remove the pin limit alert
2017-06-06 10:49:32 +02:00
767793b5ca
fix stuck loading tip
2017-06-02 12:13:11 +02:00
f631973f1f
optimize file upload
2017-06-01 18:16:02 +02:00
55af84cc90
lower spinner timeout interval
2017-06-01 14:27:06 +02:00
07279c8dc7
export boolean Test.testing
2017-06-01 10:23:24 +02:00
71bd808e4f
Send everything through the test global function
2017-06-01 00:09:39 +02:00
244bd7b378
;;;
2017-05-31 23:32:47 +02:00
7d557df74b
a new and more horrible way of sniffing the logs out of the instance
2017-05-31 23:29:58 +02:00
0d4b74cfba
;;;;;; keep these ;;; for later ;;;;;
2017-05-31 19:46:23 +02:00
24f37ea414
Delicious testing
2017-05-31 19:40:17 +02:00
7b94106bac
fix inverted conditional :/
2017-05-31 18:15:31 +02:00
2e03485db4
remove known bad entries from localStorage.userHash...
2017-05-31 18:12:58 +02:00
936bf8df9d
return falsey if userHash is junk
2017-05-31 18:08:41 +02:00
105e5cdac9
fix 'undefined/' userHash
2017-05-31 18:01:12 +02:00
401e908963
use media-tag with xhr error handling
2017-05-31 17:17:01 +02:00
3465710237
Merge branch 'mediatag' of https://github.com/Regzox/cryptpad into tag
2017-05-31 12:55:05 +02:00
21c39572be
Update media-tag and fix bower dependencies
2017-05-31 11:53:25 +02:00
ebfa228bc0
add upgrade button to all static pages
2017-05-30 18:39:41 +02:00
149568689a
color donate button green
2017-05-30 17:58:31 +02:00
ec6ad6772b
send feedback on donation
2017-05-30 17:25:36 +02:00
cb2efe138b
Media Tag integration, image, audio, video, pdf
2017-05-30 16:36:06 +02:00
9ca5bc507e
add support for donate button
2017-05-30 15:42:53 +02:00
66520b6041
cleaned up the accounts, limits and revenue sharing and unified the config in one place
2017-05-26 18:09:31 +02:00
3f3d64992d
resolve merge conflicts
2017-05-26 12:44:58 +02:00
57017c68fa
hacks for cross-domain safari
2017-05-26 12:42:12 +02:00
cf658c1b3a
backport live changes
2017-05-26 12:41:30 +02:00
df2b00122a
New drive structure without file names
2017-05-24 18:59:44 +02:00
d9f7470f06
copy user details into sessionStorage for safari
2017-05-24 18:28:16 +02:00
fd83ae3e61
implement createRandomInteger
2017-05-24 11:34:40 +02:00
dc80b6b11f
throttle markdown preview
2017-05-24 11:27:16 +02:00
e6c04ccb49
bump server after paying for an account
2017-05-23 16:11:07 +02:00
6324d9bbb0
feedback on template feature usage
2017-05-23 14:54:40 +02:00
c3437382fb
Fix the release version in the what's new popup
2017-05-23 11:22:32 +02:00
4fae1b16c2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-22 18:43:14 +02:00
70cae0d2c3
safely access pin reset response
2017-05-22 18:43:06 +02:00
d55b7e411c
Display an alert in the drive when the limit is reached
2017-05-22 17:56:27 +02:00
71dc0af6c7
better test for success error codes
2017-05-22 14:37:57 +02:00
9c00a730f2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-22 10:41:55 +02:00
538aec6ef5
Display a message when pinPads returns an error
2017-05-22 10:41:47 +02:00
ba5ef5157e
show pretty representations of storage usage
2017-05-19 18:37:31 +02:00
e78299aed6
use async file decryption, listen for progress events.
2017-05-19 11:46:47 +02:00
ef155d8ccf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-19 09:13:38 +02:00
d014fccfce
Fix lint error
2017-05-18 18:52:14 +02:00
2082b328b4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-18 18:51:21 +02:00
814c81fb13
Display an alert when CryptPad has a new version
2017-05-18 18:51:08 +02:00
34606ea8ba
use newest xwiki media-tag
2017-05-18 18:24:24 +02:00
2cee9534c5
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-18 17:58:33 +02:00
164342920e
fix inverted condition
2017-05-18 15:39:24 +02:00
620f4dc512
Add translations for the markdown preview button title
2017-05-18 15:05:37 +02:00
51bd41d4e8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-18 14:57:12 +02:00
0bd4caeb7e
Add the task list code to the markdown renderer
2017-05-18 14:57:04 +02:00
d187945e94
jshint compliance
2017-05-18 14:55:16 +02:00
2b60b81a68
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-18 14:27:10 +02:00
d13dde856a
Add the markdown renderer file and change code's default content
2017-05-18 14:26:56 +02:00
73ec91aa5e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-18 12:46:36 +02:00
7befaccd88
move more rpc calls into pinpad
2017-05-18 12:36:12 +02:00
56bcdff890
Add a preview of the markdown content in the code editor
2017-05-18 12:16:26 +02:00
b72415b56b
Fix old hashes not working with the new parser
2017-05-18 10:13:08 +02:00
6b7aeb9121
Fix the text example
2017-05-17 15:48:09 +02:00
fe0f21594a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-16 14:41:51 +02:00
953e7155f0
Send only the hostname to the accounts server
2017-05-16 14:41:40 +02:00
afef456b18
fix undefined reference
2017-05-16 14:15:42 +02:00
1a7c4d5ebe
Store the FS_hash in the user object after the merge
2017-05-16 11:25:37 +02:00
87fa28180a
Display an upgrade button in the settings page
2017-05-16 10:34:50 +02:00
c1b43db363
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-15 18:21:25 +02:00
1542aa96bc
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-15 18:17:56 +02:00
dc2cdb7c08
Add the usage bar in the settings page
2017-05-15 18:16:22 +02:00
2dd04f7631
get limits from the server
2017-05-15 18:03:12 +02:00
8172f117a7
Fix Hash.alert not a function
2017-05-15 14:21:15 +02:00
0e58859393
Fix lint error
2017-05-15 13:55:40 +02:00
771348720b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-15 13:54:25 +02:00
57979f6314
Display the public key using a href in the settings page
2017-05-15 13:53:43 +02:00
a9b670fdf5
don't parse trailing slash as part of encryption key in old hashes
2017-05-15 11:17:46 +02:00
06f3d0eefe
shim isArray if not exists. correctly report how often this occurs
2017-05-15 10:26:52 +02:00
50d9f72b3a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-12 18:06:37 +02:00
601226115b
New anonymous drive
2017-05-12 18:06:29 +02:00
30f6ef3f85
handle more response codes, use metadata
2017-05-12 17:34:29 +02:00
18d959ef16
handle non-200 status codes
2017-05-12 17:07:30 +02:00
ed95bbb08f
Fix lint errors
2017-05-12 16:43:01 +02:00
89a993be3c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-12 16:33:56 +02:00
0f13198119
Move the parseHash code into parsePadUrl
2017-05-12 16:33:45 +02:00
42f3a62cac
handle errors with XHR
2017-05-12 16:13:09 +02:00
6c68b5e6ca
use new media-tag, listen for decryption events
2017-05-12 15:42:01 +02:00
7dd5907ff0
Merge branch 'limit' into staging
2017-05-12 14:21:46 +02:00
a993ab6616
use new encrypted file encoding in media-tag
2017-05-12 11:25:07 +02:00
8c49150725
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-12 10:54:32 +02:00
e0293a1162
Merge branch 'master' into staging
2017-05-11 18:26:09 +02:00
57ee7de7d4
Update and return the storage limit
2017-05-11 16:12:44 +02:00
371edff943
Fix an error when moving unsorted files to root in the drive
2017-05-11 14:24:16 +02:00
b76dcba1d6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-11 12:43:49 +02:00
6d30d7f89f
strip junk bytes from base64 more safely
2017-05-10 18:15:33 +02:00
8f5989b6b0
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-10 17:05:13 +02:00
cf81b02096
Make sure the spinner is always centered in the loading screen
2017-05-10 16:11:41 +02:00
5c8586f8a3
Fix typo in file upload
2017-05-10 15:00:05 +02:00
96ccb94397
Add the share button when a file upload is complete
2017-05-10 14:44:01 +02:00
c00158d23a
Move code to common-history
2017-05-10 13:39:14 +02:00
922e7803e9
remove extraneous slashes from hashes when parsing
2017-05-10 11:54:05 +02:00
a338b23f40
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-09 18:36:27 +02:00
df47b913e3
fetch array buffers in cryptpad-common
2017-05-09 18:36:18 +02:00
ff16084719
Fix lint errors
2017-05-09 18:10:02 +02:00
50c8a859e6
Move the CodeMirror cursor code to common-codemirror
2017-05-09 17:57:27 +02:00
9eb8e55cf6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-09 17:48:07 +02:00
c79a6e3b2b
Move Metadata, CodeMirror and title functions in separate files
2017-05-09 17:47:47 +02:00
63710e1ccc
Move the code related to the title in another file
2017-05-09 14:32:41 +02:00
ce5cdce917
Fix an issue where the username was lost on websocket reconnect
2017-05-09 14:31:28 +02:00
42dcfb9661
unceremoniously kick web clients when you 'log out everywhere'
2017-05-05 18:25:55 +02:00
9206d89531
Fix lint errors
2017-05-05 17:58:32 +02:00
bbc08bbcfd
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-05 17:57:05 +02:00
5a883d5a57
Use the new toolbar and move the userlist code in a separate file
2017-05-05 17:56:49 +02:00
6847906ac9
Move the userlist code in a separate file
2017-05-05 15:47:46 +02:00
3a338e0890
fix undefined reference
2017-05-05 15:20:41 +02:00
a173e4c7a0
add 'log out everywhere' functionality in settings
2017-05-05 15:09:07 +02:00
5a5b02b82b
Don't store in the drive pads without a hash
2017-05-05 11:55:19 +02:00
3e118c6a38
allow instance-wide custom salt for login
2017-05-05 09:10:31 +02:00
706120ae5b
Display images uploaded in the File app with the Media app
2017-05-04 18:24:58 +02:00
28cb40d7ee
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-04 17:14:30 +02:00
1b6fae4dd2
Update mediatag
2017-05-04 17:14:24 +02:00
a0c420af8e
jshint compliance
2017-05-04 16:37:25 +02:00
1864dac84f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-04 16:16:16 +02:00
78b11584f8
remove unused variables
2017-05-04 16:16:09 +02:00
4335b050af
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-04 16:08:21 +02:00
a190c99426
Toolbar refactoring
2017-05-04 16:08:12 +02:00
7573b86946
call back with error if an RPC is made while disconnected
2017-05-04 11:36:24 +02:00
410a9dfb17
temporary solution for testing pin limits
2017-05-04 11:20:52 +02:00
ef89451a83
Display the storage limit in the drive
2017-05-02 17:14:53 +02:00
f2672d587a
fix variable redefinition
2017-05-02 09:42:51 +02:00
0e7eeb285c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-29 14:24:14 +02:00
f414d480a9
Add the history mode to the CryptDrive
2017-04-28 18:23:41 +02:00
cf4dee28f7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-28 17:13:18 +02:00
28e4ef1b13
WIP RPC code
2017-04-28 17:11:50 +02:00
afb0061d7b
Fix an issue with anonymous user unable to store new pads
2017-04-28 17:11:07 +02:00
56aaeea003
Fix the drive toolbar not displaying the displayName
2017-04-28 17:03:47 +02:00
3fa0a73025
prevent using string methods on undefined variable
2017-04-28 16:09:46 +02:00
1b3ce5aa96
fix typo
2017-04-28 16:08:47 +02:00
a51a35da70
Fix an issue with hashes ending with a slash
2017-04-28 15:47:31 +02:00
ef58120819
Prevent multiple concurrent clicks to get the history
2017-04-28 14:09:59 +02:00
16f6ab813c
Make it clear that the number is the history represents a version
2017-04-28 13:06:55 +02:00
c820b3485c
Fix function undefined when loading a template
2017-04-28 12:16:45 +02:00
0ef1c14d7f
Fix lint errors
2017-04-28 12:12:17 +02:00
fc760b4820
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-28 12:08:21 +02:00
a165332c15
Don't store a pad in the drive if the limit has been reached
2017-04-28 12:08:05 +02:00
e51c7f9cf0
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-28 11:46:24 +02:00
bf7c7c45d0
Add the storage limit warning in the toolbar
2017-04-27 18:46:46 +02:00
aedc46bdaf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-27 12:47:27 +02:00
a97e7223f1
implement getBlobPathFromHex
2017-04-27 12:47:21 +02:00
520dabe094
Remove the unsorted files category
2017-04-26 18:46:40 +02:00
f50aa5c29b
Move the mediatag viewer into a media app
2017-04-26 14:55:06 +02:00
6a8274518b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-25 18:42:33 +02:00
9882a3a923
Add support for the file applicaiton in the drive
2017-04-25 18:42:21 +02:00
12898b3358
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-25 18:28:48 +02:00
74bcec8b31
programming is hard okay
2017-04-25 18:28:39 +02:00
2a417ddae8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-25 17:22:07 +02:00
d985b144cc
Add a new hash version for the file viewer
2017-04-25 17:19:13 +02:00
3309087277
send feedback if isArray is not supported
2017-04-25 17:09:39 +02:00
5194677443
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-25 14:57:34 +02:00
c9c7d61ad1
Media tag viewer
2017-04-25 14:55:38 +02:00
729d1460b9
Merge branch 'master' into staging
2017-04-25 14:35:24 +02:00
a840fb9e85
add example hashes and start working on hash v2
2017-04-25 14:33:57 +02:00
d1fa68e30d
build UCF Media Tag
2017-04-24 17:13:32 +02:00
fdd51ec18d
Don't remove a folder moved into unsorted or into itself
2017-04-24 15:38:03 +02:00
4fdc5f897e
only feedback migration if user had legacy store
2017-04-24 14:26:55 +02:00
218f2ff76c
feedback when logging in or registering
2017-04-24 14:15:17 +02:00
4c3e842664
Fix focus issues with the history input in ckeditor
2017-04-24 13:55:03 +02:00
f7e96b4e8c
resolve merge conflicts and jquery errors
2017-04-24 13:43:18 +02:00
5fc2e4cf71
Remove the toolbar in ckeditor history mode + history configurable
2017-04-24 11:41:00 +02:00
18e2e66b06
jshint compliance
2017-04-24 11:39:39 +02:00
92ea03d7d9
View and restore the history of a pad
2017-04-21 17:31:47 +02:00
4c0d7bf8e8
support multiple calls to cryptpad.ready
2017-04-21 16:51:32 +02:00
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
c51073f211
support batch getFileSize calls
2017-04-21 14:51:20 +02:00
3afaf029cb
feedback about how often we migrate an old drive
2017-04-20 17:06:09 +02:00
e8b053e48b
use bootloader in feedback.html
2017-04-18 17:31:35 +02:00
347459781c
show the size of your files, if you're logged in
2017-04-18 15:49:04 +02:00
2b8579e8b7
add pretty-printers for byte-counts
2017-04-18 15:44:15 +02:00
2a25afae5f
Merge branch 'soon' into staging
2017-04-18 12:24:45 +02:00
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
da69c1822c
ask users to sign back if signing keys are missing
2017-04-18 11:58:41 +02:00
821c1a3ec6
annotate code which we hope to be able to deprecate in the future
2017-04-14 18:44:08 +02:00
43c045721c
Get the channel history
2017-04-14 18:36:36 +02:00
a27cc76fc0
uppercase LOL
2017-04-14 15:35:02 +02:00
402ce2db93
better validation of inputs
2017-04-14 15:34:22 +02:00
c7eae9675b
keep exporting isArray for backwards compatibility
...
but prevent internal use
2017-04-14 15:34:05 +02:00
fbebbf0dca
minor clean up
2017-04-14 15:32:12 +02:00
525d35c9ec
redefine alert
2017-04-14 14:54:43 +02:00
f694a81a5c
move more interface code out of cryptpad-common
2017-04-14 12:25:32 +02:00
a4157b9908
remove more unused functions
2017-04-14 12:14:10 +02:00
e10901edb2
begin to move interface code out of cryptpad-common
2017-04-14 12:09:00 +02:00
95789d3cbe
expose rpc for pinned usage
2017-04-14 11:41:51 +02:00
8f4dbcf4c6
remove getPadTitle
2017-04-14 11:41:18 +02:00
f42da4ecd8
move hashChannelList into common-hash.js
2017-04-14 11:40:28 +02:00
63960bd38c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-13 19:47:04 +02:00
520ae822fc
correct undefined reference
2017-04-13 19:46:52 +02:00
633d60ccd0
Remove a TODO
2017-04-13 17:19:32 +02:00
81d83897ec
Rename hash.js
2017-04-13 17:04:15 +02:00
07705cd5c1
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-13 15:04:23 +02:00
eb2a3c1bbf
Fix lint errors
2017-04-13 15:04:17 +02:00
607d9652f5
jshint compliance
2017-04-13 14:48:15 +02:00
3ba90332bb
Merge branch 'refactor' into staging
2017-04-13 14:44:55 +02:00
daabb0b3ad
Integrate and fix the new fileObject (userObject)
2017-04-13 14:06:40 +02:00
df4a250359
use feedback api instead of app=
2017-04-13 12:18:08 +02:00
86c37bfa37
fix find+replace error
2017-04-13 11:11:45 +02:00
e618483395
extract all code for encoding and decoding hashes
2017-04-13 11:05:28 +02:00
fdd2716ad5
move constants to the top of cryptpad-common.js
2017-04-13 10:31:08 +02:00
c1e0316d43
Refactor fileObject
2017-04-12 18:54:22 +02:00
5212539a16
move standalone functions from common into their own file
2017-04-12 17:54:44 +02:00
7437d6b902
remove unused function
2017-04-12 17:09:42 +02:00
4e590a9dd1
remove even more dead code
2017-04-12 16:16:58 +02:00
85fcaa9bbc
remove more dead code
2017-04-12 16:13:25 +02:00
401936a91e
move singly-used css file out of /common/
2017-04-12 16:09:05 +02:00
7a59183bb1
pinpad.create should always be async
2017-04-12 16:02:42 +02:00
8de3610532
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-12 16:02:09 +02:00
9aa0548b1f
remove dead cursor code
2017-04-12 15:59:30 +02:00
4e61b79f9a
Clean fileObject
2017-04-11 15:11:33 +02:00
cde724399c
Pin the pads
2017-04-11 14:53:44 +02:00
2c8d1b8183
jshint compliance
2017-04-10 19:12:22 +02:00
05a50b1f4c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-10 17:42:43 +02:00
a14bb1480a
progress for implicit pinning
2017-04-10 17:42:35 +02:00
f82278a25c
handle return of undefined hash
2017-04-10 17:38:25 +02:00
1d933be5a6
make reset return the hash, not an array with containing it
2017-04-10 15:57:38 +02:00
f34492be94
Remove duplicates uid in the user list
2017-04-10 15:27:01 +02:00
cfc5d634f4
Merge branch 'templates' into staging
2017-04-10 14:19:48 +02:00
bd16e0f0e7
Templates in polls and canvas, and ability to disable templates
2017-04-10 14:19:15 +02:00
84d8615cf1
Save and use templates in pad, code and slides
2017-04-07 18:20:03 +02:00
bd2034c47b
prepare rpc before 'ready' if pinning is enabled
2017-04-07 17:24:25 +02:00
a70388284d
disable unnecessary messages
2017-04-07 17:21:04 +02:00
abd87e1322
jshint compliance
2017-04-07 16:33:14 +02:00
e4b15bc616
implement 'getCanonicalChannelList'
2017-04-07 15:52:34 +02:00
a2f692b9a3
clean up serverside and clientside pinning logic
2017-04-07 15:20:30 +02:00
fdede0d1fd
remove some dead code
2017-04-07 12:18:03 +02:00
e87992c7ec
implement atomic pin reset rpc
2017-04-07 11:37:19 +02:00
3380cf0348
implement getTotalSize rpc
2017-04-07 10:09:59 +02:00
5c292fb1fa
jshint compliance
2017-04-06 08:32:31 +02:00
64089c5f6b
implement pad pinning
2017-04-05 17:28:04 +02:00
13514dff63
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-05 15:00:10 +02:00
46a5eee597
Display the spinner in the toolbar for local changes
2017-04-05 14:57:07 +02:00
6c7cdc90a9
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-05 12:24:17 +02:00
212baeb3a6
better cookie schema. expire old sessions
2017-04-05 12:24:01 +02:00
54d271c4e7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-05 12:04:18 +02:00
a9777ce560
Fix input losing focus in polls with Chrome 57
2017-04-05 12:04:01 +02:00
3e47b8a38d
remove dead code
2017-04-05 10:42:24 +02:00
182dbfc874
implement pinning logic in pinpad.js
2017-04-04 12:13:31 +02:00
a5e5ddae08
rpc all the things
2017-04-03 19:24:57 +02:00
04069cc7f4
fix font size
2017-03-31 13:28:30 +02:00
6e9968f989
add 'lol' code theme
2017-03-31 09:19:45 +02:00
9b4b642d4a
protect against subtly corrupted user objects
2017-03-30 17:19:49 +02:00
d4ce3dc6b9
don't rewrite css rules. FOUC is too long
2017-03-29 16:02:04 +02:00
3cfd0a4326
commit some garbage
2017-03-29 15:40:34 +02:00
ed89a13fe6
progress on adding version string to some css
2017-03-29 12:55:36 +02:00
76990ac1b2
version toolbar.css for cache-busting
2017-03-29 11:56:03 +02:00
a0c17d7c9b
latest rpc code
2017-03-27 18:15:15 +02:00
59a80d5fde
remove silly TODO
2017-03-27 12:08:19 +02:00
a8ffac5dcd
Remove old code
2017-03-27 11:30:09 +02:00
fa9249ef29
don't notify for userlist changes if a user joins twice
2017-03-24 13:17:51 +01:00
40f5e1706f
add a unique id to user objects, define a getter
2017-03-24 12:17:49 +01:00
994d640f8b
Fix an issue causing the lag icon to lose its color
2017-03-21 14:52:49 +01:00
6fbd1f0028
Store the dates as number and not strings to avoid ot issues
2017-03-21 14:46:40 +01:00
51033ab70a
Remove useless links in the context menu and properties for readonly pads in the drive
2017-03-21 12:09:07 +01:00
7afde2309d
Add properties to the files not in the trash
2017-03-21 11:34:18 +01:00
b542245086
fix lint error
2017-03-20 18:11:26 +01:00
cc43bb8362
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-20 18:05:39 +01:00
98027dad27
jshint compliance
2017-03-20 18:02:11 +01:00
4a173e30dc
set user's cursor to either the beginning or end of the document
2017-03-20 17:51:56 +01:00
29174b2922
Update the lag icon
2017-03-20 16:39:33 +01:00
26edb77cf0
Fix style and usability issues in slides
2017-03-20 15:20:42 +01:00
d422c7e165
support old hashes in getUserChannelList
2017-03-16 17:14:54 +01:00
5ed6223313
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-16 14:47:03 +01:00
c9c9dd0999
use userChannelList if a list is not supplied to pinpad
2017-03-16 14:46:17 +01:00
e8c3cf6aa5
implement rpc message signing
2017-03-16 14:45:38 +01:00
d85a42c776
include User_hash in user channel list
2017-03-16 14:43:57 +01:00
7761aaa89f
Add search UI
2017-03-16 14:16:42 +01:00
c3c866fa2b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-15 18:59:53 +01:00
d19bbcb001
Add support for search in the drive
2017-03-15 18:59:55 +01:00
5eb32b33ee
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-15 18:59:38 +01:00
298725b3c2
don't show usage tips on error screens
2017-03-15 18:58:39 +01:00
0a6373852e
add signing keys to user object at login and register time
2017-03-15 18:57:13 +01:00
b9c64a526a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-15 17:15:03 +01:00
15e9af77bb
Remove the langauge selector from toolbar and add it in settings
2017-03-15 17:14:49 +01:00
8129b8cdc1
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-15 16:05:05 +01:00
15a67afc75
jshint compliance
2017-03-15 16:04:52 +01:00
13d7b3cadc
Merge branch 'd' into staging
2017-03-15 16:01:29 +01:00
7187d3c550
implement getUserChannelList
2017-03-15 15:55:55 +01:00
306f6ce806
resolve merge-conflict with accounting branch
2017-03-14 15:52:04 +01:00
f10149db1c
Make sure the tip is always visible when the loading screen is removed
2017-03-14 12:49:22 +01:00
71db08eac2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-14 12:40:25 +01:00
09afba80db
add support for logging in from register page
2017-03-14 12:39:50 +01:00
16e5788011
Call the callback if we can't parse the local Drive to import it
2017-03-14 12:09:52 +01:00
413d9a6f0b
add a style-callback to confirm
2017-03-14 12:01:42 +01:00
803e57c958
add more parameters to confirm dialogs
2017-03-13 19:30:56 +01:00
ceaf757680
Allow right click on the CryptPad logo/link in the top left corner
2017-03-13 18:49:30 +01:00
f2aa531f27
apply styles to confirm buttons if provided
2017-03-13 18:18:38 +01:00
df6298eeb6
apply styles to confirm buttons if provided
2017-03-13 18:18:17 +01:00
07a2d8e189
apply translations on feedback page
2017-03-13 12:56:49 +01:00
b7986ff6b1
Replace the spinner code with a font awesome spinner
2017-03-13 11:52:39 +01:00
d9996cc874
current work for pinning
2017-03-13 10:56:08 +01:00
b3cc8da315
implement basic clientside RPC infrastructure
...
and provide a basic example for testing it
2017-03-10 18:03:52 +01:00
81027b4200
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into accounting
2017-03-10 10:49:33 +01:00
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
404fa378e6
Move the store to the 'common' folder, it is not customizable anymore
2017-03-08 16:47:38 +01:00
0c1efd361b
Make sure the href is updated everywhere when importing a stronger link
2017-03-08 15:49:02 +01:00
b701e3cc85
Fix lint errors
2017-03-08 14:59:51 +01:00
4206382865
Fix the settings app to allow backup for unregistered users
2017-03-08 14:45:39 +01:00
f62267f8a1
Ability to import local pads in the user object
2017-03-07 18:39:21 +01:00
e2418a6be2
sketch of how pinning rpc will look
2017-03-07 17:33:31 +01:00
dc567fa7f3
signing keys are stored in hex so encode and decode them
2017-03-07 17:30:32 +01:00
9ad33574e9
Fix the function returning the pads list in the drive
2017-03-07 14:30:07 +01:00
d93a270336
Ability to display tips in the loading screen
2017-03-06 17:20:09 +01:00
77d09f64e1
Display anonymous users in the user list
2017-03-06 14:56:41 +01:00
cb88227e2b
Autocomplete on key press in some dropdown menus
2017-03-06 12:20:23 +01:00
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
ed9bcca96f
Close the websocket network when CryptGet/CryptPut is done
2017-03-03 12:48:00 +01:00
0bb10a8a0a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-02 17:59:35 +01:00
e1303a16da
add support for title attributes on dropdowns
2017-03-02 17:40:29 +01:00
52793385ea
Fix lint errors
2017-03-02 17:17:55 +01:00
01c4d7d4a7
Merge branch 'maybe' into staging
2017-03-02 17:09:06 +01:00
c884782d57
here are some changes
2017-03-02 17:08:50 +01:00
9a7c2dd5e2
Add a 'settings' link to the user menu in static pages
2017-03-02 16:38:22 +01:00
c5f983ecd7
Convert read-only link to editing link in the drive
2017-03-02 16:01:34 +01:00
a9afa24428
return empty string instead of blowing up when fixing HTML
2017-03-02 11:38:20 +01:00
8bdc8415ab
Find a pad in the drive
2017-03-02 10:15:13 +01:00
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
7db0e14bc0
add 'force' flag to override removal of html elements
2017-03-01 17:05:57 +01:00
cb5e01815c
validate all alertify strings by default. require 'force' argument to bypass
2017-03-01 15:07:34 +01:00
2c5c6da0d9
Fix XSS in alertify logs
2017-03-01 13:09:14 +01:00
5797aab3f2
Fix XSS with display names in the user list
2017-03-01 13:08:36 +01:00
26e3971482
Fix XSS in the user dropdown menu
2017-03-01 13:08:09 +01:00
5d39125004
Make onSettle Async Again
2017-02-28 13:12:04 +01:00
4f4075ed6e
Make the settings app available to anonymous users
2017-02-28 11:23:50 +01:00
12aec60a12
hack around onSettle not doing its job
2017-02-28 11:05:59 +01:00
1a259bb3aa
check if user has disallowed feedback api
2017-02-27 20:02:54 +01:00
498f4065cf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-27 14:29:55 +01:00
66dc166936
Make sure the realtime is synced with onSettle when using cryptget
2017-02-27 14:28:12 +01:00
de5a21fe57
add a simple feedback api and text explaining what it is
2017-02-27 12:06:49 +01:00
88b29e8bdd
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-24 18:55:48 +01:00
5303e76ece
Make sure the content is correctly applied in onReady
2017-02-24 18:55:41 +01:00
cc829d51f8
jshint compliance
2017-02-24 18:23:43 +01:00
42b6cca18d
Fix new pad not working
2017-02-24 16:55:43 +01:00
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
e15a6a347f
Fix the forget pad button
2017-02-24 15:22:26 +01:00
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
ba0b314f5e
Fix the 'new' button in drive which was broken in non root categories
2017-02-23 18:15:44 +01:00
0ce17ebbad
CryptDrive usability improvements (new file in drive + context menu)
2017-02-22 12:25:29 +01:00
7e77c6828a
more correct pluralization
2017-02-21 18:55:48 +01:00
c72bbd4c37
Use the file name as initial title
2017-02-21 17:42:58 +01:00
47b8fefd9e
Load messages.js only once, in cryptpad-common
2017-02-21 14:16:23 +01:00
11d9c9e813
Merge branch 'master' into staging
2017-02-21 10:44:03 +01:00
2103f0afa8
Merge branch 'master' of github.com:xwiki-labs/cryptpad
2017-02-21 10:42:35 +01:00
0bdf59c1dd
Fix broken link in the 'New' button on cryptpad.fr
2017-02-21 10:42:06 +01:00
d81d17b86c
Remove old translations keys no longer used
2017-02-17 17:39:27 +01:00
239e2bcc1f
Fix issue with null entries in Cryptpad_RECENTPADS
2017-02-17 15:18:09 +01:00
1540ae3f6f
Fix issue with null entries in Cryptpad_RECENTPADS
2017-02-17 15:16:30 +01:00
94417d9a8b
jshint compliance
2017-02-17 14:28:18 +01:00
c9b8889380
add cache-busting to chainpad-crypto
2017-02-17 11:26:43 +01:00
09fade6127
add cache-busting to chainpad-crypto
2017-02-17 11:25:35 +01:00
2daa9f8658
Link to main page was opened in the inner iframe
2017-02-17 10:57:56 +01:00
deda40375a
Use the new onSettle from chainpad to determine if the realtime is synced
2017-02-17 10:31:07 +01:00
92d50ded64
Merge branch 'soon' into staging
2017-02-16 16:48:12 +01:00
97762f9f9a
Make sure all the elements in RECENTPADS are non-null objects
2017-02-16 16:07:43 +01:00
e4dbe97d71
Update display name in realtime across tabs and remember 'anonymous' name
2017-02-16 15:35:03 +01:00
7762ffcbff
Ability to use Ctrl+click on the cryptpad logo in apps
2017-02-15 18:31:36 +01:00
7497e0d1c5
Add a dropdown user menu to the top bar in static pages
2017-02-15 17:57:42 +01:00
7758d056fa
Ability to import/export a user realtime object
2017-02-15 12:40:28 +01:00
cd9cea8fa4
Create a settings app to manage user objects
2017-02-14 19:04:57 +01:00
71b84afdb2
Redirect to the pad when logging in or signing up from a pad
2017-02-14 11:29:08 +01:00
92050eb04f
Fix the trash button in toolbar not always working
2017-02-14 10:56:38 +01:00
aae3fba284
Fix the storage when the hash is invalid
2017-02-13 17:54:01 +01:00
b1b294aade
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-13 11:10:40 +01:00
3aa03225c9
Add a spinner when hashing the password and translate homepage
2017-02-13 11:09:30 +01:00
fbcf4ccec4
force usernames to be lowercase
2017-02-13 11:01:30 +01:00
5614bea271
redirect users to login and register from toolbar
2017-02-13 10:51:54 +01:00
f723585758
add api to check whether the realtime has synced with the server
2017-02-13 10:42:17 +01:00
d0edf75c89
signup link directs users to register page, not user
2017-02-10 16:48:28 +01:00
1232aa8a79
jshint compliance
2017-02-10 14:25:02 +01:00
8eec7ec7c8
Fix typo
2017-02-10 11:00:34 +01:00
f92ba193c3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-09 17:16:03 +01:00
e100110741
implement log in as an api
2017-02-09 16:31:57 +01:00
f8366e0cfc
Remove support for legacy store and add a way to import legacy pads
2017-02-09 15:23:09 +01:00
67d881b2cf
Remove the drive entry from the user menu if already in drive
2017-02-08 16:25:52 +01:00
914c442615
Do not redirect to home page when logging out from another tab
2017-02-08 12:54:07 +01:00
702798f65a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-07 18:47:24 +01:00
1e2cc6bea4
Fix race condition with the iframe store
2017-02-07 18:47:10 +01:00
6e97082ff9
remove dead code from login function
2017-02-07 17:27:36 +01:00
8a1acc3c37
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-07 10:40:03 +01:00
6f07a3b7b4
erase lingering sessionStorage values when logging out
2017-02-07 10:39:42 +01:00
ac79fbb5a2
Improve mobile support for the toolbar and the drive
2017-02-06 18:06:59 +01:00
9f1789b2d2
Fix creation of pads from non-root category in the drive
2017-02-06 14:47:37 +01:00
ad82a275bc
Replace the Apps button by a New button again
2017-02-06 11:39:04 +01:00
fd33ffd56f
Fix issue creating a patch everytime the user clicked in an app
2017-02-06 11:12:08 +01:00
87abfac5e0
Fix lint error
2017-02-03 16:53:47 +01:00
02439e0f61
Improve the homepage with new images and translations
2017-02-03 16:03:36 +01:00
2c6b4b9c6a
Hide disabled applications from the context menu in drive
2017-02-02 18:40:39 +01:00
91299f5f30
Ability to access the drive from any pad
2017-02-02 18:22:59 +01:00
b0fb56fa63
Allow logge din users to access the home page
2017-02-02 18:09:27 +01:00
65054119cf
Fix a bug preventing reconnection in drive
2017-02-01 17:21:54 +01:00
757ae7a3ad
Fix a cross origin frame issue with dropdowns
2017-02-01 12:19:54 +01:00
39c85ca3f7
Fix race condition causing missing translations in homepage
2017-01-31 12:01:33 +01:00
5e69b78334
Remove the domain from the href in store
2017-01-30 18:52:27 +01:00
58d8a30b5b
Redirect to the main page when logging out
2017-01-30 15:26:32 +01:00
5ef074370b
Name a place before creating it in the drive
2017-01-27 17:51:08 +01:00
0e9e0e545f
Load the new pad when the hash is changed
2017-01-27 14:57:45 +01:00
e41cbb92d8
Use default FILES_DATA name if not provided
2017-01-26 16:52:23 +01:00
c44f3a1044
Delete multiple elements could also remove unselected ones
2017-01-26 16:18:43 +01:00
3f44444f41
Display the 'New' button in the trash
2017-01-26 13:19:40 +01:00
11f0a9ae5f
Revert the changes adding anonymous pads
2017-01-25 15:35:40 +01:00
f42665ba49
Remove the unowned pads category
2017-01-25 14:27:06 +01:00
cb85ad3fdf
Merge branch 'newtoolbar' into ownedpads
2017-01-25 10:23:03 +01:00
373b07ed28
Fix lint errors
2017-01-25 10:21:31 +01:00
015e6fc262
Make sure we have the same hash in all the tabs when disconnecting
2017-01-24 18:17:23 +01:00
88021f2264
Anonymous pads fo anonymous users
2017-01-24 18:14:29 +01:00
9d275daebb
Backport changes for the login page from hpbs branch
2017-01-24 12:47:53 +01:00
99b8898e54
Apply new title when clicking on the page without pressing enter
2017-01-19 15:41:25 +01:00
88d5b4cc9c
Add a 'New pad' button in the toolbar
2017-01-18 11:00:46 +01:00
a9063e0459
Reload all tabs when the user logs in or out
2017-01-16 14:08:44 +01:00
efed1f5efe
Add handlers to login and logout buttons
2017-01-13 17:39:41 +01:00
767ba8b549
Select what we want to display in the toolbar
2017-01-13 17:14:44 +01:00
2afdc11327
Replace the username button by a dropdown menu
2017-01-13 17:11:12 +01:00
4adde0f0c0
Use the new dropdown for userlist and share
2017-01-13 15:05:00 +01:00
efffd4974f
Add createDropdown and createLanguageSelector in cryptpad-common
2017-01-12 18:28:38 +01:00
29c8f0bbef
Use a FontAwesome spinner to replace the old unaligned one
2017-01-12 17:05:16 +01:00
3f1e287811
Fix an issue causing a user object to be turned into a pad
2017-01-12 11:09:45 +01:00
569ea21705
Replace the language selector by our custom dropdown menu
2017-01-11 10:59:09 +01:00
26dd4ea11f
Fix lint errors
2017-01-10 15:33:21 +01:00
4278ac7637
Merge branch 'soon' into fileManager
2017-01-10 15:07:48 +01:00
2be5db9540
Ability to open files in readonly mode
...
Fix CSS issues
2017-01-10 15:04:02 +01:00
f74d0a46a4
Remove the alert when pressing del in 'all files'
2017-01-09 18:38:05 +01:00
1c3f1a15cd
make sure that /pad is resized after loading
2017-01-09 17:02:01 +01:00
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
d5561910d4
Move the file manager into /drive and add a toolbar
2017-01-06 18:26:41 +01:00
1e70af0c16
Use the same network for the apps and the file store
2017-01-06 13:52:53 +01:00
e56cc49f79
catch errors that popped up because of a cross-origin iframe
2017-01-05 14:14:26 +01:00
5cd714b18a
configure filestore usage via customize/application_config.js
2017-01-03 12:10:11 +01:00
91a806ab86
focus on OK button when we pop an alert
2016-12-29 17:10:59 +01:00
89e5830409
make alertify display time configurable
2016-12-28 17:13:00 +01:00
5e1d8292c5
guard against trying to parse special fragments
2016-12-26 14:23:17 +01:00
52a593c2c2
fix jshint complaints
2016-12-22 17:27:56 +01:00
53a4d4738a
really make sure you're logged out
2016-12-22 17:22:32 +01:00
5534da8abf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login
2016-12-22 16:54:51 +01:00
9b6c9e3891
Add support for templates in the file manager
2016-12-22 16:53:38 +01:00
29d406b7a9
implement cryptput
2016-12-22 16:00:13 +01:00
87abfff66b
Fix Flash Of Unstyled Content (fouc)
2016-12-21 18:33:21 +01:00
1682d23c1c
remove old user prototype
2016-12-21 18:06:05 +01:00
c359c27997
Use user object as default store in file manager
2016-12-20 17:27:45 +01:00
4aed585574
Fix style issues in the toolbar
2016-12-20 14:40:00 +01:00
bd6992da0a
create a random hash
2016-12-20 11:13:15 +01:00
2cd50498c2
add log(in|out) functions to common
2016-12-20 11:11:40 +01:00
7df460c766
implement createChannelId api
2016-12-19 14:55:39 +01:00
5a14db9f07
Merge branch 'test-filemanager' into login
2016-12-19 12:37:28 +01:00
303953a431
Merge branch 'soon' into login
2016-12-19 11:04:46 +01:00
6b9529b121
implement ajax-like functionality for zk docs
2016-12-19 10:59:18 +01:00
5bc7766f44
Use a consistent toolbar across all apps
2016-12-16 18:35:49 +01:00
2968488278
convert uint8 arrays to hex
2016-12-16 15:18:06 +01:00
8e6830d080
Fix file manager with a chosen hash
2016-12-12 18:24:45 +01:00
ee56f5608f
Fix the infinite spinner bug with the file manager store
2016-12-08 18:52:36 +01:00
43ccd11adc
Merge branch 'infiniteSpinner' into fileManagerMerge
2016-12-08 16:03:18 +01:00
05fd6c1563
Fix the infinite spinner problem
2016-12-08 16:01:46 +01:00
cb43eb9ca1
Merge branch 'newpoll' into fileManagerMerge
2016-12-07 16:59:43 +01:00
9b3719e0ae
Merge branch 'soon' into fileManagerMerge
2016-12-07 16:59:32 +01:00
6dff82ede2
Improve UI, scrollbar in the table, publish/admin buttons
2016-12-05 18:54:46 +01:00
90804ed9e0
Add usernames/userlist in the toolbar and fix publish button
2016-12-01 18:40:09 +01:00
5a5451d94c
Sort elements in the trash, add properties in the context menu, fix issue with Edge
2016-11-23 18:21:45 +01:00
a957b72598
Create a new pad from the file manager
2016-11-21 18:49:13 +01:00
d6e1215166
Refresh the directory if needed when the object has changed
2016-11-18 17:17:48 +01:00
118829617f
Use the FS store as default store
2016-11-17 18:27:55 +01:00
c2770a7a74
set correct hash even if browser does not implement replaceState
2016-11-07 15:03:17 +01:00
303c65f2c3
use replaceState if available, instead of setting the hash
2016-11-07 11:20:30 +01:00
2d5448458b
export messages
2016-11-03 12:45:11 +01:00
d512b113cd
address failure to parse url when hash is not present
2016-11-02 18:28:19 +01:00
ab1d3958ce
Add a pencil icon when hovering the title
2016-10-26 17:49:16 +02:00
6d1e06cca3
Add notifications when a user joins or leaves the channel
2016-10-26 15:02:30 +02:00
54a63267cd
Add a share button and merge the viewers and editors buttons
2016-10-25 18:34:23 +02:00
87d86384ac
Fix broken elements in the new toolbar
2016-10-25 17:29:13 +02:00
6351d1856f
Remove the top bar and move its content in the applications' toolbars
2016-10-25 15:22:35 +02:00
yflory