c127f0a5f6
Add a comment
2018-10-05 18:04:48 +02:00
7d3d3cf5ac
Distinguish between two anonymous users in the chat
2018-10-05 18:04:20 +02:00
90c905827d
Merge pull request #281 from ryanpcmcquen/patch-2
...
Typo fix: additionnal => additional
2018-10-05 10:22:03 -04:00
2a313a90e0
Don't rejoin a dropped channel on reconnect and leave chat channel
2018-10-04 11:08:23 -04:00
498703384f
Don't rejoin a dropped channel on reconnect and leave chat channel
2018-10-04 15:29:34 +02:00
2a86db2001
New Features page
2018-10-03 17:25:04 +02:00
5cbe2f7c0f
Fix tag autocomplete and Tags category in the drive
2018-10-03 15:22:13 +02:00
5d3d591228
Keep trying until the first tab is loaded
2018-10-02 18:14:06 +02:00
c59d744d78
Fix loading a tab while another one is initializing the worker
2018-10-02 17:49:39 +02:00
1d63419df8
update error handling, but leave the note to come back
2018-10-02 11:31:08 -04:00
c5c6dc8223
Enable browser notifications for messaging tools
2018-10-02 12:08:25 +02:00
1201f2dcc4
Fix small UI issue
2018-10-01 18:28:25 +02:00
9a6e6f6e15
Fix User menu and link to drive in anonymous shared folders
2018-10-01 18:24:08 +02:00
d78a00b5e1
Ese the correct document type in the text for the store corner popup
2018-10-01 17:35:19 +02:00
930677750c
Merge branch 'anonsf' into staging
2018-10-01 16:21:53 +02:00
dcabfb464d
Refresh shared folder on change for anon users
2018-10-01 15:42:29 +02:00
0a83840c9c
View a shared folder with an unregistered user
2018-10-01 15:17:27 +02:00
df442f9b1e
Typo fix: additionnal => additional
2018-09-28 20:16:41 -07:00
e1329b7d46
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-09-28 15:12:22 +02:00
17bc1ee703
Load shared folder when not logged in
2018-09-28 15:06:24 +02:00
0e04c4392c
Avoid timeout in accounts.cryptpad.fr caused by the auth app
2018-09-28 15:05:39 +02:00
e77f833652
come back to this error
2018-09-25 20:09:45 -04:00
ad4e36015b
Merge branch 'soon' into staging
2018-09-20 11:44:56 -04:00
91cff453f1
enable shared folders by default
2018-09-20 11:40:42 -04:00
673dc22159
Update messenger UI
2018-09-19 17:30:15 +02:00
0e9b30744b
Add support for less highlighting
2018-09-19 17:06:39 +02:00
6b4643a916
Add syntax highlighting in code blocks rendered from markdown
2018-09-19 16:51:53 +02:00
cb87f49b1f
Merge pull request #271 from Nordgedanken/fix-#254
...
[WIP] Partially Fix #254
2018-09-19 09:09:55 -04:00
248b87a1e1
Enable chat in the poll app
2018-09-18 16:36:29 +02:00
9db9b132b6
Use framework outer in the whiteboard app
2018-09-18 15:49:42 +02:00
8243927352
Fix an issue preventing shared folders from being moved in the drive
2018-09-18 15:43:42 +02:00
35977a7ef0
Color consistency in kanban
2018-09-18 14:56:06 +02:00
7deb346552
update to new marked lib without breaking custom renderers
2018-09-17 15:35:53 -04:00
4025022352
Fix contextual chat notifications
2018-09-17 18:45:00 +02:00
e75b9ea168
Prevent shared folders from being dropped to the trash
2018-09-17 18:09:26 +02:00
874156ccf0
Prevent shared folders from being moved to the trash using the del key
2018-09-17 17:53:18 +02:00
bd1b120ab1
Add feedback about crowdfunding
2018-09-17 16:02:52 +02:00
f662036817
Change the hash in the address bar when browsing a shared folder
2018-09-17 15:10:10 +02:00
38daf4676c
Add text in the drive's share button for consistency
2018-09-17 14:52:46 +02:00
7a93927068
Fix UI issues with the new pad modals
2018-09-17 14:39:52 +02:00
179df27e3c
Fix autostore not displaying the error message when over pin limit
2018-09-17 11:23:35 +02:00
c1ef8243a1
Ability to select multiple files to upload ( #275 )
2018-09-17 10:31:27 +02:00
747c7ffdc3
Improve UI for contextual chat and add warning message
2018-09-14 17:30:12 +02:00
6c27d2964c
Disable friends chat in pad messenger
2018-09-14 15:42:41 +02:00
1895d6cbd8
Disable crowdfunding message for premium users
2018-09-14 11:21:52 +02:00
6257b23f16
Crowdfunding config
2018-09-14 10:36:29 +02:00
716159d300
Add OpenCollective links
2018-09-13 18:47:46 +02:00
8b384d6bb3
fix jscolor picker for new kanban items and fix the code according to CI
2018-09-13 16:20:42 +02:00
e7a1433a30
fix loading of the item color from saved state
2018-09-13 16:15:11 +02:00
2ef397a483
improve item color picker logic and UX
2018-09-13 16:08:27 +02:00
d2c1ed5eff
Implement reconnect function in the messenger
2018-09-13 15:44:48 +02:00
3c2417b479
fix more whitespace in jkanban.js
2018-09-13 14:46:41 +02:00
7e686a065e
Merge remote-tracking branch 'origin/fix-#254' into fix-#254
2018-09-13 14:40:12 +02:00
57ed2636ac
jkanban.js fix whitespace changes
2018-09-13 14:39:49 +02:00
1b2f47c0c0
Try a new status indicator in messaging
2018-09-13 11:49:01 +02:00
1cd1542d19
Update messaging info displayed before entering a room
2018-09-13 11:45:32 +02:00
10823fc124
Add toolbar notification when the messenger is closed
2018-09-12 15:07:50 +02:00
5276dc0bf6
lint compliance
2018-09-12 14:53:55 +02:00
621fc9a897
Ability to disable messenger at a global level
2018-09-12 14:51:37 +02:00
c38eb6588e
Fix small issues with the messenger
2018-09-12 11:55:26 +02:00
8b05b1acaf
Fix scrolling issue in pad when the userlist or the messenger was too big
2018-09-11 18:16:36 +02:00
42ffe0ee30
Fix initial history rules
2018-09-11 17:57:15 +02:00
6c6ce7b7a8
Fix messenger bugs
2018-09-11 17:42:00 +02:00
19da04664a
other typo
2018-09-11 17:17:59 +02:00
b62aa9224e
Fix typo
2018-09-11 17:11:13 +02:00
ac989a1e73
lint compliance
2018-09-11 16:48:44 +02:00
f3c36bfd57
Improve messenger initial history
2018-09-11 16:47:52 +02:00
26055e5e55
Messenger messages UI
2018-09-11 15:19:47 +02:00
40c7cdd7c8
Fix an issue with messenger while opening the same tab twice
2018-09-10 18:16:24 +02:00
216c94b1f0
Fix messenger notifications
2018-09-10 17:50:36 +02:00
382690e5c8
Don't open other pads' chat in the current pad's messenger
2018-09-10 17:43:19 +02:00
3acf202830
Test UI
2018-09-10 17:04:23 +02:00
56c30fc02e
lint compliance
2018-09-10 15:33:24 +02:00
8f6d0b1c3a
Merge branch 'staging' into chat
2018-09-10 15:32:39 +02:00
9eb4e2e0dc
Reorder the chat rooms in the list based on the time of the last message
2018-09-10 15:32:07 +02:00
cdce69e677
Improve messenger UI in apps
2018-09-10 13:20:01 +02:00
d4dd58e7df
Add a pad room when the messenger is active in a pad
2018-09-07 19:35:06 +02:00
9e27f111cb
lint compliance
2018-09-06 18:45:53 +02:00
e6743887fc
Refactor contacts/messenger so that it is usable directly in the apps
2018-09-06 18:41:22 +02:00
0e70961074
password-protected shared folders aren't urgent. dropping the XXX
2018-09-04 09:14:13 -04:00
5b6aa4ba0a
Reorder autostore options in Settings
2018-09-04 14:49:22 +02:00
2f3576f90e
Fix image preview not resized correctly in the mediatag dialog
2018-09-04 10:50:34 +02:00
ab07554d0b
Fix initial size of the image preview in the mediatag dialog
2018-09-04 10:45:18 +02:00
525703e7d8
Fix autostore popup displayed for dropped files
2018-09-04 10:36:19 +02:00
855612e98b
Make oo work with hashes v2
2018-09-03 11:20:32 +02:00
bf9cf95292
Merge branch 'staging' into oo2
2018-09-03 10:49:12 +02:00
ee1027ceb9
Ability to import mediatags to the drive
2018-08-31 15:41:08 +02:00
2bb7e68792
Remember previous values in the file upload modal
2018-08-30 12:14:37 +02:00
475301477f
Progress bar for loading a pad (framework only)
2018-08-30 12:07:21 +02:00
264f7dc6a1
Move base64 migration prompt to corner and only when the pad is stored
2018-08-30 11:21:33 +02:00
7b06626581
Merge branch 'autostore' into staging
2018-08-30 10:26:19 +02:00
90c96bfb70
Prompt users to migrate base64 images to mediatags in the pad app
2018-08-29 18:20:34 +02:00
b1f2d287b4
Add warning for chrome 68 users on Mac
2018-08-28 17:44:15 +02:00
886451393e
Merge branch 'master' into fix-#254
2018-08-28 17:11:20 +02:00
256b7b5bb4
Phantom viewers potential fix
2018-08-28 16:28:32 +02:00
0e1c525c30
Fix an issue with new shared folder added to drive from another session
2018-08-28 14:29:13 +02:00
d201e9a0cd
Disable some toolbar features not available if the pad is not stored
2018-08-28 12:12:47 +02:00
9ebb598467
Make automatic pad storage configurable
2018-08-28 11:42:48 +02:00
e8a5244362
Autostore base
2018-08-27 14:58:09 +02:00
5cd3cdc208
Don't handle drop events in the blockbase64 plugin
2018-08-27 14:57:16 +02:00
3f89dd9908
Disable pasting base64 images in ckeditor
2018-08-27 11:59:18 +02:00
aa2a01174f
lint compliance
2018-08-23 12:37:47 +02:00
a117e329dc
Add a Share entry in the drive's context menu
2018-08-23 12:34:44 +02:00
e0b7f3f965
When importing a shared folder to the drive, open this folder directly
2018-08-23 11:55:14 +02:00
630a2dab78
Fix context menu issues with shared folders in the tree
2018-08-23 11:09:28 +02:00
fddff11fae
Rename shared drive to shared folder
2018-08-22 17:01:44 +02:00
61659c1252
Fix template icon not overriden by a thumbnail in the PCS
2018-08-22 16:32:44 +02:00
ce08d7b650
Merge branch 'master' into soon
2018-08-22 15:34:06 +02:00
b084b892bd
Fix cache issues with workers in firefox
2018-08-22 15:26:42 +02:00
af40e140f9
safety net for call of undefined function in mergeDrive
2018-08-16 16:59:52 +02:00
2259d1b6ac
Merge branch 'soon' into staging
2018-08-16 13:33:09 +02:00
8a113d742e
Merge pull request #245 from xwiki-labs/issue-169-anchors-should-output-anchors
...
#169 : First anchor test and restore of the CKEditor anchor function.
2018-08-14 17:32:16 +02:00
fb9cf2c81e
lint compliance
2018-08-14 17:11:08 +02:00
0dc1500784
This should solve issue #169 : The test now completes with the insertion of a random anchor (menu-driven) and some text, the export is then checked to contain <a name="..." id="..."> as expected, then cleans up.
...
paul
2018-08-13 21:04:24 +02:00
88c43cfc5c
address a linter error
2018-08-07 11:45:22 +02:00
f5172fd05f
Merge branch 'soon' into staging
2018-08-07 11:40:50 +02:00
24c7ce57e1
apply the fix for password change recommended by @sairim
2018-08-07 11:40:21 +02:00
343e63f41b
Fix drag bug
2018-07-31 20:27:29 +02:00
1bf1253963
Add color picker to items
2018-07-31 20:08:06 +02:00
8df1dc19f2
Add Color picker for board title and let it have less space between boards. (Default colors are still working)
2018-07-31 19:27:13 +02:00
a65e083fca
Change PCS template icons
2018-07-28 11:38:22 +02:00
33fb48d59a
Update shared folder icon in the drive
2018-07-28 09:10:11 +02:00
9a6fa4cbe2
Create a copy when uploading an owned file in a shared folder
2018-07-28 08:58:16 +02:00
55715748cc
Fix typo in contacts app preventing new lines
2018-07-27 13:21:41 +02:00
20a9eee719
Disable shared folders creation by default
2018-07-20 18:41:14 +02:00
f2baaf5b5b
Fix shared folders issues including disappearing folders
2018-07-20 18:28:56 +02:00
4325ed4dde
Fix small UI issues in drive
2018-07-20 12:29:18 +02:00
bad1d7311a
Fix drive tests
2018-07-20 12:04:42 +02:00
8ab786e7df
Drive restore loading screen text
2018-07-19 18:49:14 +02:00
d816a2ed9f
Prevent timeout when restoring drive
2018-07-19 17:51:38 +02:00
2be78deb93
Fix Drive history
2018-07-19 17:07:14 +02:00
8b20b14184
Fix current path in toolbar reversing some names
2018-07-19 16:38:41 +02:00
c08951dd91
Press enter to create a shared folder when typing its name
2018-07-19 15:33:20 +02:00
8c20c7823e
Empty trash callback was missing
2018-07-19 15:32:45 +02:00
1e092f36ba
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-07-19 11:43:06 +02:00
a95cf85f20
Fix shared folder creation using the wrong icon
2018-07-19 10:57:31 +02:00
5527949c70
Make LessLoader flow properly, sorry about that
2018-07-18 16:22:44 +02:00
a181c09a68
Merge branch 'soon' into staging
2018-07-18 15:56:44 +02:00
c1eb6d6a01
Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon
2018-07-18 15:53:26 +02:00
e2600e4b36
display a loading screen while users are changing their passwords
2018-07-18 15:53:12 +02:00
f97685cc15
lint compliance
2018-07-18 15:12:07 +02:00
ef73cf89cd
Merge branch 'soon' into staging
2018-07-18 15:10:23 +02:00
8eccffd8e4
Don't remove migrated read-only pads
2018-07-18 14:56:49 +02:00
64b51f3a80
jshint compliance
2018-07-18 14:25:48 +02:00
ebfa2c2dc3
Merge branch 'less-less' into staging
2018-07-18 14:18:37 +02:00
aafcb1bc02
Merge branch 'sharedfolder' into staging
2018-07-18 14:18:30 +02:00
8d95efa144
Reference the relevant line in alertify.js
2018-07-18 13:22:27 +02:00
a57a8e51a1
Prevent alertify.js from overriding styles
2018-07-18 13:20:16 +02:00
e110f20397
support blocks on remote domains
2018-07-17 17:41:30 +02:00
e59aec0a45
Try...catch on testworker.js
2018-07-17 16:46:24 +02:00
3a7d1e5beb
Fix 'save to drive' icon displayed for anonymous users in whiteboard
2018-07-17 16:41:50 +02:00
08005a709e
Add a share icon in the drive when displaying a shared folder
2018-07-17 16:38:20 +02:00
1629d7bb1d
provide a SANE default in case httpUnsafeOrigin is not provided
2018-07-17 16:31:15 +02:00
bcbec0144c
provide a default in case httpUnsafeOrigin is not provided
2018-07-17 16:20:40 +02:00
6143bceabb
Fix XXX
2018-07-17 15:38:23 +02:00
a2fd32d6a3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-07-17 14:49:19 +02:00
e6d4bced18
clean up extraneous variables and log statements
2018-07-17 14:34:25 +02:00
b4c294565e
Hide shared folder creation links when inside a shared folder
2018-07-17 14:00:28 +02:00
ecb9f039b1
Fix pad password change not reloading with the correct URL
2018-07-17 12:27:23 +02:00
c9ac3c7c2b
Fix search in shared folders
2018-07-17 11:22:01 +02:00
fc91cf606b
Disable moveToTrash button for pads in shared folders
2018-07-16 18:05:23 +02:00
ed881840cd
remove XXX label from non-blocking feature
2018-07-16 17:08:16 +02:00
9c58dc216f
Remove option to move a shared folder to the trash
2018-07-16 16:17:34 +02:00
2c22232a47
check if a user is logged in strictly by User_hash
2018-07-16 15:45:45 +02:00
848a918eda
remove out of date comments
2018-07-16 15:45:19 +02:00
668b7425a8
Make sure we won't move pads from a shared folder to the trash
2018-07-16 15:39:34 +02:00
5b48eff78c
Remove owned pads deleted from the server in shared folders
2018-07-16 14:05:36 +02:00
b9c4aa43b5
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-07-16 11:25:11 +02:00
3d95e6088a
leave a FIXME note
2018-07-16 11:24:58 +02:00
792f7bcc64
show how long less takes to compile
2018-07-14 15:21:45 +02:00
6c49318ac7
Show how long it takes to parse less
2018-07-14 15:19:39 +02:00
0d5ac05866
refactoring of the less infrastructure
2018-07-14 15:15:23 +02:00
b5c2eb8a9c
Automatically refresh the drive when a change occurs in a shared folder
2018-07-13 19:24:49 +02:00
4706b8a9de
Store newly created pads in the correct (shared) folder
2018-07-13 15:01:23 +02:00
6a80f49fe0
Don't load expired or deleted shared folders
2018-07-13 14:47:53 +02:00
507e5b18e9
Remove all less includes where no mixin or variable is used after
2018-07-12 19:22:32 +02:00
a6d3dbf94f
Wrapped modal.less into a mixin which gets rid of the last file which emitted CSS
2018-07-12 19:13:04 +02:00
4a352f2ed8
Use import (reference) whenever the less file supposedly emits no CSS
2018-07-12 18:43:17 +02:00
7d89026d83
Fix more issues with shared folders
2018-07-12 17:27:16 +02:00
c5105d7b84
Merge branch 'check-for-css-variables' into staging
2018-07-12 17:16:21 +02:00
a440359bc7
Commit patches provided to me by someone who Seemed Trustworthy At The Time
...
(should fix false negatives in shared-worker detection)
2018-07-12 16:59:36 +02:00
cb8888ea1a
Yes, so it turns out that making a small asthetic change after testing on every browser does actually break it :|
2018-07-12 16:51:48 +02:00
fabdbc3b61
Add a feedback test for checking for CSS variables, so we won't use a feature which is not implemented by the vast majority of the people using CryptPad...
2018-07-12 16:02:46 +02:00
8516587ece
lint compliance
2018-07-11 15:28:34 +02:00
9787f5304a
Don't unpin channels that are still in another proxy
2018-07-11 15:28:24 +02:00
3fb6cb3d00
lint compliance
2018-07-11 11:35:44 +02:00
ca409e5eaa
support import/export in kanban
2018-07-11 10:50:42 +02:00
321c7d5512
Move pin/unpin outside of userObject
2018-07-10 18:23:16 +02:00
8574128efd
unstub password change function
2018-07-10 16:44:24 +02:00
25b0d764ed
pass initialState variable when copying your drive in the changeUserPassword function
...
because the hardest problems to debug are always fixed with one line changes
2018-07-10 16:42:11 +02:00
54bc29f28c
WIP maybe I missed something
2018-07-10 15:16:43 +02:00
66a494cbd2
temp
2018-07-10 15:10:07 +02:00
4b86ed2dec
Shared folders UI
2018-07-10 14:41:37 +02:00
0a9ea95796
always set userHash in localStorage even with modern users
2018-07-10 13:11:22 +02:00
bc7524c134
Fix tippy
2018-07-10 10:39:21 +02:00
6312dadb60
Fix shared folders names in the drive
2018-07-09 18:11:04 +02:00
ce7ebf0326
don't stop users from registering if they cancel out of a prompt
2018-07-09 15:31:20 +02:00
e0cc1a6eb6
Display a shared folder in the drive
2018-07-09 14:36:55 +02:00
a15e232469
complete modern user registration/login. general cleanup
2018-07-09 14:20:38 +02:00
d79064a4c5
Merge branch 'staging' into modern-users2
2018-07-06 11:37:50 +02:00
4ef2cfa88d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-07-06 11:37:00 +02:00
57a39258c3
WIP big commit
2018-07-06 11:36:48 +02:00
0c3b898000
simple one line fixes
2018-07-06 10:28:41 +02:00
0c9dfc1fb5
Add proxy manager inner
2018-07-05 16:33:46 +02:00
bd6a199dca
Add missing functions to the proxy manager
2018-07-05 13:56:16 +02:00
a25a72b5db
Add a proxy manager to handle operations between shared folders
2018-07-05 10:37:06 +02:00
66591a3654
Merge branch 'rohref' into sharedfolder
2018-07-02 14:12:06 +02:00
a3e0e765b5
derive block URI and URL in dedicated functions
2018-07-02 11:11:50 +02:00
a99e5a3aaa
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-07-02 11:03:58 +02:00
af5cc30381
Fix undefined function when calling error() in the drive
2018-07-02 11:02:43 +02:00
071c34d4fa
Fix undefined secret with password-protected files ( #250 )
2018-07-02 10:51:43 +02:00
27797c0520
Fix undefined secret with password-protected files ( #250 )
2018-07-02 10:50:30 +02:00
425ac8ea57
Migration for read-only links + fix issues with read-only pads
2018-06-29 18:16:04 +02:00
0f9a71686e
Add support for read-only href stored in filesData
2018-06-28 18:16:38 +02:00
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
cc6f3dc0e4
lint compliance
2018-06-28 15:25:22 +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
355dc5c993
Hide account password change form in settings
2018-06-25 11:13:02 +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
e03b9fe630
remove login-block dependency from settings
2018-06-22 11:46:08 +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
da35d94f73
don't require Block in /settings/
2018-06-22 10:58:46 +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
a5b207d57b
Password change UI
2018-06-20 10:02:56 +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
01a3c13a8c
Fix CSP issues for missing files (404)
2018-06-12 15:15:46 +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
38887eb088
Improve new media-tag
2018-06-07 11:52:04 +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
06818b798f
Add properties button to the file app to see owners and password
2018-05-30 18:48:29 +02:00
fe202a92b4
Fix UI issues in kanban
2018-05-30 15:15:50 +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
b377da1227
Highlight the selected line in polls
2018-05-28 11:22:48 +02:00
c7e08fedfb
Password-protected files
2018-05-25 18:00:10 +02:00
884f2b465d
Fix kanban creation
2018-05-25 11:49:47 +02:00
95218f0fa1
Remove use of space-evenly since it is not supported by all browsers
2018-05-24 16:09:33 +02:00
7800fa2dcd
Add confirm dialog when deleting a task in kanban + add colors
2018-05-23 17:13:41 +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
fe27c97879
Help + tooltips + fix colors in kanban
2018-05-23 14:24:23 +02:00
6b98fef679
Remove ES6 code in kanban
2018-05-23 12:01:03 +02:00
07502775f5
Add support for readonly and locked modes in kanban
2018-05-23 11:48:30 +02:00
f0512bbb1d
Fix UI and realtime issues with kanban
2018-05-22 18:24:40 +02:00
975fa3e4dd
Test small mediatag
2018-05-22 12:34:37 +02:00
ea9384d6d0
Fix kanban inputs blocked when remote change
2018-05-18 11:00:47 +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
d224a2c1a4
Update size of the Add button in kanban
2018-05-17 10:27:41 +02:00
77c456a20e
Disable console logging in kanban
2018-05-17 10:27:16 +02:00
73183a69fd
Improve kanban UI
2018-05-16 19:28:30 +02:00
86be9abb62
Translations for kanban
2018-05-16 16:45:16 +02:00
b6ebc583ba
Add the kanban app to the list
2018-05-16 16:30:37 +02:00
087e346685
Remove translatable text and blocking 'confirm' dialog from jkanban.js
2018-05-16 16:18:44 +02:00
0ab27427bc
Lint compliance
2018-05-16 12:22:43 +02:00
037050d16f
Merge branch 'coati' into kanban
2018-05-16 11:41:55 +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
34417b5e9f
Merge branch 'oo' of github.com:xwiki-labs/cryptpad into oo
2018-05-14 14:02:24 +02:00
372f1dfeb4
First anchor test and restore of the CKEditor anchor function.
2018-05-11 09:06:22 +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
4c747e013f
on second thought that was a bad idea
2018-05-03 18:46:45 +02:00
8ec9021f89
clear stuck tooltips in an interval
2018-05-03 18:45:19 +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
89fb718572
Merge branch 'soon'
2018-05-03 10:19:36 +02:00
b9a74c2119
hide visible effects of race condition, leave a note to remember to fix it
2018-05-03 10:19:14 +02:00
562f670921
hide visible effects of race condition, leave a note to remember to fix it
2018-05-03 10:18:36 +02:00
ac09ba65ce
strip both old and new style checkpoint labels before decrypting when fetching history
2018-05-02 14:39:06 +02:00
123612b893
Merge branch 'de-translation-pl' into staging
2018-05-02 11:09:22 +02:00
699a635746
add trailing slash when redirecting to drive
2018-04-30 11:47:53 +02:00
a66d33e5ca
Improve export for pads with mediatags
2018-04-30 11:40:41 +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
7384568f77
Lint compliance
2018-04-23 15:38:21 +02:00
9d30e48a44
Fix mediatag redrawn on content update
2018-04-23 15:35:55 +02:00
2d08924462
Fix CkEditor issues
2018-04-23 14:33:39 +02:00
cf549eeaef
Clean the code
2018-04-20 17:57:48 +02:00
41afc28802
Fix conflicts, clean the code, add migration from old mediatags
2018-04-20 17:49:40 +02:00
6a4f25bc9f
Test widget filters
2018-04-20 17:48:39 +02:00
fd89811479
Clean mediatag plugin
2018-04-19 18:29:10 +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
e1d59db30d
Fonts issues on Windows
2018-04-19 11:14:22 +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
a0d452bbd9
Use correct icons for the search results in the drive
2018-04-18 18:54:05 +02:00
1f3f4941b5
Redirect to drive anonymous users trying to create a profile
2018-04-18 18:53:36 +02:00
c190a38a6b
Fix UI issues
2018-04-18 14:19:45 +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
e2b9cf1c40
Fix small UI issues with the new colortheme
2018-04-16 15:46:19 +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
5747e1a492
Merge branch 'master' of https://github.com/xwiki-labs/cryptpad
2018-04-10 19:12:30 +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
31980bef82
Add a ghost icon in the anonymous drive
2018-04-03 15:16:21 +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
ee8651c74e
Kanban styles and color updating
2018-04-02 20:33:35 +02:00
035a56fdab
Kanban application using the cryptpad framework
2018-04-02 20:27:52 +02:00
4b83f2991a
Kanban prototype on cryptpad
2018-04-01 18:52:21 +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
ee46a4e862
remove some unnecessary checks for file-crypto and make encryption properly async
2018-03-26 18:30:52 +02:00
714c46fc2e
Use blob URL to load an OnlyOffice document
2018-03-26 16:42:09 +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
d0c38d31e4
Owned todo
2018-03-22 15:18:41 +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
4288f536f1
Use requireCSS to load FontAwesome
2018-03-21 18:31:53 +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
632e6c2e6c
Merge branch 'metadata' into staging
2018-03-20 15:36:25 +01:00
99712ec2f0
getMetadata RPC
2018-03-20 15:33:12 +01:00
01dd6953b9
Fix the previous fix...
2018-03-20 15:13:00 +01:00
c3f7b74baf
Fix CkEditor's toolbar initial state
2018-03-20 15:07:20 +01:00
44cd235f48
Fix CSS with Bootstrap 4
2018-03-20 11:05:43 +01:00
2704ee1ed7
Account deletion translations
2018-03-19 18:14:00 +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
c135893638
Improve UI for polls on mobiles
2018-03-16 18:14:21 +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
b3429c2d24
Merge branch 'creation' into soon
2018-03-14 17:08:54 +01:00
1dabc76bb9
Fix sframe-boot version
2018-03-14 17:03:50 +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
645e47bd72
Catch chainpad errors in polls
2018-03-13 15:10:33 +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
ca65e6e54a
Merge branch 'soon'
2018-03-09 10:07:38 +01:00
03ae9d5714
Merge branch 'soon'
2018-03-08 16:38:16 +01:00
2f262b12c6
Fix help box issues
2018-03-08 16:15:26 +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
95bbc3d130
Add the mediatag button back in the code app
2018-03-01 11:23:16 +01:00
ee3b926e84
Get rid of ckeditor's reset_all class...
2018-03-01 10:33:28 +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
dbe8ab014d
Select all in drive
2018-02-28 16:34:55 +01:00
f96a5003b0
empty spreadsheet file in test.bin
2018-02-28 13:56:33 +01:00
d975bb9cc0
Fix focus after pad creation screen
2018-02-28 13:16:30 +01:00
118ceef2f2
formatting and lint compliance
2018-02-28 11:58:35 +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
22f130d948
Remove lag when displaying loading screen in login and register
2018-02-26 10:41:37 +01:00
a697ad9762
Merge branch 'soon'
2018-02-22 17:05:58 +01:00
599afa4fc5
Merge branch 'soon' into staging
2018-02-22 15:57:08 +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
a0ec51dde5
Fix share modal with new pads
2018-02-22 12:43:06 +01:00
480b499d7b
Hack to remove onbeforeunload popup
2018-02-22 10:16:33 +01:00
7ede2e1a07
Fix cursor position when editing a task in todo
2018-02-20 18:43:25 +01:00
c34161a988
Update oocell config
2018-02-20 18:36:00 +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
5dbc99343a
Improve 'rename' input in the drive
2018-02-19 11:38:57 +01:00
b04e3def64
Fix invalid translation key
2018-02-19 11:26:43 +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
54a91f1153
Ability to reorder and edit tasks
2018-02-15 15:38:39 +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
ac527c6411
add a logout page
...
allows destroying user session with a minimum number of loaded dependenciesi.
Can be Used for SSO forwards (logout).
Co-authored-by: Nicolas PARQUET <nparquet@linagora.com>
2018-02-12 15:38:51 +01:00
3bb6d5a83c
Remove full history timeout
2018-02-09 15:47:29 +01:00
f8399eaaa6
avoid concatenating 'undefined' in drive interface
2018-02-08 11:08:10 +01:00
ff151869de
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-02-07 13:08:12 +01:00
7ebfa43408
Improve assert translations to detect issues in objects (tips, type, etc.)
2018-02-07 13:08:03 +01:00
d676a5e7db
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into keywords
2018-02-07 11:14:19 +01:00
bee5494abb
add some sanity checks to the todo app
2018-02-07 11:07:45 +01:00
5bba9b6c39
Refactor login to remove duplicate code
2018-02-06 18:45:12 +01:00
c2e9c60756
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-02-06 17:36:44 +01:00
4df4c48fbd
Improve UI for pad creation screen
2018-02-06 17:36:37 +01:00
8213d0d926
guard against null pointer exception
2018-02-05 15:24:30 +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
ad2cde4705
Add warning about anonymous drive in localStorage
2018-01-29 19:04:00 +01:00
bdafc101c9
Ability to remove owned channels from the drive
2018-01-29 15:17:53 +01:00
1c39e8b1bb
Fix worker app
2018-01-29 15:17:20 +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
74deb60f0f
Fix issues with the new context menu in drive
2018-01-26 16:34:36 +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
fd4ed3ce3b
Fix subscription button in settings
2018-01-25 12:14:46 +01:00
548a32090e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-01-25 12:09:36 +01:00
4d0312115a
Add a link to the account server for subscribers in settings
2018-01-25 12:09:20 +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
af2bde27c6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-01-22 16:56:55 +01:00
c90ba890ca
Add more configurable options and add a new way to use custom config
2018-01-22 16:56:37 +01:00
ffa392a7e2
Merge pull request #221 from ryanpcmcquen/patch-1
...
Fix Org mode regex.
2018-01-22 10:44:33 +01:00
2e436f16c9
Refactor context menu in drive
2018-01-19 17:03:58 +01:00
ff4a49d59b
Fix Org mode regex.
...
More details here: https://github.com/mickael-kerjean/nuage/pull/16
2018-01-18 08:32:37 -08: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
e791add4ec
Remove + icons from folders in the trash
2018-01-18 11:06:47 +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
3858aa976a
better warning in case of errors in /file/
2018-01-16 16:52:06 +01:00
4c49cd7592
Fix template picker not displayed anymore in framework
2018-01-16 14:39:56 +01:00
c77e4adf1e
Use local name instead of title in filepicker if it exists
2018-01-16 14:32:49 +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
f3d8fd3590
Ability to import local pads on login
2018-01-12 18:17:32 +01:00
47203c37f1
Remove console error caused by setTimeout called with undefined
2018-01-12 17:44:56 +01:00
a40315aff7
Remove ability to delete comments in polls for readonly users
2018-01-12 17:15:11 +01:00
85edc028ff
Remove logging about filepicker rpc
2018-01-12 17:10:55 +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
b01d00f74a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-01-12 09:50:17 +01:00
daef08a9b3
Add an advanced new pad modal
2018-01-12 09:50:11 +01:00
cd26a4c093
Added a test of /login/
2018-01-11 18:11:06 +01:00
e377d606be
Fix spinner style in the new settings category
2018-01-11 17:15:39 +01:00
69aee6c21b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-01-11 17:09:06 +01:00
378322a521
Don't finish the test until ChainPad settles, trying to eliminate a flicker
2018-01-11 17:08:47 +01:00
c460e2820e
Fix a 1px offset for the userlist in Firefox/Windows
2018-01-11 16:09:29 +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
4808c8b374
Fixed poll which was not working with automated testing
2018-01-11 15:57:09 +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
1fba82540a
remove example code from todo app
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
d74c2a0395
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2018-01-10 11:47:59 +01:00
e5b9f089fb
Fix undefined webchannel when uploading a file
2018-01-10 11:47:52 +01:00
864e24b2ce
Fixed typo in test
2018-01-10 11:42:48 +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
f329d65bc8
Ability to reduce the width of ckeditor
2017-12-22 18:01:15 +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
bc5554f5f6
Display an error when visiting the bounce app without href
2017-12-22 14:58:44 +01:00
2fd22c6db6
Fix task list in markdown when using one empty line between tasks
2017-12-22 14:56:01 +01:00
5e8b183ee6
Fix uncommited column in poll hidden in published mode
2017-12-22 14:42:37 +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
b0fe323a4c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-21 18:09:55 +01:00
c0b5dc7536
make loading screen tip presence configurable
2017-12-21 18:09:49 +01:00
a26031c119
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-21 17:38:28 +01:00
0e6e68aaff
Remove print prompt in slides since the browsers already have a prompt
2017-12-21 17:38:22 +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
f7d30318cc
Disable editable inputs in poll's read-only mode
2017-12-20 15:46:44 +01:00
edc236e17b
Disable edition in pad read-only mode
2017-12-20 12:15:43 +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
3177fd7857
hide whiteboard palette in view mode
2017-12-20 11:01:23 +01:00
37dcf7285a
Need to be exactly true, not just truthy
2017-12-19 19:16:53 +01:00
dc7dbb3e96
Accidentally made a test which hangs...
2017-12-19 19:09:48 +01:00
cbd7351d53
Improved logging if there's a non-empty-newdoc
2017-12-19 19:08:01 +01:00
d9323cc458
stubbed a failing test
2017-12-19 19:01:02 +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
f292407c6e
Fix present mode in the code app
2017-12-15 15:40:52 +01:00
50ddad5e41
Fix an issue with the tag prompt removing all keyup listeners
2017-12-15 15:33:53 +01:00
92a8e107d7
Use the correct hash when opening the todo app for the first time
2017-12-15 15:33:11 +01:00
bb548b3428
Merge branch 'staging' into better-testing
2017-12-15 10:29:28 +01:00
3188ea3f35
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-14 14:59:06 +01:00
6ac4fa4689
wip
2017-12-14 11:34:44 +01:00
a08cf8faa8
Allow drive to receive updates after leaving history mode
2017-12-14 09:44:20 +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
7b8321c263
make a test fail so we don't forget to fix the bug
2017-12-12 13:43:55 +01:00
a863011a0c
Fix profile in read-only mode
2017-12-12 12:14:32 +01:00
0d05d880ee
Fix the bounce app
2017-12-12 10:47:01 +01:00
b30efff5d1
Better way to check if we're using the safe origin in bounce
2017-12-12 10:44:20 +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
353b146644
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-12-11 12:21:17 +01:00
1922dbfd75
Creation page with mobile support
2017-12-11 12:19:44 +01:00
dd44b4da99
Removed old /less/ directory which is nolonger used :)
2017-12-08 14:56:13 +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
0080dd7624
Fix codemirror width with small screens in the code app
2017-12-07 17:28:05 +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
e397f66b56
lint compliance
2017-12-04 15:27:48 +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
b14228da18
Merge branch 'staging' into refactor
2017-12-01 17:04:03 +01:00
c59c6072f3
Remove jquery from outer
2017-12-01 16:05:23 +01:00
fc027ba00b
Test webworker app
2017-12-01 15:03:01 +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
7c8572c99d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-11-30 18:32:27 +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
d1277d7026
Merge branch 'staging' into refactor2
2017-11-30 17:25:23 +01:00
3f892e04a5
fix codemirror overflow css
2017-11-30 17:24:43 +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
96cf83af34
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-11-27 18:26:11 +01:00
385ac9607c
pass 'self' into common-util instead of using window
2017-11-27 18:26:04 +01:00
acd8ab7446
Add the markdown toolbar in profile
2017-11-27 18:10:37 +01:00
b0a384e8e0
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-11-27 17:55:48 +01:00
74e59a513a
Add the markdown toolbar to the slide and poll apps
2017-11-27 17:55:20 +01:00
22c5ff757b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-11-27 15:05:07 +01:00
650d26afea
use unified listmap in profile app
2017-11-27 15:04:59 +01:00
68d602f74a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-11-27 14:44:57 +01:00
644f6e9985
Use the bounce app to open links from inner
2017-11-27 14:44:44 +01:00
5eacc158d9
make tests pass again
2017-11-27 13:45:40 +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
444ba91287
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-11-27 12:17:46 +01:00
b0f553e9ea
Add a markdown toolbar to help with the markdown syntax
2017-11-27 12:17:35 +01:00
77c81f2426
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into merge-staging
2017-11-27 12:16:47 +01:00
4ff4ccd1d3
use faster and more correct 'find' implementation
2017-11-27 11:30:50 +01:00
e3f04ef076
Merge branch 'soon' into staging
2017-11-27 11:11:49 +01:00
71cf3a4ddf
fix creation of personal todo list
2017-11-27 11:09:28 +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
2e00214783
drop unreachable code
2017-11-23 16:57:01 +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
4b5abdecbe
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-11-23 12:29:32 +01:00
280a7c2765
Clean cryptpad-common
2017-11-23 12:28:49 +01:00
98c2b0c802
Merge branch 'soon' into staging
2017-11-22 17:38:49 +01:00
3ff0eb116b
don't let search interfere with renaming
2017-11-22 17:23:14 +01:00
eba1c9dfac
Add chainpad log to the debug app
2017-11-21 18:50:33 +01:00
a660c03f97
Fix scrollbar in the debug app
2017-11-21 17:42:50 +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
9d662bd337
fix right-click pad creation in drive
2017-11-21 15:21:37 +01:00
d726c95f0b
fix namespace collision
2017-11-21 15:10:28 +01:00
c8a9afb6c8
remove duplicate loading screen
2017-11-21 15:09:53 +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
eb88efd83f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-11-20 14:17:37 +01:00
80803ad076
Fix empty codemirror after thumbnail creation
2017-11-20 14:17:29 +01:00
a8d5a68eb5
open links correctly in contacts app
2017-11-20 14:06:19 +01:00
7441a68fb9
update test after merging api changes
2017-11-20 12:22:26 +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
e2cf46d725
Add new keyboard shortcuts for the drive search
2017-11-20 11:50:52 +01:00
cf26c4c286
Improve the toolbar UI for smaller screens
2017-11-17 18:21:45 +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
fd258fc277
Fix preview button tooltip in code
2017-11-17 18:19:35 +01:00
fe9261f6a2
Fix modules order in TODO
2017-11-17 18:19:11 +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
bdd24ed14f
lint
2017-11-14 11:57:13 +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
be848c1bec
Fix broken readonly link in drive
2017-11-09 17:27:50 +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
cf5ccf04f2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-11-09 14:23:54 +01:00
101482b8cc
Migrate settings to use a sandboxed iframe
2017-11-09 14:23:40 +01:00
7f8147b18b
Merge branch 'soon'
2017-11-07 15:06:57 +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
454fc8498c
remove old* apps
2017-11-07 13:50:07 +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
5dff9a32b6
Fix comments order in polls
2017-11-03 18:38:04 +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
5438970ab4
typo
2017-10-31 11:30:13 +01:00
e0f7df80b3
Fix avatar upload and use less2 everywhere in profile
2017-10-31 11:11:29 +01:00
7f9b21405b
Add missing files for profile
2017-10-31 10:27:41 +01:00
e99836bae2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-30 18:49:43 +01:00
4250688856
Migrate profile to use sframe
2017-10-30 18:49:28 +01:00
744809101c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-30 16:24:55 +01:00
867df1db56
fix '+New' button in drive toolbar
2017-10-30 16:24:41 +01:00
907e2cb517
lint compliance
2017-10-30 15:13:27 +01:00
abc511a56e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-30 15:12:29 +01:00
68accaf653
Todo in sframe with less2
2017-10-30 15:12:15 +01:00
11b8b380fd
Merge branch 'staging' into evilham
2017-10-30 14:50:11 +01:00
04f26ff886
Merge branch 'staging' of github.com:evilham/cryptpad into evilham
2017-10-30 14:41:21 +01:00
0a14c715ad
add test for support of invite urls
2017-10-30 14:40:43 +01:00
5dcfbd07ab
Merge branch 'theming-improvement' into staging
2017-10-27 18:32:08 +02:00
4933aafbc8
Added default values to avoid breaking existing themes.
2017-10-27 18:31:52 +02: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
d644054e3f
lint compliance
2017-10-27 11:13:26 +02:00
ed253e6c75
Merge branch 'staging' into evilham
2017-10-27 11:03:16 +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
735f0a7e30
Merge branch 'theming-improvement' into staging
2017-10-26 20:44:56 +02:00
83da9cf752
Moved colours to colortheme.less to enable theming
2017-10-26 20:29:14 +02:00
8251247da2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-26 12:31:33 +02:00
6f020b67ca
Add thumbnails to framework apps
2017-10-26 12:31:16 +02:00
98c66ef8f6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-25 13:04:08 +02:00
bf817f20ee
Fix file upload in code and slide
2017-10-25 12:31:22 +02:00
f031af4e9d
fix broken media-tags in contacts
2017-10-25 10:50:17 +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
ba97aa7ad2
allow file upload handler to create thumbnails for whiteboard
2017-10-24 18:09:38 +02:00
6157c57a4b
disable color palette when interface is not editable
2017-10-24 17:59:19 +02:00
8359902f6a
fix typo in poll
2017-10-24 17:42:08 +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
2dd3c42fd5
Fix handlers registered again on reconnect in drive and poll
2017-10-24 10:42:08 +02:00
a0bcb901d3
Add titles in poll when options or usernames are overflowing
2017-10-23 15:16:51 +02:00
74985fd0f2
Use text for the addUser button in polls
2017-10-23 15:12:27 +02:00
6db5a34323
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-23 14:53:42 +02:00
c17fc2efe7
improve option order in poll
2017-10-23 14:53:31 +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
de8339fea7
hide alertify when you are in presentation mode
2017-10-23 14:25:25 +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
a3c7aa67d8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-19 19:07:00 +02:00
094856a511
Fix renaming pad with multiple dots in the name in drive
2017-10-19 18:30:55 +02:00
bf832ba784
fix comment overflow
2017-10-19 17:30:40 +02:00
7bc2f81852
Fix pinned column not always stored in polls
2017-10-19 16:01:56 +02:00
88e7f9a218
Add last access and creation times in the properties window in drive
2017-10-19 15:05:55 +02:00
22e3baed4b
Fix sort issues in drive
2017-10-19 15:00:29 +02:00
f43606f71d
Present mode to display only the parsed markdown in code
2017-10-19 14:39:38 +02: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
7b8490ad20
Use less2 in contacts
2017-10-19 09:58:28 +02:00
dd63cd13d7
Fix profile page title
2017-10-18 16:59:20 +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
4197b7b968
Fix missing icon in list mode for files with thumbnail
2017-10-17 17:23:31 +02:00
d941b1098a
Remove selection in whiteboard when uploading to the drive
2017-10-17 17:21:15 +02: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
a6b34491fc
freeze the editor when reconnecting
2017-10-13 13:40:51 +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
a859ab081a
Fix fouc in drive
2017-10-12 18:21:34 +02:00
7b6432f134
Lint
2017-10-12 18:20:33 +02: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
88d0a2b8a6
Merge branch 'master' into staging
2017-10-12 17:08:34 +02:00
5ed60a0ad7
Fix image ratio in slides
2017-10-12 16:45:51 +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
e317265594
Merge branch 'master' of github.com:xwiki-labs/cryptpad
2017-10-12 14:09:55 +02:00
0d912402e5
patch for bug in Firefox ESR
2017-10-12 14:09:48 +02:00
91381ca77d
Fix lint errors
2017-10-12 12:20:27 +02:00
50090a3af6
Add placeholders for the comment form in poll
2017-10-12 12:18:32 +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
620ba4ed5d
Fix fouc in drive
2017-10-11 17:15:56 +02:00
b31bbebf7b
Buttons are missing in whiteboard when zoomed in
2017-10-11 17:11:38 +02:00
a5a08176fb
Merge branch 'master' into staging
2017-10-11 16:58:45 +02:00
54b5a2d654
Fix style issues in poll (Chrome)
2017-10-11 16:01:26 +02:00
86767184da
Fix style issues in poll for Edge
2017-10-11 15:38:23 +02:00
00e8d32d60
Fix column position in poll for Chrome
2017-10-11 15:37:47 +02:00
b110e1b8da
Fix style issues in poll for Edge
2017-10-11 15:37:11 +02:00
ecb537ac7f
Move code to render.js in poll
2017-10-10 18:19:49 +02:00
75b3ff9c60
CSS issue in polls
2017-10-10 11:35:24 +02:00
c46280d032
Fix style issues for Edge
2017-10-10 11:32:52 +02:00
128c9c2f4e
Merge branch 'staging' of github.com:CatalinScr/cryptpad into catalin
2017-10-09 17:20: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
4c19375f4d
Avoid missing characters in poll's inputs
2017-10-09 15:11:02 +02:00
a12239405b
fix toolbar 'home link' to visit home page from drive
2017-10-09 15:10:38 +02:00
dd141b5c9f
Disable comments when a poll is not published
2017-10-09 14:08:54 +02:00
36aee2d174
lets try normalizing the dom before applying a patch
2017-10-09 14:13:11 +03: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
9509d538e0
Cursor not being updated at the right times before applying a patch.
2017-10-06 14:49:52 +03:00
888028c542
Lint
2017-10-05 18:13:28 +02:00
e5a54b5978
Fix folder highlighting with drag&drop in the drive
2017-10-05 18:12:23 +02: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
1c4f1c785d
Improve stability and UI in poll and its comments
2017-10-05 17:54:07 +02:00
7559bc062e
lint compliance
2017-10-05 17:06:02 +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
ae87320408
Preview pane cannot be resized after it has been hidden and then shown again
2017-10-05 16:12:24 +03:00
1f35798194
stop event propagation from tag prompt
2017-10-05 15:08:34 +02:00
c936e5ae73
make context menu open correct app on correct port
2017-10-05 11:14:47 +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
deed04108b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-10-05 10:22:07 +02:00
a90c078e84
correct reference to undefined
2017-10-05 10:21:59 +02:00
26dfc65c25
Comments in polls
2017-10-04 19:06:16 +02:00
5304dc319f
Enable redirection to the previous page after registration
2017-10-04 15:55:57 +02:00
ceb8ff18bd
Fix ghost icon in drive
2017-10-04 15:52:09 +02:00
846b1a9fb3
Improve description UI in poll. Enable tags and mediatag
2017-10-04 15:39:18 +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
f15ec4efe9
add tagging to whiteboard and file apps
2017-10-03 18:05:28 +02:00
f90742603e
style fixes
2017-10-03 17:53:28 +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
707d3b3e94
Ability to export polls as csv
2017-10-03 16:50:59 +02: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
94d2f4472b
Stop using presentSuccess because it is hidden behind the modal in slide
2017-10-03 12:10:16 +03: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
7230c780a1
Get rid of last usages of cryptpad-common in pad/inner
2017-10-02 15:06:01 +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
0a99478d9f
catch diffdom errors and plow through
2017-09-28 11:50:35 +02:00
0f9e93e1de
make tests pass again
2017-09-28 10:36:40 +02: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
66da349ee4
Sandboxed Poll app with less2
2017-09-27 18:52:04 +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
9b2251005c
Merge branch 'staging' into newpoll
2017-09-27 10:36:33 +02:00
8de1852ab9
Lint compliance
2017-09-27 10:36:16 +02:00
2c10f9b07b
Merge branch 'staging' into newpoll
2017-09-27 10:32:03 +02:00
e02a779c14
Use secure drive as default drive
2017-09-27 10:31:35 +02:00
b4de31c827
Merge branch 'newdrive' into staging
2017-09-27 10:28:16 +02:00
c1275b5671
Prepare secure poll
2017-09-27 10:28:10 +02:00
4c394e0031
Fix UI issue in poll
2017-09-27 10:15:23 +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
9571b3c018
persist whiteboard content across sessions
2017-09-26 15:16:17 +02:00
748172585e
update for modified id
2017-09-26 15:00:25 +02:00
4cd7d8eda4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-26 14:35:02 +02:00
345bfc1cea
Remove migration for pad attributes
2017-09-26 14:36:49 +02:00
52be5501d6
remove invalid test
2017-09-26 14:34:54 +02:00
69014e5fde
Fix mediatags in pad not cached
2017-09-26 11:21:36 +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
59ad96e491
Make sure the user is redirected to the drive at registration
2017-09-25 16:11:50 +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
1afbd4648d
Fix old drive
2017-09-25 15:23:42 +02:00
b871faffc9
Enable tags in code and slide
2017-09-25 14:47:31 +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
deba699d08
Remove old style for sframe drive
2017-09-25 11:54:01 +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
db4c3e7e2c
Merge branch 'master' into staging
2017-09-20 12:07:01 +02:00
b5b84f540e
fix preview mode class
2017-09-20 12:02:46 +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
95542bcdaf
Lint
2017-09-19 15:38:19 +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
72f0952835
Make sure we can't open a pad using the wrong app
2017-09-19 11:31:45 +02:00
35a313d6ee
Make palette realtime
2017-09-19 11:20:20 +02:00
6fdd66167a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-19 11:04:59 +02:00
3023e8c855
Fix templates in whiteboard
2017-09-19 11:04:52 +02:00
732585ea7b
Sandboxed iframe for the whiteboard app
2017-09-19 10:27:31 +02:00
029a8e3023
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-19 10:27:30 +02:00
d72146ba7f
use setAttribute for assigning attributes in hyperscript
2017-09-19 10:27:19 +02:00
a78b597ebb
lint errors
2017-09-18 15:51:47 +02:00
8ce364a252
Add a button to empty the trash in the drive
2017-09-18 15:47:39 +02:00
a1e7bf701d
Select the element after clicking 'show in folder' in the drive search
2017-09-18 15:24:25 +02:00
f9d27d2783
WIP secure contacts
2017-09-18 15:09:01 +02:00
483160a96a
Fix tab notifications in code and slides
2017-09-18 14:31:58 +02:00
1131ef0172
Fix language selection in sandboxed iframes
2017-09-18 14:26:54 +02:00
0a656ca8d6
Fix the splitter in code and add it back
2017-09-18 12:09:18 +02:00
018f71df04
Add drop handlers for mediatags in ckeditor
2017-09-18 10:59:40 +02:00
c00d295466
Add missing translations
2017-09-15 17:33:36 +02:00
a927f40f02
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-15 13:21:45 +02:00
974658453c
Mediatag integration in pads
2017-09-15 13:21:37 +02:00
08e0ae424d
log errors in less compilation
2017-09-14 18:13:03 +02:00
15db6b180c
copy bug fixes from changes
2017-09-14 13:43:13 +02:00
5b45e92250
delete range requests after they have completed
2017-09-14 12:08:41 +02:00
4f6909fce3
set icon to 'faded' styles
2017-09-14 12:07:21 +02:00
086d4bae32
clean up contacts initialization
2017-09-14 12:01:57 +02:00
96d0456f31
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-14 11:54:16 +02:00
1091e0b375
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-14 11:52:52 +02:00
47ce645897
implement slice
2017-09-14 11:51:33 +02:00
a8f7beb20b
remove deprecated apps
2017-09-14 11:36:40 +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
c50c297490
Fix the size of the loading screen for the filepicker
2017-09-14 11:03:39 +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
5f0383ae99
update version of sframe-boot because it was changed
2017-09-14 10:52:25 +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
fa64adbbe5
Hide visible elements while loading the slide app
2017-09-13 17:22:43 +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
8a87ec180e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-13 14:52:26 +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
dc86579d46
use an 8 character password for tests
2017-09-13 14:00:48 +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
5ac3e97dc8
Merge branch 'master' into staging
2017-09-12 12:20:47 +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
5b3667fd4e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-12 11:29:57 +02:00
63700cb791
Fix an issue when cleaning the template category in the drive
2017-09-12 11:29:24 +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
0f9da69185
Show if a pad has been renamed in the drive
2017-09-12 11:17:52 +02:00
499b5ea2ba
warn that a password is too short before doing anything else
2017-09-12 10:50:59 +02:00
a0b3201df3
fix focus on alerts, prompts, and confirms. call back from alerts
2017-09-12 10:49:48 +02:00
a74915ab58
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-11 17:52:40 +02:00
671c893e8a
Duplicating code like a moron, this should hopefully get fixed later.
2017-09-11 17:52:34 +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
9271b0c1a8
Try to fix half-codemirror bug
2017-09-11 14:42:43 +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
8ef27dca08
Lint
2017-09-11 12:25:23 +02:00
1aef844fc3
Fix title attribute for truncated titles in the drive
2017-09-11 12:23:24 +02:00
55fe882f64
Fix readonly mode in code
2017-09-11 12:23:04 +02:00
bd422178c4
Hide the filepicker button in readonly mode
2017-09-11 11:59:09 +02:00
51f1be9f7a
Improve the input style when renaming a folder in the drive tree
2017-09-11 11:50:04 +02:00
642511dc3b
Disable exiting present mode when in embed mode
2017-09-11 11:38:40 +02:00
403b62f131
Fix ghost icon modal and improve UI on mobile
2017-09-11 11:04:14 +02:00
757d0a2800
Save the state of CKEditor's toolbar (visible or hidden)
2017-09-11 10:10:29 +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
a302ee5d25
guard against undefined arguments
2017-09-08 17:39:41 +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
de5d925154
autoselect user href in settings
2017-09-08 15:07:25 +02:00
e950ce74cb
focus on input when opening filepicker
2017-09-08 15:01:47 +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
1ae7076790
Merge branch 'master' of https://github.com/xwiki-labs/cryptpad
2017-09-07 22:08:34 +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
1958bca984
restore hashing screen in login and register
2017-09-07 16:48:22 +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
8b2733e2da
Fix typo
2017-09-06 11:37:19 +02:00
c713b44a4a
Merge branch 'soon'
2017-09-06 11:13:10 +02:00
d98bbf7df9
Fix the pad app when cryptpad is in an iframe
2017-09-06 11:03:20 +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
47ec959032
make sure contenteditable is not set in read only mode
2017-09-05 18:35:11 +02:00
6a735b441f
use paul's print styles
2017-09-05 18:16:06 +02:00
e7de9229a8
Do not print toolbar and collaboration ( #178 ).
...
paul
2017-09-05 17:29:03 +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
31a6881dba
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-05 15:40:02 +02:00
305feebbbe
Fix scroll position when refreshing the drive tree
2017-09-05 15:39:49 +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
904936209a
Remove loading tips in the file picker
2017-09-05 11:59:42 +02:00
98cd69e53e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-09-05 11:57:54 +02:00
204e45dfae
Enable templates in pad
2017-09-05 11:57:44 +02:00
4108520d20
Add contacts in the new menu if the user is logged in
2017-09-05 11:43:16 +02:00
38e1ed93e4
Merge branch 'code2' into staging
2017-09-05 11:42:00 +02:00
acaf45a0e0
drop thumbnails if metadata is too large
2017-09-05 11:38:49 +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
d42d988d36
make test more resilient
2017-09-05 11:26:41 +02:00
cd7b00d45b
make pixels 100px
2017-09-05 11:25:47 +02:00
e8ac5ed87f
add a test for thumbnails
2017-09-05 11:24:30 +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
c0f14dea5e
Store code2 and set the title at the first visit
2017-09-04 17:09:45 +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
a164115e8c
Add media-tag-nacl to cryptpad so it will be hosted on the server
2017-09-01 10:10:34 +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
9a23b77b46
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-30 11:31:59 +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
4db4f66786
Remove an unnecessary fix for Safari
2017-08-30 11:14:58 +02:00
a2ed266048
Move the code app in a secure iframe
2017-08-30 11:10:57 +02:00
1044531806
Fix Safari iframe size issue
2017-08-30 11:04:52 +02:00
a34d1793e0
drop 'loading' text from loading screen
2017-08-29 18:15:40 +02:00
595fa4c2e4
Merge branch 'soon'
2017-08-29 12:00:16 +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
40f062abda
restore app usage report in new pad
2017-08-29 10:50:02 +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
288c03bb41
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-28 17:52:01 +02:00
fe03e6ae83
bad code, lint
2017-08-28 17:53:23 +02:00
430a6f7b77
lint compliance
2017-08-28 17:51:50 +02:00
190dff1c9b
Use the bounce app for opening a link with the right click
2017-08-28 17:50:55 +02:00
dec870d2bd
Fix selection in the drive search results
2017-08-28 17:43:26 +02:00
4bceef8952
Fix the upload status table missing in the drive
2017-08-28 17:35:24 +02:00
0b4e044540
Fix the plugin to open a link in a new tab in pad
2017-08-28 17:26:51 +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
e4a356d873
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-28 12:25:12 +02:00
056285a7b6
Move pad2 to pad and create bounce app
2017-08-28 12:25:05 +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
5fbbaee2f5
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-28 11:48:02 +02:00
6314487d98
handle unfriends in ui
2017-08-28 11:47:54 +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
e62faf7c7b
Edge fix, always use async iframe onLoad rather than invoking it manually
2017-08-28 11:22:57 +02:00
54eefd3d94
replace contacts with contacts2
2017-08-25 16:07:53 +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
a99eb9365e
correctly set indentation preferences when changing languages
2017-08-24 17:31:04 +02:00
f58d4c941f
clean up a bit
2017-08-24 17:19:57 +02:00
ea5f47f0f9
remove some TODOs and solve some wee bugs
2017-08-24 17:18:59 +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
443d8a8941
remove unnecessary files
2017-08-24 11:29:42 +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
dc283c2d74
Load 1, load 2... not load 1, load 3.
2017-08-23 15:49:51 +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
d6c33fdf4f
Ghost icon to add a pad
2017-08-22 17:33:48 +02:00
89a13d4b21
work on contacts2 until feature parity is reached
2017-08-22 15:55:49 +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
98daf10ed1
Ability to collapse the root directory in the drive
2017-08-22 14:54:41 +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
20a68ad71c
Hide the template button if the pad2 is a template
2017-08-21 18:31:15 +02:00
aa9e0d3cd3
Enable AppConfig in pad2
2017-08-21 18:30:51 +02:00
4089803785
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-21 18:22:08 +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
bffa4d01a8
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
2017-08-21 18:08:46 +02:00
b081603455
Update requirejs
2017-08-21 18:08:37 +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
1da11a1883
Disable edition in readonly mode in pad2
2017-08-21 15:30:48 +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
5e22e1dc59
use CryptPad instead of Cryptpad in titles
2017-08-17 20:47:39 +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
4e62f79594
stop referring to deleted file as background image
2017-08-17 17:31:18 +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
52d344c3d1
Merge branch 'soon'
2017-08-17 12:53:04 +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
5b7d1cccd7
fix display and logic for tab setting checkbox
2017-08-16 15:32:42 +02:00
3315449114
Lets try this...
2017-08-16 14:30:17 +02:00
4c949a61e7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-16 12:40:34 +02:00
6b174934c8
Try waiting for iframe document.onload instead of looping and waiting for document.body to exist.
2017-08-16 12:40:15 +02:00
e7ef1e1c2b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-16 12:35:13 +02:00
7c49ca6e3f
Fix initial text size in code
2017-08-16 12:34:56 +02:00
2874ccb5dc
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-16 12:15:20 +02:00
2a8abc2699
comment out splitter code
2017-08-16 12:15:08 +02:00
725e19925c
Yeah, that was silly...
2017-08-16 12:11:25 +02:00
b0b1ed037c
Add a filter to catch XSS-like entities and also stub a on-load test which would otherwise make pads inaccessable.
2017-08-16 10:19:24 +02:00
130b330ede
refactor messaging
2017-08-16 10:04:50 +02:00
638a94785f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-14 16:24:17 +02:00
7ca60e55a7
Lock the pad's inner-iframe down with CSP
2017-08-14 16:23:38 +02:00
5e6e76dfc1
make regex case insensitive
2017-08-14 14:41:23 +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
007db0b080
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-11 17:28:42 +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
66cacf08da
allow users to write with tabs instead of spaces
2017-08-11 15:21:26 +02:00
64849507b3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-08-11 14:26:34 +02:00
a5f9b49bfb
make poll box bigger so it show text in smaller windows
2017-08-11 13:09:34 +02:00
82fadde249
restyle info-box in drive
2017-08-11 13:04:03 +02:00
958294f109
put code settings in their own tab
2017-08-11 13:00:50 +02:00
c8d7675ede
remove z-index on splitter in code
2017-08-11 12:56:42 +02:00
17b986a6ca
fix toolbar drive link (oops)
2017-08-11 12:56:06 +02:00
ae0b2ca1a8
add label for code indentation
2017-08-11 12:55:10 +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
fbb880f277
implement customizable indentation widths
2017-08-10 18:06:47 +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
9dce40f3af
only add the splitter once
2017-08-10 14:34:48 +02:00
4026994310
make splitter work when scrolling
2017-08-10 14:25:31 +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
c036bb26be
use proper bootstrap class
2017-08-09 15:46:17 +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
b34e252eda
improve whiteboard styles
2017-08-09 14:43:32 +02:00
844967a880
continued refactoring
2017-08-09 14:20:37 +02:00
8b2cb37c2f
improve poll looks
2017-08-09 12:33:40 +02:00
5821d3e72f
remove useless title
2017-08-09 11:25:58 +02:00
a4aeada585
make the file dialog placeholder visible, center file list
2017-08-09 11:20:46 +02:00
d47e26efd5
add margin in code
2017-08-09 11:17:14 +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
2cc6c636db
Add some missing titles
2017-08-08 16:20:31 +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
85e383d5c5
add invisible splitter
2017-08-08 14:36:04 +02:00
90075cd48e
media-tag to less file
2017-08-08 12:01:39 +02:00
d15280c6ce
prevent pdfs from being huge
2017-08-08 11:52:16 +02:00
c427f375dd
add bootstrap css to /code for image uploader
2017-08-08 11:48:17 +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
798a3dc520
automatically fill in display name in poll
2017-08-07 12:19:21 +02:00
0588564bc9
overflow on poll div
2017-08-07 11:49:10 +02:00
be29236af1
fix pdfjs styles
2017-08-07 10:47:30 +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
dd6a057962
add 'msg' class for pierre
2017-08-04 15:45:30 +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
fb13e656b7
get new messages when reconnecting
2017-08-03 15:06:06 +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
aba4e34e7f
reuse inline styles as a mixin
2017-08-03 12:17:33 +02:00
195cb01d72
better styles for messaging input
2017-08-03 12:15:06 +02:00
1fac0b9bc4
make todo text bold
2017-08-03 11:53:48 +02:00
66d81429bd
integrate file embed into code editor
2017-08-03 11:47:54 +02:00
dc7db074e8
open pad links when clicking in readOnly mode
2017-08-03 11:04:38 +02:00
71d88b156d
make empty profiles for users on first visit
2017-08-02 17:32:09 +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
1c238100c8
don't throw alerts in the middle of someone's presentation
2017-07-31 15:07:34 +02:00
7cd42d5ff1
use provided clearTooltips function
2017-07-31 14:52:33 +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
9734a4db80
append new items to the top of the todo
2017-07-26 15:37:16 +02:00
69eaccbdef
don't create empty todo entries
2017-07-26 15:22:25 +02:00
e84edb2c2b
disable problematic tooltips
2017-07-26 13:46:07 +02:00
9c07793d0d
remove tips on checkbox state change
2017-07-26 13:42:12 +02:00
ba9cab762c
Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo
2017-07-26 13:29:33 +02:00
8e83501c72
Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo
2017-07-26 13:31:02 +02:00
459e0b3b16
CSS and bug fixes for todo
2017-07-26 13:30:39 +02:00
d4ffa7903f
better popup logic
2017-07-26 13:26:35 +02:00
0b81781f35
make the input bold
2017-07-26 13:25:58 +02:00
2af96d74fc
automatically focus on the create todo form
2017-07-26 13:17:02 +02:00
77d6da841f
Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo
2017-07-26 13:07:41 +02:00
3da76e3ae8
Update style for the todo app
2017-07-26 13:07:35 +02:00
85366f2368
use new translations
2017-07-26 13:04:23 +02:00
d99d071716
WIP checkbox titles
2017-07-26 13:03:48 +02:00
e6031c2209
slightly better styles
2017-07-26 13:03:25 +02:00
8cfd8d3270
add translations for todo
2017-07-26 13:02:14 +02:00
c390bdd518
resolve merge conflicts
2017-07-26 12:41:13 +02:00
0612a50ab4
Add fadein/fadeout when adding or removing a task
2017-07-26 11:40:24 +02:00
082632048b
fix styles for very wide todos
2017-07-26 11:06:17 +02:00
a15ff9ba2a
hide dates in todo
2017-07-26 11:05:54 +02:00
f0581f2cf4
also style the whole box
2017-07-26 10:43:37 +02:00
d7d7f212bb
add classes to style fake checkboxes based on checkstate
2017-07-26 10:21:32 +02:00
304d37a334
use styled checkboxes
2017-07-26 10:06:24 +02:00
b5603c89f0
add checkboxes to todos
2017-07-26 09:37:02 +02:00
796bf89491
Update of the front-page
2017-07-24 17:56:54 +03:00
4f63921fc9
better width styling on list. lint compliance
2017-07-24 16:36:53 +02:00
35635c3e2f
CSS fix for the todo app
2017-07-24 16:27:35 +02:00
3efb9d21f5
pull in bootstrap. submit form on enter
2017-07-24 16:22:12 +02:00
83f79a3883
slightly better styles
2017-07-24 16:14:49 +02:00
180e643af9
Style of Todo App
2017-07-24 16:29:39 +03:00
5083299e8a
Merge branch 'todo' of https://github.com/xwiki-labs/cryptpad into todo
2017-07-24 16:23:59 +03:00
f67fb32bf1
Add, delete, display a task in Todo
2017-07-24 16:23:53 +03:00
56514d7e17
add val api
2017-07-24 15:10:15 +02:00
ac718b6dfa
Merge branch 'todo' of https://github.com/xwiki-labs/cryptpad into todo
2017-07-24 15:35:45 +03:00
a61faebb2b
App Todo - Init and HTML
2017-07-24 15:35:29 +03:00
522476a2a6
initialize data model and provide basic methods
2017-07-24 14:30:43 +02:00
4345fc0662
Todo app
2017-07-24 14:13:47 +02:00
e3b9c03fc0
TodoApp - Init
2017-07-23 16:28:49 +03:00
658b00814b
TodoApp - Style and translations
2017-07-23 16:08:49 +03:00
a9a65e4ca9
remove unused code
2017-07-23 14:36:41 +02:00
4b53e02f6c
oups
2017-07-23 14:32:13 +02:00
2e3be27278
resolve merge
2017-07-23 14:31:13 +02:00
dcf5719eaf
handle most of the boilerplate stuff
2017-07-23 14:27:47 +02:00
0d43a84c2b
move example into another folder
2017-07-23 14:19:43 +02:00
5c07eac4de
Change title and footer
2017-07-23 15:08:27 +03:00
f5454f232a
pull in todomvc vanillajs example
2017-07-23 13:46:41 +02: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
3bd5f01e53
Fix slide ratio in preview mode
2017-07-20 09:55:18 +02:00
140964478e
Enter + shift key to add a new line in chat
2017-07-20 09:54:44 +02:00
331b4dddea
Clean debugging code
2017-07-19 17:50:08 +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
88813aee02
Show that only html can be imported in pads
2017-07-19 16:36: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
1dc98dcff1
CSS for the contacts input field
2017-07-19 10:30:38 +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
221a3b4fed
Fix duplicate leftside entries when disconnected in profile
2017-07-18 12:10:58 +02:00
22a28a8fd9
Fix undefined description in profile
2017-07-18 11:49:54 +02:00
39fd0d0f5f
notify if you're focused on a conversation in a bacgkrounded tab
2017-07-18 10:57:37 +02:00
7540f12040
Fix profile creation button not centered
2017-07-18 10:45:36 +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
3545a66320
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-17 18:51:40 +02:00
743b87b70f
Add initial text in /contacts
2017-07-17 18:51:23 +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
0cd94e2ba8
add title to contacts app
2017-07-17 17:38:41 +02:00
f2320190b8
change friends url to /contacts/
2017-07-17 17:18:28 +02:00
756b561bbc
lint compliance
2017-07-17 14:12:51 +02:00
6306de5265
set avatar border-radius to 4px
2017-07-17 13:43:51 +02:00
c452f25414
stub invite app
2017-07-17 11:56:34 +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
9ef45fe9f1
add background-color to names in chat
2017-07-13 18:04:56 +02:00
e2c17dbeb4
resolve conflicts
2017-07-13 17:52:00 +02:00
0340b45f2c
migrate profile to include edKey. don't propose connecting to users with whom you are already friends
2017-07-13 17:45:13 +02:00
557f13f796
Unfriend and update username - beta
2017-07-13 17:32:57 +02:00
7be1e249e1
add fa-share-alt to pad initialText
2017-07-13 15:48:03 +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
7a225af11e
fix some minor slide navigation bugs
2017-07-13 10:57:27 +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
8fb5762eea
Lint errors
2017-07-12 18:51:19 +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
d09f5b70c7
Fix slides CSS
2017-07-11 17:39:26 +02:00
159ccc2866
Fix mediatag flickering
2017-07-11 17:39:08 +02:00
ce50dbf3ca
Hide the 'templates' list header if the category is empty
2017-07-11 15:51:55 +02:00
42075e4b5f
Make everything 16px and 32px
2017-07-11 15:34:46 +02:00
16d0527e92
Add a page title in drive, settings and file
2017-07-11 15:13:39 +02:00
5d5f936682
Hide the upload table in code
2017-07-11 14:38:26 +02:00
a0b14faf89
Fix the font in settings and drive
2017-07-11 13:11:16 +02:00
e732284845
Lint
2017-07-11 12:50:16 +02:00
112c4c85e5
Left menu in drive
2017-07-11 12:47:15 +02:00
8f5a244999
Replace mediatag markdown syntax by html. Enable file upload in /code.
2017-07-11 11:56:06 +02:00
9f9e593e0f
Lint
2017-07-10 18:46:59 +02:00
560671ae7d
Make avatars circle
2017-07-10 18:46:26 +02:00
125018c8c3
New settings page
2017-07-10 18:29:23 +02:00
c02fa39524
Make drive search bar blue
2017-07-10 15:19:08 +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
086e5909dd
Merge branch 'soon' into staging
2017-07-10 10:43:41 +02:00
781974ec7c
center 'Create a profile' button
2017-07-10 10:42:39 +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
29c6ed6e9b
hide slide arrows when there are no more slides in that direction
2017-07-10 09:51:15 +02:00
c096872467
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
2017-07-10 09:30:44 +02:00
eff27ff6c5
focus username button
2017-07-10 09:24:46 +02:00
c60a71e210
add connect button and view profile button
2017-07-10 09:23:58 +02:00
94f8e4b8a3
use validateKeys when instantiating object
2017-07-10 09:21:58 +02:00
22fbc7e5d8
implement getter for public keys
2017-07-10 09:21:27 +02:00
ecef970250
float connect button right because flex styles messed up the pencil icon
2017-07-10 08:57:09 +02:00
df103c4074
Messaging app
2017-07-07 18:53:21 +02:00
f9a43d6570
select everything before file extensions in drive when renaming
2017-07-07 10:37:12 +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
f02285d103
fix lowercased p
2017-07-06 10:49:33 +02:00
5d96c68ad7
fix profile app display on chrome
2017-07-06 10:43:14 +02:00
de420de021
Fix the folder's path in the search results page
2017-07-06 10:40:21 +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
3e802c2443
Fix overflowing content in profile
2017-07-05 10:14:43 +02:00
dfad622b76
Merge branch 'soon' into staging
2017-07-05 10:14:30 +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
fa06f9d413
fix minor bugs in poll
2017-07-04 15:09:09 +02:00
90bcadd87b
Merge branch 'soon' into staging
2017-07-04 14:58:45 +02:00
be7e7fec43
don't bypass warnings when registering
2017-07-04 14:56:07 +02:00
cab595f959
Fix duplicate folders in the drive
2017-07-04 14:51:35 +02:00
42375190e6
style buttons for long titles
2017-07-04 14:24:07 +02:00
c27c140130
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-04 12:37:50 +02:00
ac8da0d52d
load codemirror in the correct context. fix selection events
2017-07-04 12:37:24 +02:00
789274fd4f
Fix font-size in slides
2017-07-04 12:32:14 +02:00
7377d39b39
hide print button
2017-07-04 10:35:55 +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
678986dac4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-03 16:43:57 +02:00
fa2d857d70
Fix css issues with Safari
2017-07-03 16:11:41 +02:00
efedfe0667
show preview pane by default in /slide/
2017-07-03 14:53:50 +02:00
81c8949aee
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-03 14:43:17 +02:00
1df5e6e855
Fix toolbar buttons for Safari
2017-07-03 14:32:54 +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
70c9f3df75
Fix avatar size
2017-07-03 12:13:37 +02:00
f09ae9b19c
jshint compliance
2017-07-03 11:51:47 +02:00
4a9a564913
don't try to handle error thta never happens anymore
2017-07-03 11:40:52 +02:00
b15aa3360a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-03 11:39:21 +02:00
6ac056e314
make explicit file size RPCs unauthenticated
2017-07-03 11:38:39 +02:00
9b131dc49c
Fix CSS in the slide app
2017-07-03 11:34:30 +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
f357ec32c2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-30 16:57:37 +02:00
b153dda6ff
Add avatars in the user list
2017-06-30 16:57:23 +02:00
c2e153e8ed
more fouc fixes
2017-06-30 16:20:10 +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
4ab82710ab
Remove the background color from the text-color button in the slide app
2017-06-30 11:55:29 +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
9e91739044
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-30 11:21:27 +02:00
ecff05425f
feedback for slide printing
2017-06-30 11:21:19 +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
5a3e9c785c
Fix ckeditor toolbar
2017-06-29 18:15:41 +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
8abc94d37b
Replace folder images in the drive
2017-06-29 18:03:19 +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
4a5f5de78c
restore missing stylesheet for poll
2017-06-29 14:35:23 +02:00
bbf9916a91
fixes for file app
2017-06-29 14:21:48 +02:00
39149a052b
add new feedback keys
2017-06-29 14:16:20 +02:00
7a5c5ce0a3
load scripts asynchronously
2017-06-29 12:17:08 +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
fca1ef4d36
hide unstyled content until the loading screen is displayed
2017-06-29 10:49:35 +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
7439bbaba2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-28 10:58:24 +02:00
ed45814020
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-28 10:57:49 +02:00
cfc5907237
remove unnecessary style rules
2017-06-28 10:41:08 +02:00
85d8eda847
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-27 18:58:26 +02:00
176e47f394
Add the profile app
2017-06-27 18:58:20 +02:00
1c1869a22c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-27 18:26:10 +02:00
7de2683169
make all apps use clientside templates
2017-06-27 18:17:52 +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
bdca6b10c2
use templates in poll.js
2017-06-27 15:38:12 +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
8f2db44793
Remove getTitle from the file app
2017-06-26 16:38:59 +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
3076ade23a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-26 15:16:45 +02:00
36ef4178dc
Remove the editable title from the file app
2017-06-26 15:16:17 +02:00
51e06e68a7
don't change slides when navigating through history
2017-06-26 14:40:48 +02:00
ffcbde4325
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-26 14:32:42 +02:00
48ece55ed5
style fixes, and dynamic less compilation
2017-06-26 14:32:37 +02:00
38f568635d
Fix duplicate media-tag in slides when adding or removing a slide
2017-06-26 14:08:14 +02:00
ce44a8d351
Fix the backup button in anonymous drive
2017-06-23 18:02:36 +02:00
06a0590f73
New folder icons
2017-06-23 17:58:41 +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
90cc3e6a5e
New userlist in the whiteboard app
2017-06-22 17:16:42 +02:00
2710279904
Use the new share button in the file app
2017-06-22 17:03:51 +02:00
5a48cba999
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-22 16:15:08 +02:00
684269fdda
Userlist in polls
2017-06-22 16:14:54 +02:00
35bfa1dce4
test client-side templates in whiteboard app
2017-06-22 16:01:33 +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
3657e978fd
give main2.js a more sensible name
2017-06-22 11:06:11 +02:00
118b83c420
make register and login user clientside templates
2017-06-22 10:04:46 +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
503e9de07c
Lint errors
2017-06-20 18:00:57 +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
c3f636851a
Fix path size width in drive
2017-06-20 14:56:15 +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
f13d23241c
Upgrade CkEditor to version 4.7
2017-06-20 10:03:13 +02:00
d822dfe37a
add forget button to file app
2017-06-19 17:44:30 +02:00
7fd36a72f3
re-add download button for file app
2017-06-19 17:36:22 +02:00
f02a381e32
avoid horizontal scrollbars
2017-06-19 16:30:03 +02:00
cc5d5d4f1d
make pdfs in file app big
2017-06-19 16:13:11 +02:00
dbfad9d227
Lint
2017-06-19 16:02:27 +02:00
91d46cdee4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-19 15:58:26 +02:00
d3b9ac2511
Update the preview and present content on Ready in slides
2017-06-19 15:58:10 +02:00
5fd4870b8b
Merge pull request #138 from pbondoer/staging
...
Fix poll auto-focus inputs
2017-06-19 15:36:35 +02:00
626e54d7b5
Fix poll auto-focus inputs
2017-06-19 15:30:22 +02:00
54adb680e7
Hide the slide number in the title outside of present mode
2017-06-19 15:26:27 +02:00
17838f1d70
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-19 14:55:45 +02:00
1b66383bac
don't create color-picker if readonly
2017-06-19 14:55:34 +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
b2a70f86d3
disallow concurrent logins
2017-06-19 14:22:21 +02:00
35e0de463b
disallow concurrent scrypt cycles
2017-06-19 14:18:10 +02:00
06ca70d11e
lint compliance
2017-06-19 14:05:40 +02:00
f29f430e7c
better handling of non-rpc messages
2017-06-19 12:38:24 +02:00
f1aef66fc9
Fix the drive history
2017-06-19 12:35:45 +02:00
008c417111
Context menu was not hidden after a click in the drive
2017-06-19 12:08:53 +02:00
377a90961b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-19 11:53:13 +02:00
e40f43bd20
Migrated pads were not displayed instantly in the drive
2017-06-19 11:52:57 +02:00
44b8bc7b7d
make context menus unselectable
2017-06-19 11:43:24 +02:00
928dadcf77
Fix toolbar dropdown menus not visible in slide
2017-06-19 10:37:01 +02:00
1df11f2813
Update the font-size when entering/leaving present mode
2017-06-19 10:26:14 +02:00
66d8c0ed11
Add a preview mode to the slide app
2017-06-16 15:11:32 +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
8b5f4dbd47
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-15 18:36:35 +02:00
3a36040ba7
lint
2017-06-15 18:36:23 +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
24c14ffbf3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-15 16:31:09 +02:00
5bfd8470cb
Display the file size before downloading it
2017-06-15 16:30:50 +02:00
3f85471ab3
update footer and package.json for upcoming version
2017-06-15 16:13:33 +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
06eceed8b3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-15 15:34:22 +02:00
17146d7af9
send feedback for uploads
2017-06-15 15:34:13 +02:00
c2c04bd5d8
Lint
2017-06-15 15:02:31 +02:00
2068a8b85b
Embed the mediatag library in the file app
2017-06-15 14:58:18 +02:00
cd5705b3f3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-15 13:54:09 +02:00
1e9bc89855
Fix drive icons when the name contains a long word
2017-06-15 13:54:02 +02:00
5ce453afa0
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-15 13:51:11 +02:00
e73e32ab3a
fix too-tall download button
2017-06-15 13:43:32 +02:00
927f6404b8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-15 13:35:07 +02:00
66b076111e
Add an upload button to the slide's file picker
2017-06-15 12:32:44 +02:00
c2e5ef7048
better sizing for videos
2017-06-15 12:11:39 +02:00
c717d01714
fix pdf height
2017-06-15 12:06:53 +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
f3f1cf9e6d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-15 11:05:07 +02:00
a237eec41e
Add a file picker in the slide app
2017-06-15 11:04:58 +02:00
20874c76f1
prevent code blocks from overflowing slides
2017-06-14 18:56:44 +02:00
a4f45caebb
Lint
2017-06-14 18:25:54 +02:00
0a4e876139
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-14 17:52:23 +02:00
8738b42861
Update the drive UI to show that Upload and New are linked to a folder
2017-06-14 17:51:48 +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
d5c7eb49a4
send feedback on toolbar hide and CKE buttons
2017-06-14 15:33:12 +02:00
7e0a2abc2c
Fix the file name when restoring an element from the trash
2017-06-14 13:03:10 +02:00
5b523be171
Fix drag&drop for pads in the drive
2017-06-14 12:55:46 +02:00
e51f678bb9
Don't display the popup whne moving a file to the trash
2017-06-14 12:50:44 +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
494b44e2b1
fix lint errors
2017-06-14 10:04:54 +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
8a599eb9b1
Merge pull request #136 from blumeva/staging
...
change minimum opacity
2017-06-13 15:27:45 +02:00
fc9ecb0f7c
change minimum opacity
2017-06-13 15:20:16 +02:00
ea79294494
Merge pull request #134 from pbondoer/newpoll
...
More poll improvements
2017-06-13 14:32:46 +02:00
88c2c0afde
Merge pull request #135 from blumeva/staging
...
Staging
2017-06-13 14:23:41 +02:00
74c9b663dd
changing whiteboard
2017-06-13 14:14:36 +02:00
40cf7ea107
change whiteboard
2017-06-13 14:11:22 +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
a57f8679c5
Fix a race condition in the file app
2017-06-13 11:45:37 +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
d367f71760
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-13 11:24:57 +02:00
c70eb73d52
Merge branch 'master' of github.com:xwiki-labs/cryptpad into staging
2017-06-13 11:24:20 +02:00
803bad1421
Move the file upload code in a separate file
2017-06-13 11:21:26 +02:00
d344f03778
proper button text
2017-06-12 18:57:07 +02:00
2b5339193c
bring admin back
2017-06-12 18:45:04 +02:00
b2eef94232
use numbers, not strings
2017-06-12 18:35:13 +02:00
848010842f
dont sanity check silently
2017-06-12 18:26:27 +02:00
56f2c46c75
document a line
2017-06-12 18:25:06 +02:00
cd1c957929
NaN safety
2017-06-12 18:23:17 +02:00
0118fdbd00
use a local variable
2017-06-12 18:16:11 +02:00
49370764c1
change whiteboard translation
2017-06-12 18:14:33 +02:00
b8e394db67
poll: Implement multiple choices
2017-06-12 18:01:51 +02:00
a58162a617
Make the drive tests work when not logged in
2017-06-12 17:49:33 +02:00
c702313489
change label texte
2017-06-12 17:34:45 +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
9c5bade83e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-12 14:37:29 +02:00
d1f4617419
Fix a race condition causing the preview part to be empty
2017-06-12 14:37:12 +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
685b352db8
poll: Add show help button
2017-06-12 14:25:10 +02:00
30bdb9881c
Fix undefined element in select dropdown menus
2017-06-12 14:23:06 +02:00
298e34a9de
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-12 12:47:47 +02:00
8471dab6b1
Provide hints in theme and language dropdowns
2017-06-12 12:47:25 +02:00
5d565660a9
tiny fixes
2017-06-12 12:41:03 +02:00
6bc191725f
poll: support disconnect and fix trash button
2017-06-12 12:37:07 +02:00
b3221c0fb4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-12 12:32:48 +02:00
0c957989d2
add link to upload table when complete
2017-06-12 12:31:52 +02:00
5d6a0dcc1b
Fix width transition when dragging preview
2017-06-12 12:27:24 +02:00
6dd80c26b1
Make editing more visible
2017-06-12 12:00:39 +02:00
3ff3eac283
Fix a race condition causing the drive to be empty
2017-06-12 11:54:20 +02:00
a5cb5f2ceb
Merge branch 'staging' into newDrive
2017-06-12 10:51:38 +02:00
1b671edce9
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-06-12 10:50:30 +02:00
9a4a6e9b40
Always display the upgrade button in the drive
2017-06-12 10:17:52 +02:00
9cc25d4c9f
Merge branch 'staging' into newDrive
2017-06-09 17:03:01 +02:00
7134b00544
Add a button to display the context menu for the trash on mobiles
2017-06-09 17:02:50 +02:00
d24458e4b0
Fix the tests to work with the async migration
2017-06-09 16:41:51 +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
9d758a040b
Fix an issue with the search field not displayed properly
2017-06-09 15:45:46 +02:00
08902c0910
drop extraneous argument
2017-06-09 15:33:28 +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
fe2fef5e4c
support dragging and dropping multiple files
2017-06-08 18:12:17 +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
e723228060
always show upgrade button in drive
2017-06-08 14:03:01 +02:00
da533b106a
improve type checking in getFileSize
2017-06-08 11:24:20 +02:00
2f851ab97e
fix lint errors
2017-06-07 10:13:51 +02:00
d25477e8c6
don't let tooltips interfere with DOM interaction
2017-06-06 18:08:23 +02:00
811d031ffd
Fix the 'File' entry in the drive 'New' menu
2017-06-06 12:09:55 +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
f43132a63b
bump version in footer and package.json
2017-06-06 10:01:07 +02:00
ec9a4dec5e
Merge branch 'soon' into staging
2017-06-05 11:43:26 +02:00
77d4ffba86
animate preview mode sidebar
2017-06-02 17:39:45 +02:00
65233c2464
remove unused variable
2017-06-02 16:16:17 +02:00
767793b5ca
fix stuck loading tip
2017-06-02 12:13:11 +02:00
8f7aaecc1c
cache some selectors and decrease memory demands
2017-06-02 11:45:54 +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
c65ca5cfc6
restore deleted line and add missing semicolon
2017-06-01 10:35:42 +02:00
8bd9ad8847
add automated registration test
2017-06-01 10:23:50 +02:00
07279c8dc7
export boolean Test.testing
2017-06-01 10:23:24 +02:00
c8bd1bb2ac
Trying to improve the tests which fail always when running remotely
2017-06-01 00:29:17 +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
5e57578fa9
Merge branch 'master' of github.com:xwiki-labs/cryptpad
2017-05-31 18:44:55 +02:00
30f66ab7ba
hotfix 'undefined/' bug
2017-05-31 18:44:44 +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
8ab9248a78
Fix ES6
2017-05-31 12:42:37 +02:00
21c39572be
Update media-tag and fix bower dependencies
2017-05-31 11:53:25 +02:00
daf112a5b5
take api settings into account for upgrade button
2017-05-30 20:11:15 +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
76c530037b
enable donate button in all apps
2017-05-30 15:51:07 +02:00
9ca5bc507e
add support for donate button
2017-05-30 15:42:53 +02:00
a70014dd11
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-30 10:46:17 +02:00
99a44f119f
don't send referrer headers on pads which may link outward
2017-05-30 10:44:40 +02:00
92a7970eb8
fix merge conflicts
2017-05-29 19:04:47 +02:00
1240b864ef
fix misconfigured history
2017-05-29 17:25:06 +02:00
f434f002c4
poll: make locks clickable
2017-05-29 16:32:40 +02:00
3915b30055
provide a register button on login
...
also direct users from file to login
2017-05-29 13:11:07 +02:00
b6bb576a34
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into newpoll
2017-05-29 12:59:49 +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
1092285a68
merge master
2017-05-26 16:18:51 +02:00
6c1861dbc6
Merge branch 'soon' into staging
2017-05-26 15:48:44 +02:00
2ecf257fcd
Sync localStorage with sessionStorage in auth because safari...
2017-05-26 15:30:01 +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
a04f179d8b
hide preview mode on phones
2017-05-24 19:00:14 +02:00
df2b00122a
New drive structure without file names
2017-05-24 18:59:44 +02:00
dc2b0ae6b4
jshint compliance
2017-05-24 18:45:48 +02:00
b32c329269
remember whether you were using preview mode for a pad
2017-05-24 18:41:19 +02:00
d9f7470f06
copy user details into sessionStorage for safari
2017-05-24 18:28:16 +02:00
a5ffd278a7
write styles for code in .less
2017-05-24 17:27:03 +02:00
3803f6a20f
only render preview if preview container is visible
2017-05-24 17:25:33 +02:00
617e027f12
catch markdown preview errors
2017-05-24 15:50:35 +02:00
c5bb830757
don't preview if hightlight mode is not markdown
2017-05-24 14:21:31 +02:00
fd83ae3e61
implement createRandomInteger
2017-05-24 11:34:40 +02:00
4d9060f49e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-24 11:28:06 +02:00
378bf2aa94
yflory's word wrap fix
2017-05-24 11:27:31 +02:00
dc80b6b11f
throttle markdown preview
2017-05-24 11:27:16 +02:00
f5f8e148ca
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-23 18:09:42 +02:00
90f5713d4a
Fix an issue with the search bar redirecting to incorrect location
2017-05-23 18:09:30 +02:00
97cc4a6d54
add styling for tables in markdown preview
2017-05-23 18:03:35 +02:00
e6c04ccb49
bump server after paying for an account
2017-05-23 16:11:07 +02:00
6faca87e73
set preview content in read only mode
2017-05-23 15:54:04 +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
a50805545d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-22 17:56:49 +02:00
d55b7e411c
Display an alert in the drive when the limit is reached
2017-05-22 17:56:27 +02:00
dac9d0647d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-22 16:39:27 +02:00
259d34b7c8
jshint compliance
2017-05-22 16:34:22 +02:00
40b99e7bbf
Get the file name before downloading the entire file
2017-05-22 15:30:59 +02:00
6dc3c62ba4
check for src before trying to ajax
2017-05-22 15:12:39 +02:00
a6cf761172
don't store media tag pages in the drive
2017-05-22 14:45:14 +02:00
90a9764fa4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-22 14:41:23 +02:00
346c289204
Fix lint errors
2017-05-22 14:39:58 +02:00
71dc0af6c7
better test for success error codes
2017-05-22 14:37:57 +02:00
0b6c587e2b
fetch and decrypt metadata with range requests
2017-05-22 14:37:38 +02:00
eb31d0323c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-22 12:32:10 +02:00
a99080fb74
push the rest of the code
2017-05-22 12:31:00 +02:00
408a4dad94
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-22 12:30:08 +02:00
3964f4feee
Display the progress when downloading a file
2017-05-22 12:30:00 +02:00
dd73ad2dd5
add decryptMetadata function
2017-05-22 12:26:44 +02:00
5179252d3b
fix merge conflicts
2017-05-22 12:11:24 +02:00
4ee42b87d4
make file crypto great again
2017-05-22 12:04:47 +02:00
c45f08f147
Use a download button instead of downloading a file automatically
2017-05-22 11:43:45 +02:00
0c2f84058b
Improve css for the file app
2017-05-22 11:16:01 +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
03da870a7a
jshint compliance
2017-05-19 19:38:57 +02:00
af4fd3c6d3
resolve merge conflicts
2017-05-19 19:14:08 +02:00
67a04a16ec
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-19 18:44:46 +02:00
1ab6eb3c5d
Add a queue for multiple uploads in the file app
2017-05-19 18:41:34 +02:00
ba5ef5157e
show pretty representations of storage usage
2017-05-19 18:37:31 +02:00
0a54f0cf2d
better alignment of preview and code entry
2017-05-19 16:21:26 +02:00
e78299aed6
use async file decryption, listen for progress events.
2017-05-19 11:46:47 +02:00
bcd0303821
style /file/ with .less
2017-05-19 11:46:10 +02:00
ef155d8ccf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-19 09:13:38 +02:00
310909dc9e
handle new error codes
2017-05-19 09:12:59 +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
5a83259233
listen for decryption errors
2017-05-18 18:24:04 +02:00
2cee9534c5
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-18 17:58:33 +02:00
d324a054f2
add progress bar to file upload
2017-05-18 17:57:42 +02:00
21f9e31e75
Add a placeholder for the user app
2017-05-18 15:56:35 +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
3ba94a1ba2
correctly set release version number
2017-05-18 14:54:02 +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
4debec39bb
update footer with next release codename and corrected matrix link
2017-05-18 12:58:49 +02:00
73ec91aa5e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-18 12:46:36 +02:00
80479fdc90
use rpc calls from cryptpad common
2017-05-18 12:44:16 +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
8fe0282b7b
jshint compliance
2017-05-16 14:14:30 +02:00
827233dcba
new translation keys for file upload
2017-05-16 14:01:06 +02:00
834830fc4f
Fix the Ctrl key + click to select multiple files
2017-05-16 11:26:04 +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
7ee6864ea4
Add the user menu in the login and register pages
2017-05-15 18:21:11 +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
cc893723de
add some TODOs, log uploaded content so we know it's working
2017-05-15 18:10:22 +02:00
2dd04f7631
get limits from the server
2017-05-15 18:03:12 +02:00
716245f864
Make all the buttons look the same
2017-05-15 16:16:50 +02:00
0f37d9def7
Change the button font size in the toolbar
2017-05-15 14:53:51 +02:00
48496416e7
Use the same font-size for all the toolbar buttons
2017-05-15 14:46:17 +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
03274c3776
Display an info message in the anonymous drive
2017-05-15 13:54:03 +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
9bbd3161ca
update tests for new API changes
2017-05-15 11:11:12 +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
4c4c21342d
don't try to decrypt nothing
2017-05-12 16:26:51 +02:00
69e933dd17
better error handling in file download
2017-05-12 16:17:10 +02:00
42f3a62cac
handle errors with XHR
2017-05-12 16:13:09 +02:00
213708d8dc
center media tags
2017-05-12 15:43:32 +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
22efde87d5
correctly estimate upload size
2017-05-12 12:12:51 +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
d3854b9774
Fix selection issues in the drive with Chrome
2017-05-11 14:31:15 +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
733c3abefa
Update the upgrade button in the drive
2017-05-11 12:43:32 +02:00
becba33b05
Scroll to the selected element in the drive
2017-05-11 12:11:45 +02:00
419fb15425
Remember the scroll position in the drive tree
2017-05-11 11:20:18 +02:00
5d0535966c
Center vertically slides in present mode and checkbox to disable transitions
2017-05-11 10:58:33 +02:00
5d37a50a87
try to estimate upload size
2017-05-10 18:57:25 +02:00
6d30d7f89f
strip junk bytes from base64 more safely
2017-05-10 18:15:33 +02:00
1525712deb
new encrypted file format
2017-05-10 17:13:26 +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
5a21be8112
Improve UI on mobile
2017-05-10 15:54:09 +02:00
5aba2d4640
remove unused variable
2017-05-10 15:36:34 +02:00
5c8586f8a3
Fix typo in file upload
2017-05-10 15:00:05 +02:00
1e4fc5a979
lint
2017-05-10 14:56:50 +02:00
3c4b6a89d2
Fix a conflict with the arrow keys and renaming a folder in the tree
2017-05-10 14:48:15 +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
97a28d3938
test file encryption/decryption
2017-05-10 11:56:10 +02:00
6a1c799a6e
support async tests
2017-05-10 11:54:21 +02:00
922e7803e9
remove extraneous slashes from hashes when parsing
2017-05-10 11:54:05 +02:00
0f8ef2f516
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-10 11:45:25 +02:00
6a8153aca3
Fix selection issues in the drive with Chrome
2017-05-10 11:44:58 +02:00
a6c49cd65c
Fix undefined title in slides present mode
2017-05-10 10:49:59 +02:00
299a53ded7
prefer to use functions from common
2017-05-09 18:54:56 +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
56a871cb67
Merge branch 'soon' into staging
2017-05-09 16:50:54 +02:00
521f99a3d6
support drag and drop for file upload
2017-05-09 16:50:25 +02:00
b4973b7610
Merge branch 'master' of github.com:xwiki-labs/cryptpad
2017-05-09 15:11:38 +02:00
ae7d65c3fa
fix drag to select in chrome
2017-05-09 15:11:27 +02:00
63710e1ccc
Move the code related to the title in another file
2017-05-09 14:32:41 +02:00
48898c97e5
Merge branch 'master' of github.com:xwiki-labs/cryptpad
2017-05-09 14:31:42 +02:00
ce5cdce917
Fix an issue where the username was lost on websocket reconnect
2017-05-09 14:31:28 +02:00
1d4d4cffdb
correct some copypasted code
2017-05-09 14:26:17 +02:00
2b4f503aff
Merge branch 'master' of github.com:xwiki-labs/cryptpad
2017-05-09 11:55:31 +02:00
4a104052b4
handle errors in file
2017-05-09 11:55:25 +02:00
b818fd8a37
Fix 'undefined' error with the context menu
2017-05-09 11:20:06 +02:00
c34c1cb07c
Press enter to open a folder
2017-05-09 11:03:47 +02:00
7da01d0862
unlist removed examples
2017-05-09 08:08:00 +02:00
ea3dc8a852
remove file upload test
2017-05-09 08:05:20 +02:00
42dcfb9661
unceremoniously kick web clients when you 'log out everywhere'
2017-05-05 18:25:55 +02:00
1547063b7f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-05 18:13:31 +02:00
a20a319a7a
Fix focus issues in the CryptDrive search bar
2017-05-05 18:13:14 +02:00
36ab38f3ac
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-05 17:58:33 +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
6471b572eb
correct off-by-one
2017-05-05 15:40:31 +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
c07d3e6162
update version strings for upcoming release
2017-05-05 11:51:41 +02:00
3e118c6a38
allow instance-wide custom salt for login
2017-05-05 09:10:31 +02:00
6a00d11a15
fix undefined reference
2017-05-04 18:28:52 +02:00
c3d1554e8c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-04 18:25:23 +02:00
660cda6573
set title when uploading
2017-05-04 18:25:06 +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
5739c3d973
blow up if you ever run out of nonce-space
2017-05-04 12:20:38 +02:00
2232518c64
set title after uploading
2017-05-04 12:01:37 +02:00
f644dc6c0b
WIP support encrypted file upload via base64 chunks
2017-05-04 11:37:46 +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
cd98fc6eab
Increase the z-index of the select area in the drive
2017-05-03 17:18:10 +02:00
80115d0071
Fix an 'undefined' variable error in the drive
2017-05-03 17:17:42 +02:00
c9d89debba
Fix lint errors
2017-05-03 16:17:52 +02:00
79365a7a82
Use the shift key to select multiple files in CryptDrive
2017-05-03 16:15:37 +02:00
3262787244
Update the icon mode in CryptDrive
2017-05-03 14:02:45 +02:00
d52e9fba43
Use the arrow keys to change the selection in the drive
2017-05-03 13:20:28 +02:00
ef89451a83
Display the storage limit in the drive
2017-05-02 17:14:53 +02:00
1d3b8188b3
Add mobile support in the slide app
2017-05-02 14:17:17 +02:00
d2e46d1378
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-02 11:04:14 +02:00
092b98d235
Fix the offset of the drag&select feature in the drive
2017-05-02 10:41:31 +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
538e85c080
Fix the context menu in the drive flowing off the screen if too long
2017-04-28 16:23:01 +02:00
841c9ee9de
don't close popup dialog when hitting enter if textarea has focus
2017-04-28 16:11:22 +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
d9b5eb8a97
Fix an issue with the right click triggering the select area
2017-04-28 15:43:05 +02:00
ef58120819
Prevent multiple concurrent clicks to get the history
2017-04-28 14:09:59 +02:00
38a115d8f8
feedback on anonymous drive
2017-04-28 14:08:17 +02:00
16f6ab813c
Make it clear that the number is the history represents a version
2017-04-28 13:06:55 +02:00
0ee228666b
Replace the IRC link by the Matrix one
2017-04-28 12:40:39 +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
e132ccf94a
prepare for upload
2017-04-28 11:45:53 +02:00
bf7c7c45d0
Add the storage limit warning in the toolbar
2017-04-27 18:46:46 +02:00
197b366712
Ability to drag&select in the drive
2017-04-27 17:01:56 +02:00
e2942f959b
add crypto for decrypting a chunked file
2017-04-27 12:56:42 +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
f196b836db
fix undefined reference
2017-04-25 16:17:52 +02:00
48973bccd6
add tests to assert for hash parsing
2017-04-25 16:11:19 +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
cc33c4abe9
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-24 15:41:46 +02:00
a5ca461a73
update footer for new version
2017-04-24 15:41:29 +02:00
fdd51ec18d
Don't remove a folder moved into unsorted or into itself
2017-04-24 15:38:03 +02:00
4b95a1da48
unbreak assert/translations
2017-04-24 14:32:56 +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
1af621bfe5
Merge remote-tracking branch 'origin/auth' into staging
2017-04-20 17:27:32 +02:00
3afaf029cb
feedback about how often we migrate an old drive
2017-04-20 17:06:09 +02:00
0e8b55edc0
Added an authentication page to allow getting the user pubkey
2017-04-20 10:15:07 +02:00
df9c312b7d
make new text translateable
2017-04-18 18:31:58 +02:00
e8b053e48b
use bootloader in feedback.html
2017-04-18 17:31:35 +02:00
a6dbfcecf3
remove old/unused assertions
2017-04-18 17:28:09 +02:00
b658bda421
use bootloader to fix paths to jquery and json.sortify
2017-04-18 17:24:46 +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
e0ecf651e2
add a note about showing pinned file usage
2017-04-18 12:23:58 +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
7a05462eb3
Some more poll changes <3
2017-04-14 19:34:58 +02:00
107e75b287
remove invalid semicolon
2017-04-14 19:24:20 +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
f6d6f81d55
send feedback when a user registers
2017-04-14 18:21:11 +02:00
deeb47c40b
reportAppUsage for settings
2017-04-14 18:19:04 +02:00
05785e96ea
small color change
2017-04-14 17:47:05 +02:00
5a83759ee2
add usage button to settings page
2017-04-14 17:18:17 +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
20c252e5c6
fix placeholder styling in safari
2017-04-14 12:45:45 +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
50277cb0ae
don't rely on 'info' in onRemote so we can call it anywhere
2017-04-13 19:46:38 +02:00
bf047fcf65
Merge pull request #110 from pbondoer/newpoll
...
Fix flash of autocomplete in poll
2017-04-13 19:43:30 +02:00
96ff487271
fix flash of content
2017-04-13 19:36:04 +02:00
5a7eea08c8
Merge pull request #108 from pbondoer/newpoll
...
Poll fixes
2017-04-13 18:04:13 +02:00
248f88034b
important fixes
2017-04-13 17:56:28 +02:00
633d60ccd0
Remove a TODO
2017-04-13 17:19:32 +02:00
6b57bb2bbb
poll: press enter to validate input
2017-04-13 17:09:31 +02:00
d483e10e77
poll fixes
2017-04-13 17:07:09 +02:00
81d83897ec
Rename hash.js
2017-04-13 17:04:15 +02:00
2ad0a65b71
Remove shortcuts that override browser actions
2017-04-13 16:43:07 +02:00
ea5301be13
poll improved(tm)
2017-04-13 16:31:57 +02:00
7434dbcb0f
what i have
2017-04-13 15:27:37 +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
f11cf8e6ac
move poll styles to separate file
2017-04-13 14:14:12 +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
9a46b58c85
deprecate this 90 days after f-release
2017-04-12 16:03:41 +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
74ea2fce5a
Fix lint error...
2017-04-10 19:18:46 +02:00
aa49c97d6e
Fix lint error
2017-04-10 19:13:36 +02:00
2c8d1b8183
jshint compliance
2017-04-10 19:12:22 +02:00
f0836f745e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-10 18:25:17 +02:00
528deb11da
Add missing file for whiteboard
2017-04-10 18:25:02 +02:00
cde9ea9887
update footer version
2017-04-10 18:09: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
d5e69653c0
Select opacity in draw mode in the canvas app
2017-04-10 17:03:50 +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
63a130c678
Add a button to delete the selection in canvas
2017-04-10 11:55:39 +02:00
33e19d5918
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-10 11:44:17 +02:00
126498585e
Add a context menu on the ROOT folder in the drive
2017-04-10 11:44:11 +02:00
be1db2a1ec
Ability to remove an object when draw mode is off
2017-04-10 11:28:41 +02:00
108ab7e9de
comment out a style assignment that doesn't seem necessary
2017-04-09 11:55:27 +02:00
8c629185e1
cleaner less file
2017-04-09 11:49:14 +02:00
0db141e48d
rename style files 'whiteboard' instead of main
2017-04-09 11:48:01 +02:00
395d8625a8
draw the palette on pad creation
2017-04-08 10:44:12 +02:00
3b99c42e22
no more inline styles
2017-04-07 22:05:31 +02:00
ef821c3e7e
integrate @lukevers improvements and clean up js a bit
2017-04-07 19:39:08 +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
09f8e139fe
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-07 15:20:39 +02:00
a2f692b9a3
clean up serverside and clientside pinning logic
2017-04-07 15:20:30 +02:00
a13261abaa
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-07 14:54:13 +02:00
dedf2b3c69
Display selected color and button to turn off draw mode in canvas
2017-04-07 14:54:02 +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
166e70f628
test new rpc apis
2017-04-07 10:32:26 +02:00
2a566671f2
remove outdated rpc example
2017-04-07 10:31:38 +02:00
3380cf0348
implement getTotalSize rpc
2017-04-07 10:09:59 +02:00
6e1ffcc18d
define better color palette
2017-04-06 18:45:40 +02:00
84029ac2d7
Fix the color picker in Chromium 53 and improve the cursor
2017-04-06 12:38:11 +02:00
5c292fb1fa
jshint compliance
2017-04-06 08:32:31 +02:00
b14d89360d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-05 19:00:13 +02:00
8e29e30a35
Realtime palette + cursor corresponding to the brush
2017-04-05 18:59:58 +02:00
8bbbf8e252
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-04-05 17:28:11 +02:00
64089c5f6b
implement pad pinning
2017-04-05 17:28:04 +02:00
d07acc5364
Don't redraw the drive if filesData changes while in unsorted
2017-04-05 16:08:39 +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
3484515283
enable more tests
2017-04-05 10:44:14 +02:00
3e47b8a38d
remove dead code
2017-04-05 10:42:24 +02:00
31b178a306
use pinpad api
2017-04-04 12:25:34 +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
4f7e25eeb9
show labels for brush width
2017-04-03 10:43:57 +02:00
2a6de5163b
jshint compliance
2017-03-31 18:54:50 +02:00
04069cc7f4
fix font size
2017-03-31 13:28:30 +02:00
1e51f89096
wipe the userdoc when the canvas is cleared
2017-03-31 12:01:52 +02:00
e2981c0223
try to make the color picker show the current color
2017-03-31 12:01:30 +02:00
96dac80bd5
better color picker in whiteboard
2017-03-31 11:02:59 +02:00
bd07b3a80f
less cramped styling on text inputs on /settings/
2017-03-31 09:36:22 +02:00
6e9968f989
add 'lol' code theme
2017-03-31 09:19:45 +02:00
b85324a29e
jshint compliance
2017-03-31 09:18:57 +02:00
73d4fd1700
handle reconnection attempts
2017-03-30 18:52:43 +02:00
b07248ad42
prompt with setName if name is unset
2017-03-30 18:52:20 +02:00
9b4b642d4a
protect against subtly corrupted user objects
2017-03-30 17:19:49 +02:00
18469edf18
extend list item rendering to support gfm task lists
2017-03-30 12:02:31 +02:00
055bc03092
strip carriage return
2017-03-30 12:00:46 +02:00
bca13ad5a5
add notifications to whiteboard
2017-03-29 18:57:46 +02:00
233bb7a14f
reorganize some html tags for smaller diffs
2017-03-29 18:38:06 +02:00
76471f7b90
add forget button to whiteboard and handle disconnection better
2017-03-29 18:35:52 +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
364dae2882
update templated html
2017-03-29 12:56:08 +02:00
ed89a13fe6
progress on adding version string to some css
2017-03-29 12:55:36 +02:00
4d5baa717d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-29 11:56:13 +02:00
76990ac1b2
version toolbar.css for cache-busting
2017-03-29 11:56:03 +02:00
9d3f859657
add a contextMenu entry for the whiteboard app
2017-03-29 11:55:24 +02:00
7ede430db3
Fix 'search.oldLocation is undefined' error
2017-03-28 14:26:41 +02:00
df7363f416
regenerate templated files for new footer
2017-03-28 11:50:42 +02:00
72fecb9549
Fix lint errors
2017-03-28 11:05:45 +02:00
af68e41fb6
Always set the focus to the search bar in the drive
2017-03-28 10:57:13 +02:00
67f4096396
Fix cursor in the drive search bar
2017-03-28 10:48:29 +02:00
12cc49b575
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-27 18:31:07 +02:00
72c60ec676
Add background to the whiteboard app
2017-03-27 18:30:48 +02:00
2732b7aa82
Fix module.onLocal not defined
2017-03-27 18:21:14 +02:00
a0c17d7c9b
latest rpc code
2017-03-27 18:15:15 +02:00
4ddf9b4e04
Improve whiteboard UI
2017-03-27 18:12:11 +02:00
89877baa69
Fix read-only mode in canvas app
2017-03-27 17:15:54 +02:00
c2cb24c072
Add toolbar to the whiteboard app
2017-03-27 17:08:44 +02:00
973aeba0da
remove bundled fabric.js
2017-03-27 12:48:54 +02:00
6eab52c33d
use secure fabric.js
2017-03-27 12:45:39 +02:00
59a80d5fde
remove silly TODO
2017-03-27 12:08:19 +02:00
ce5dbaeafd
use alertify instead of browser prompt
2017-03-27 12:00:21 +02:00
71c59d7ae2
Remove unnecessary TODOs
2017-03-27 11:53:13 +02:00
d92a875ce5
Translate the 'wrong application' error message
2017-03-27 11:34:54 +02:00
a8ffac5dcd
Remove old code
2017-03-27 11:30:09 +02:00
5322eff607
Use the current values for the checkboxes in the print options dialog
2017-03-27 11:23:51 +02:00
53c60a31f6
Set the properties and backup inputs to read-only in the drive
2017-03-27 11:14:37 +02:00
0c5a930cb9
Fix an issue with the 'Properties' entry not always displayed in context menu
2017-03-27 10:58:23 +02:00
3e9eb03e5a
display a user's public signing key in settings if it exists
2017-03-24 14:26:36 +01:00
912215185f
add uid to userdata for better notifications
2017-03-24 13:32:42 +01: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
e2ee80d4e7
set icon for whiteboard app
2017-03-23 16:16:24 +01:00
dbca94437e
rename canvas app to 'whiteboard'
2017-03-23 16:16:00 +01:00
994d640f8b
Fix an issue causing the lag icon to lose its color
2017-03-21 14:52:49 +01:00
819c7e3bae
Fix style issue with drag&drop in the active folder
2017-03-21 14:49:02 +01:00
6fbd1f0028
Store the dates as number and not strings to avoid ot issues
2017-03-21 14:46:40 +01:00
8556ce9d17
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-21 12:45:53 +01:00
8ce8401107
Fix issues with middle click in context menus
2017-03-21 12:45:39 +01:00
5f4990cc80
Display or hide the context menu in a more intuitive way with multiselect
2017-03-21 12:37:45 +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
2b2e581779
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-21 11:47:27 +01:00
2e8484ad4c
notes about what to improve. transform json on OT instead of just validating
2017-03-21 11:47:11 +01:00
7afde2309d
Add properties to the files not in the trash
2017-03-21 11:34:18 +01:00
61d33f2dd6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into prop
2017-03-21 10:44:10 +01:00
66a80ea50c
Add properties for pads in the drive
2017-03-20 18:59:27 +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
eeecb1baab
Make Canvas Work Again
2017-03-20 18:01:13 +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
85105a1382
Active folder in drive is not underlined anymore
2017-03-20 14:16:44 +01:00
cd77f50717
Fix transitions in slides, add swipe event handlers, and fix print in firefox
2017-03-20 12:50:46 +01:00
e139295d7e
Add transitions in present mode
2017-03-17 18:39:39 +01:00
45ac3e40a2
Copy print options to present mode
2017-03-17 18:03:00 +01:00
a5f11d0d0d
Uniform the slides rendering in present and print mode
2017-03-17 15:30:27 +01:00
d422c7e165
support old hashes in getUserChannelList
2017-03-16 17:14:54 +01:00
7d5ff27900
better rpc tests, sum up your channel usage
2017-03-16 17:03:45 +01:00
5ed6223313
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-16 14:47:03 +01:00
7f2f1f7191
correctly initialize RPC object
2017-03-16 14:46:55 +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
f98c825dc3
Fix keyboard shortcuts not working in CryptDrive
2017-03-16 14:43:00 +01:00
7b27f1dc2c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-16 14:16:54 +01:00
7761aaa89f
Add search UI
2017-03-16 14:16:42 +01:00
b578803136
clean up registration code a little bit
2017-03-16 10:37:16 +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
9a32fb1999
Fix sub-folders changing position in the tree when renaming them
2017-03-15 17:34:06 +01:00
931f7619c0
Keep the scroll position on redraw in drive
2017-03-15 17:30:52 +01:00
0607c3bbf3
Add a title to the 'new' button in drive
2017-03-15 17:20:08 +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
a286599f93
Fix fast reconnect, and add support for reconnecting ws in polls
2017-03-15 16:01:00 +01:00
bd9efd7c04
provide examples of valid and invalid rpc calls
2017-03-15 15:56:32 +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
fe5e33a0ee
Fix loss of presentation position when updating slides
2017-03-14 15:42:42 +01:00
805e26bc07
add a version footer to main pages
2017-03-14 14:34:13 +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
5d88c3a436
newer registration code
2017-03-14 12:00:23 +01:00
10bb11bff6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-13 19:32:15 +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
84c16c00ad
Fix click events not working on inputs in the drive tree
2017-03-13 15:53:13 +01:00
07a2d8e189
apply translations on feedback page
2017-03-13 12:56:49 +01:00
ca9faa0056
Fix wrong translation keys
2017-03-13 11:52:48 +01:00
b7986ff6b1
Replace the spinner code with a font awesome spinner
2017-03-13 11:52:39 +01:00
6e733b1329
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-13 10:59:20 +01:00
d9996cc874
current work for pinning
2017-03-13 10:56:08 +01:00
a7d61aa562
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into accounting
2017-03-10 18:04:07 +01:00
b3cc8da315
implement basic clientside RPC infrastructure
...
and provide a basic example for testing it
2017-03-10 18:03:52 +01:00
f94db93897
Improve the slides layout in print mode
2017-03-10 16:46:36 +01:00
81027b4200
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into accounting
2017-03-10 10:49:33 +01:00
2392167996
Export slides as PDF
2017-03-09 19:05:44 +01:00
4bac8ea0c7
Draw all the slides at once to allow reference links ( fix #77 )
2017-03-09 12:41:23 +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
a8d200ef2e
Don't redirect until realtime is synced when logging in
2017-03-08 16:15:31 +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
ce6cd1211e
Fix lint errors
2017-03-07 15:33:08 +01:00
aa762e7d63
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-07 15:33:01 +01:00
8a48612de2
add some notes for later
2017-03-07 14:40:06 +01:00
9ad33574e9
Fix the function returning the pads list in the drive
2017-03-07 14:30:07 +01:00
14938089ac
Keep the focus on the iframe window after canceling a deletion
2017-03-07 14:24:06 +01:00
3f7dea8f7e
Context menu support for multi-select options in drive
2017-03-07 12:22:02 +01:00
e1c02fd8a4
Drive rename: save pads and folders name on click, cancel with Esc.
2017-03-06 18:15:14 +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
c04819538b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-03 18:16:39 +01:00
fcb9848b3a
hide toolbar when in read-only mode
2017-03-03 18:16:34 +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
27241488a5
Merge pull request #96 from pbondoer/css
...
(CSS) Some improvements to drive
2017-03-03 16:33:20 +01:00
6c9da646e0
(CSS) Some improvements to drive
2017-03-03 16:26:08 +01:00
08c862b271
add FIXME notes to poll
2017-03-03 16:13:32 +01:00
ed9bcca96f
Close the websocket network when CryptGet/CryptPut is done
2017-03-03 12:48:00 +01:00
a68acac13b
Only ask for a display name once in /poll
2017-03-03 12:07:16 +01:00
a978b51656
If display name is empty, use anonymous in the drive
2017-03-03 12:06:35 +01:00
153386a6e0
CSS improvements in the drive tree
2017-03-02 18:24:18 +01:00
6098f28260
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-02 18:16:20 +01:00
a852112808
Fix open folder from the tree context menu
2017-03-02 18:16:16 +01:00
2c9deed381
Merge pull request #94 from pbondoer/staging
...
Some CSS fixes
2017-03-02 18:15:30 +01:00
868161a8a8
fix undefined reference in code
2017-03-02 17:59:59 +01:00
0bb10a8a0a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-02 17:59:35 +01:00
800db07077
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
2017-03-02 17:44:29 +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
e39fe1c0b7
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
2017-03-02 17:09:39 +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
2b6e44189d
When trying to reset the drive, tell the user if the input text is invalid
2017-03-02 17:01:27 +01:00
9a7c2dd5e2
Add a 'settings' link to the user menu in static pages
2017-03-02 16:38:22 +01:00
370ae81106
Use the display name in the backup file name if not logged in
2017-03-02 16:29:17 +01:00
e0d972674f
Fix context menu in drive and rename textbox styling
2017-03-02 16:22:32 +01:00
c5f983ecd7
Convert read-only link to editing link in the drive
2017-03-02 16:01:34 +01:00
d26d8f53d9
(CSS) Fixed textarea being too large
2017-03-02 15:50:03 +01:00
a9afa24428
return empty string instead of blowing up when fixing HTML
2017-03-02 11:38:20 +01:00
6b8d0c8bc7
Merge branch 'security2' of git.xwikisas.com:xwiki-labs/cryptpad into security2
2017-03-02 10:53:48 +01:00
b32d698291
Fix issue with present mode in slide (readonly)
2017-03-02 10:53:45 +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
53f4f8826e
Merge branch 'staging' into staging
2017-03-01 16:32:18 +01:00
55210f17eb
Clean the code to be less dependant on 'li'
2017-03-01 16:15:48 +01:00
3e9c4d0901
Add hover to file manager tree
2017-03-01 15:57:22 +01:00
cbdfae09a6
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
2017-03-01 15:53:48 +01:00
c6c3e1bbb5
Don't select subfolders in the tree when drag&drop
2017-03-01 15:53:31 +01:00
d605fc757b
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
2017-03-01 15:46:49 +01:00
a26b9d3240
Don't select subfolders in the tree when right-click on drag&drop
2017-03-01 15:46:10 +01:00
cb5e01815c
validate all alertify strings by default. require 'force' argument to bypass
2017-03-01 15:07:34 +01:00
b0323f6fd9
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
2017-03-01 14:45:18 +01:00
a2b5200381
Add a container for the folders in the tree in the drive
2017-03-01 14:44:43 +01:00
412815b042
Merge branch 'security' of git.xwikisas.com:xwiki-labs/cryptpad into security
2017-03-01 13:10:55 +01:00
11d54256da
Make sure the display name is displayed in the same way everywhere
2017-03-01 13:10:06 +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
639376f1cb
don't use hyperjson.toString
2017-03-01 12:36:10 +01:00
eb9a39eb68
Add hover on elements in drive and make grid slightly prettier
2017-02-28 23:15:47 +01:00
f130fd0598
Fix horizontal scrollbar in edge
2017-02-28 18:02:12 +01:00
345d2faab2
Fix horizontal scrollbar in Edge #3
2017-02-28 17:13:51 +01:00
d683dc499a
Fix horizontal scrollbar in Edge #2
2017-02-28 17:03:23 +01:00
7a0a87bf6c
Fix horizontal scrollbar in Edge
2017-02-28 16:38:51 +01:00
f06196c261
Remove the context menu buttons when removing selection
2017-02-28 15:48:49 +01:00
c0278ba77f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-28 13:12:53 +01:00
efb7380a12
Fix default pad not created after registration
2017-02-28 13:12:27 +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
0224d6489b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-28 11:06:50 +01:00
12aec60a12
hack around onSettle not doing its job
2017-02-28 11:05:59 +01:00
0ae7f94184
Remove the pointer and text underline on icon:hover in drive
2017-02-28 10:50:52 +01:00
69b6f80e4b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-28 10:47:23 +01:00
86adfbf27d
update cache-busting directive in all supported apps
2017-02-28 10:47:18 +01:00
cfc9f2e622
remove code for 'user' app, now that we have login and register
2017-02-28 10:46:21 +01:00
ec7761eeb8
Make sure we don't use a wrong title for a new pad
2017-02-28 10:43:36 +01:00
8e7e1d336e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-28 10:39:53 +01:00
96f6b5755d
Add the blog link in the header and footer
2017-02-28 10:39:48 +01:00
d49a7d7ec4
fix undefined reference
2017-02-28 10:30:24 +01:00
9a2ed5741a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-27 20:11:26 +01:00
a4913f2f4b
provide UI for disabling the user feedback api
2017-02-27 20:11:18 +01:00
1a259bb3aa
check if user has disallowed feedback api
2017-02-27 20:02:54 +01:00
4f7a05ead2
Fix issue with the path for the trash in the drive's topbar
2017-02-27 18:37:44 +01:00
8741b50f5b
Set the file name as default title if a pad is created from the drive
2017-02-27 18:15:18 +01:00
e8c73f35ce
In the tree, display the rename input only once
2017-02-27 17:50:58 +01:00
e38df7ce47
Fix creation of new pads in /pad
2017-02-27 17:47:11 +01:00
20518a3e88
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-27 17:23:40 +01:00
f8d653406a
Add the new content for the default pad and add french translation
2017-02-27 17:23:28 +01:00
d15a08830e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-27 14:32:04 +01:00
06f0891d21
add allowUserFeedback toggle to settigs page
2017-02-27 14:31:56 +01:00
498f4065cf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-27 14:29:55 +01:00
95853debf9
Update the default pad #1
2017-02-27 14:29:48 +01:00
d4bf7cf9aa
Send the initial state only if it is a new pad in /pad
2017-02-27 14:29:38 +01:00
66dc166936
Make sure the realtime is synced with onSettle when using cryptget
2017-02-27 14:28:12 +01:00
fadddb297c
Readonly mode in /pad had contenteditable set to true
2017-02-27 12:41:29 +01:00
de5a21fe57
add a simple feedback api and text explaining what it is
2017-02-27 12:06:49 +01:00
2ad9debe58
Remove the placeholders in /code and /slide
2017-02-27 11:45:23 +01:00
38893fb8e5
Remove the 'Bootstart tooltips require Tether' error
2017-02-27 11:19:29 +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
02cc9c8344
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-24 16:18:54 +01:00
e040c00557
Fix blocker issue when creating an account without migrating
2017-02-24 16:18:41 +01:00
e15a6a347f
Fix the forget pad button
2017-02-24 15:22:26 +01:00
89bee8cf6b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-24 12:08:26 +01:00
ba3e24b595
media tag experiments
2017-02-24 12:08:16 +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
55fb0f03ae
Fix the path in the drive overriding the content area
2017-02-24 11:01:33 +01:00
d7d7165dc4
Login page was using a wrong translation key
2017-02-23 18:19:33 +01:00
ba0b314f5e
Fix the 'new' button in drive which was broken in non root categories
2017-02-23 18:15:44 +01:00
d8cc2903cc
Display context menu actions in the toolbar when an element is selected
2017-02-23 17:25:25 +01:00
a0340f1419
Open link in a new tab in /pad
2017-02-23 14:27:18 +01:00
2d30393243
Add support for updated translation key
2017-02-23 11:45:00 +01:00
cc174f3bee
Fix typo
2017-02-22 12:26:25 +01:00
bdc00a2413
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-22 12:25:48 +01:00
0ce17ebbad
CryptDrive usability improvements (new file in drive + context menu)
2017-02-22 12:25:29 +01:00
e73b4a1131
Don't display 'All files' in the menu
2017-02-22 11:15:29 +01:00
89f3577058
remove old poll
2017-02-22 11:05:47 +01:00
7e77c6828a
more correct pluralization
2017-02-21 18:55:48 +01:00
3d0e7cb9a7
pull ckeditor config out of main.js
2017-02-21 18:21:30 +01:00
328e5c6f03
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-21 17:43:05 +01:00
c72bbd4c37
Use the file name as initial title
2017-02-21 17:42:58 +01:00
4cbb3b2ed2
Ensure we use English for reference
2017-02-21 14:53:18 +01:00
ffe17a6bc9
Use JSON.stringify instead and fix linter
2017-02-21 14:37:08 +01:00
a84f8e2808
Assert translation now outputs JavaScript which is easier to edit for translators
2017-02-21 14:23: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
454d1c2052
Do not load all the translations anymore, only the needed one
2017-02-20 18:29:06 +01:00
434c3a220c
Remove old translation keys #2
2017-02-20 16:15:13 +01:00
d81d17b86c
Remove old translations keys no longer used
2017-02-17 17:39:27 +01:00
9702305abc
Use better translation keys in settings
2017-02-17 17:38:59 +01:00
a6497f7a52
Add a way to show the drive tips again
2017-02-17 16:56:59 +01:00
c17f28e5fe
Fix race condition #2
2017-02-17 15:39:34 +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
dd014f6ef2
Fix race conditon
2017-02-17 15:16:03 +01:00
94417d9a8b
jshint compliance
2017-02-17 14:28:18 +01:00
8167ed9048
implement cache-busting everywhere
2017-02-17 12:39:01 +01:00
34b6507fa3
implement cache-busting everywhere
2017-02-17 12:38:58 +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
550c65aae0
Add a default pad in CryptDrive after signing up
2017-02-16 18:10:12 +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
0e76b18278
Hide the links in the html topbar on small screens
2017-02-15 14:23:56 +01:00
7758d056fa
Ability to import/export a user realtime object
2017-02-15 12:40:28 +01:00
0a43570990
Add the new files for the settings app
2017-02-14 19:07:17 +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
25dd103f6f
Reduce font-size for register explanations
2017-02-13 12:54:34 +01:00
7d0c29513c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-13 12:42:17 +01:00
7d21206cae
add registration introductory text
2017-02-13 12:42:07 +01:00
2851ceb95a
Merge branch 'soon' into staging
2017-02-13 11:59:49 +01:00
2807ad9dc3
Add spinner and translate the register page
2017-02-13 11:41:48 +01:00
562e5b8c70
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-13 11:17:16 +01:00
5d4d530c89
switch registration text to an explanation of how login works
2017-02-13 11:17:00 +01:00
bff9d05210
Make sure the login_name is in the object
2017-02-13 11:15:30 +01:00
b1b294aade
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-13 11:10:40 +01:00
20083264b2
load fontawesome icons on register page
2017-02-13 11:09:44 +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
3b1bd2f720
use additional translation keys for registration
2017-02-13 10:15:25 +01:00
b5b2454f0b
use bootstrap for login and register pages
2017-02-10 18:29:49 +01:00
c556f78562
log in directly from home page, sign up at /register/
2017-02-10 16:49: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
88af104ce8
basic registration page to replace user page
2017-02-09 18:50:28 +01:00
a995df25f6
disable new OT in pad and code app
2017-02-09 17:20:13 +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
d54262c8df
Use the same disconnecter error translation key for all the apps
2017-02-09 15:34:14 +01:00
f8366e0cfc
Remove support for legacy store and add a way to import legacy pads
2017-02-09 15:23:09 +01:00
342cb44cf7
Ability to migrate a anon drive directly from the drive
2017-02-09 12:58:08 +01:00
c642bce984
restore disabled listener
2017-02-09 10:31:00 +01:00
67d881b2cf
Remove the drive entry from the user menu if already in drive
2017-02-08 16:25:52 +01:00
e865b89f43
Add the contextmenu button in the drive dynamically
2017-02-08 15:41:50 +01:00
3af7c9cff8
Replace the expand/collapse ckeditor button by our own to save space
2017-02-08 15:32:55 +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
dae17588c6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-07 18:27:28 +01:00
32a5c5ff62
better integration between /user/ and home
2017-02-07 17:50:37 +01:00
fe7ba98338
remove dead code from /user/
2017-02-07 17:50:02 +01:00
9b047bfb53
don't autocorrect usernames. add trailing slash to /drive
2017-02-07 17:28:32 +01:00
6e97082ff9
remove dead code from login function
2017-02-07 17:27:36 +01:00
b3e73b0f0b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-07 16:49:31 +01:00
367a02c031
Add mobile support for the code app
2017-02-07 16:49:25 +01:00
628148d001
Display the contextmenu button only if contextmenu exists
2017-02-07 13:09:14 +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
7e7d1f7a16
Display the error when opening a document with the wrong app
2017-02-06 12:43:56 +01:00
6f0d33dc1d
Fix missing placeholder in the Slide app
2017-02-06 12:14:33 +01:00
7d6e15e465
Throw an error when trying to open a document with the wrong app
2017-02-06 12:06:39 +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
fbbf8a2829
Replace initialState by a placeholder in slide and code
2017-02-03 18:45:30 +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
f57c8c0e4b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-02 18:40:45 +01:00
2c6b4b9c6a
Hide disabled applications from the context menu in drive
2017-02-02 18:40:39 +01:00
85b49d5ec8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-02 18:37:09 +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
72c4175b6f
remove slide/oldmain.js
2017-02-02 14:44:43 +01:00
e607ba5dad
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-02 11:33:44 +01:00
9cea8d82c2
Fix left-click disabled in Edge after renaming a file
2017-02-02 11:33:37 +01:00
2dfe182d8d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-02 11:27:17 +01:00
0ca1775657
add page for listing missing translations
2017-02-02 11:27:08 +01:00
6a5769405b
Fix a race condition issue introduced with reconnecting patch
2017-02-01 18:48:30 +01:00
8881334ca8
Fix renaming folders from the tree
2017-02-01 17:46:05 +01:00
65054119cf
Fix a bug preventing reconnection in drive
2017-02-01 17:21:54 +01:00
89da142204
Fix pad creation from the context menu
2017-02-01 15:52:47 +01:00
757ae7a3ad
Fix a cross origin frame issue with dropdowns
2017-02-01 12:19:54 +01:00
3321d01040
add background image
2017-01-31 19:48:55 +01:00
8427b6ae8e
Fix 'sort by type' in drive
2017-01-31 17:00:30 +01:00
39c85ca3f7
Fix race condition causing missing translations in homepage
2017-01-31 12:01:33 +01:00
dc39c4e179
Fix a race condition causing the drive toolbar to be missing
2017-01-31 11:50:20 +01:00
2e247d44c7
Hide the backup icon when logged in
2017-01-31 10:59:23 +01:00
8ed593bfff
Keep the anon drive when signing up
2017-01-31 10:46:41 +01:00
5e69b78334
Remove the domain from the href in store
2017-01-30 18:52:27 +01:00
a9c9d19212
Hide the template from the list in the drive until it's done
2017-01-30 17:46:08 +01:00
487650df78
Remove the remember me checkbox
2017-01-30 15:32:42 +01:00
58d8a30b5b
Redirect to the main page when logging out
2017-01-30 15:26:32 +01:00
29578a7400
Merge branch 'hpbs' into newtoolbar
2017-01-30 14:45:02 +01:00
2d79649949
Fix the 'NoScript' bug with the drive
2017-01-30 12:28:21 +01:00
5ef074370b
Name a place before creating it in the drive
2017-01-27 17:51:08 +01:00
02906b3945
Merge branch 'newtoolbar' of github.com:xwiki-labs/cryptpad into newtoolbar
2017-01-27 16:57:22 +01:00
a4286f1c83
Merge branch 'soon' into newtoolbar
2017-01-27 16:52:49 +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
fa1582f307
Replace 'filename' by 'title' in drive when there is no filename
2017-01-26 16:43:26 +01:00
c44f3a1044
Delete multiple elements could also remove unselected ones
2017-01-26 16:18:43 +01:00
b79e1e48c7
Update colors in drive
2017-01-26 14:52:34 +01:00
fb48484d2a
Fix the rename feature in drive not working with tables
2017-01-26 14:51:59 +01:00
3f44444f41
Display the 'New' button in the trash
2017-01-26 13:19:40 +01:00
00efc96919
Move the toolbar and add a breadcrumb
2017-01-26 12:56:19 +01:00
6f5ff07c2b
Display the elements as a table instead of a list
2017-01-25 18:33:59 +01:00
95056315cf
Move the folder icon style to the less file
2017-01-25 17:29:06 +01:00
8c7305bf1b
Use less to write the drive stylesheet
2017-01-25 16:21:46 +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
75f1eed712
Merge branch 'newtoolbar' into hpbs
2017-01-25 10:21:50 +01:00
373b07ed28
Fix lint errors
2017-01-25 10:21:31 +01:00
097f78d777
Merge branch 'newtoolbar' of github.com:xwiki-labs/cryptpad into newtoolbar
2017-01-25 10:01:49 +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
8ccd845d52
Merge branch 'newtoolbar' into hpbs
2017-01-24 12:54:32 +01:00
ce1e792419
Merge branch 'soon' into newtoolbar
2017-01-24 12:54:07 +01:00
9d275daebb
Backport changes for the login page from hpbs branch
2017-01-24 12:47:53 +01:00
a5c03c1540
Make sure data is migrated before leaving registration page
2017-01-24 12:38:06 +01:00
69fb8b4d2f
Merge branch 'master' into soon
2017-01-23 15:13:26 +01:00
f8455875a9
Fix the NoScript (iframe not loaded) bug with inner iframes
2017-01-23 15:07:38 +01:00
c77abfa7f4
Remove a second scrollbar in polls
2017-01-23 11:05:13 +01:00
5e36d9ea29
Fix polls table not updated with local events
2017-01-23 10:53:01 +01:00
39ca2e6dd6
Fix bootstrap conflict with context menus
2017-01-23 10:52:37 +01:00
d1bed5ae4b
Fix polls table not updated with local events
2017-01-23 10:51:44 +01:00
26bea774cb
Merge branch 'newtoolbar' into hpbs
2017-01-19 15:52:12 +01:00
99b8898e54
Apply new title when clicking on the page without pressing enter
2017-01-19 15:41:25 +01:00
ea8667302c
Display only a placeholder when the poll title is default
2017-01-19 15:35:38 +01:00
7d66d391fc
Merge branch 'newtoolbar' into hpbs
2017-01-19 15:17:30 +01:00
1e1bfd275c
Don't show the tab notification when someone has joined the pad
2017-01-19 15:17:21 +01:00
5d5d03163e
Add favicon and notifications in polls
2017-01-19 14:52:12 +01:00
3338000018
Add Esc and Arrow icons in the slide's present mode
2017-01-19 12:49:40 +01:00
efdae19f0c
Update the lists in the code and slide toolbars to use the new dropdown
2017-01-19 12:14:14 +01:00
36c8ade26c
Update the lists in the code and slide toolbars to use the new dropdown
2017-01-19 12:13:57 +01:00
fa8a0d5880
Merge branch 'newtoolbar' into hpbs
2017-01-19 10:53:55 +01:00
69bee7d79a
Add data into the homepage
2017-01-18 18:02:32 +01:00
88d5b4cc9c
Add a 'New pad' button in the toolbar
2017-01-18 11:00:46 +01:00
73d424b506
Improve the login UI (css and translations)
2017-01-17 16:21:12 +01:00
e006ed7076
Ability to log in from the main page
2017-01-17 11:52:44 +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
70b73206b7
Merge branch 'brandones-master' into soon
2017-01-13 10:33:38 +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
b5acdb8cc0
Disable zooming on mobile
2017-01-12 18:50:39 +03:00
40985f1811
Dubious height setting for iOS
2017-01-12 18:49:46 +03:00
52d8d8db1d
Get rid of margins on mobile
2017-01-12 18:49:46 +03:00
cd0931c951
UI improvements for mobile browsers
2017-01-12 18:49:46 +03:00
6352656737
Remove the default context menu in the entire drive
2017-01-12 15:55:35 +01:00
ed79b8870c
Merge branch 'master' into soon
2017-01-12 15:37:48 +01:00
605072cfbf
Fix empty title with new documents
2017-01-12 15:15:10 +01:00
4963c77b61
Fix the title reset bug
2017-01-12 14:29:40 +01:00
35a853ffff
Stop failing tests over missing translations because otherwise they'll almost never be passing.
2017-01-12 12:06:44 +01:00
3f1e287811
Fix an issue causing a user object to be turned into a pad
2017-01-12 11:09:45 +01:00
994f6991c8
Merge branch 'master' into soon
2017-01-11 18:01:08 +01:00
6c5e8d3118
Safari is really the best browser in the world, even though you have to stick a screwdriver in it to get it to start up
2017-01-11 18:00:41 +01:00
569ea21705
Replace the language selector by our custom dropdown menu
2017-01-11 10:59:09 +01:00
33b8de888e
clean up unused files
2017-01-11 07:49:56 +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
63b9d4e9fd
remove path for backwards compatibility
2017-01-10 10:54:08 +01:00
f74d0a46a4
Remove the alert when pressing del in 'all files'
2017-01-09 18:38:05 +01:00
b39067d2a1
jshint compliance
2017-01-09 18:07:45 +01:00
74a12f50ac
only migrate keys which don't already exist
2017-01-09 17:35:58 +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
a3cd100c94
apply yflory's safari patch
2017-01-09 11:46:51 +01:00
0373556475
support old hashes in /poll
2017-01-09 11:46:21 +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
bf764d26e7
Merge branch 'staging' into workgroups
2017-01-06 11:17:17 +01:00
3836b20b08
enable the file store
2017-01-06 11:16:56 +01:00
b0d4dad417
Fix creation of a new file manager object
2017-01-05 18:43:00 +01:00
5a8f0df19e
Add support for reconnecting websocket
2017-01-05 18:42:18 +01:00
b33661d9d5
don't toggle maximization state after setting
2017-01-05 15:21:17 +01:00
e56cc49f79
catch errors that popped up because of a cross-origin iframe
2017-01-05 14:14:26 +01:00
5080751a90
hide unnecessary scrollbar
2017-01-05 10:58:10 +01:00
95617a11c8
fix broken paths in old poll
2017-01-05 10:57:13 +01:00
7a0442afe0
Drag and drop files into a workgroup
2017-01-04 18:24:20 +01:00
05a956879a
prepare new poll app for release
...
move old poll into poll/old
2017-01-04 15:48:50 +01:00
5cd714b18a
configure filestore usage via customize/application_config.js
2017-01-03 12:10:11 +01:00
2b5085625c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-01-02 15:43:06 +01:00
69b1764c9d
Missing entries in the context menu with users
2017-01-02 15:42:29 +01:00
c6499d6789
make panel styles reusable
2016-12-30 15:30:35 +01:00
34967ac354
encapsulate rendering functions so we can pass in cryptpad-common
2016-12-30 13:27:01 +01:00
66b8c93205
remember time of first visit
2016-12-30 13:23:09 +01:00
ba4df1a22c
create examples directory with old prototypes
2016-12-30 13:22:15 +01:00
0abf45bdc5
better fsStore debugging
2016-12-30 12:27:58 +01:00
e3f79f914a
fix user hash
2016-12-29 18:12:30 +01:00
d232a5a83e
Revert "simplify key generation and remember user's additional keys"
...
This reverts commit 75786ff9ff
2016-12-29 17:51:58 +01:00
91a806ab86
focus on OK button when we pop an alert
2016-12-29 17:10:59 +01:00
850bd42149
don't try to display things that don't exist
2016-12-29 17:05:28 +01:00
75786ff9ff
simplify key generation and remember user's additional keys
2016-12-29 17:04:48 +01:00
621476424d
make strings translatable and refocus on correct input
2016-12-29 17:04:01 +01:00
a97696c712
show user's display name and account name
2016-12-29 17:03:17 +01:00
3560f0580f
commit prototype upload script
2016-12-28 17:23:57 +01:00
2f9f3d921a
trim excess whitespace from usernames
2016-12-28 17:13:41 +01:00
89e5830409
make alertify display time configurable
2016-12-28 17:13:00 +01:00
49d80d91d9
don't load customize/pad.js anymore
2016-12-28 15:53:27 +01:00
f020fd5a75
remove /customize/pad.js from main apps
2016-12-28 15:12:22 +01:00
aae443c8e9
replace old poll app with new
2016-12-28 11:44:48 +01:00
387f4ebf5d
add this important js file I forgot
2016-12-28 11:01:14 +01:00
8f0de589dc
add missing cp class to more html
2016-12-28 10:45:14 +01:00
e9376a66c2
apply 'cp' class for unified styles
2016-12-27 14:29:20 +01:00
8b034a9554
better flow and animations for login page
2016-12-27 12:32:20 +01:00
db12b5e896
move text for login page into translation file
2016-12-27 12:31:16 +01:00
5e1d8292c5
guard against trying to parse special fragments
2016-12-26 14:23:17 +01:00
51067430f9
more restructuring of user app
2016-12-26 14:19:29 +01:00
a4ed2388e2
use 'box' class
2016-12-26 14:19:02 +01:00
eb620bee77
restructure user application
2016-12-26 14:17:39 +01:00
a10eac2773
Fix lint errors
2016-12-22 18:16:38 +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
63cd5c16ac
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login
2016-12-22 17:20:30 +01:00
81259fc25f
Refresh unsorted and templates when files data changes
2016-12-22 17:20:05 +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
acfc27f5c5
fix merge conflicts
2016-12-22 16:53:03 +01:00
3197b62fbb
latest work
2016-12-22 16:44:49 +01:00
29d406b7a9
implement cryptput
2016-12-22 16:00:13 +01:00
84d5e4b35d
better tools for playing with template code
2016-12-22 11:03:44 +01:00
1772cc93c8
Fix the taildoc bug
2016-12-22 11:02:12 +01:00
87abfff66b
Fix Flash Of Unstyled Content (fouc)
2016-12-21 18:33:21 +01:00
86cda4357b
handle more possible cases
2016-12-21 18:24:48 +01:00
1682d23c1c
remove old user prototype
2016-12-21 18:06:05 +01:00
046220f239
Add info boxes for the different categories
2016-12-21 11:46:49 +01:00
403ba53980
Fix typo error
2016-12-21 10:22:48 +01:00
e9418af88b
Add an info box in the file manager
2016-12-20 18:59:50 +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
f9db7e588e
Fix unused backup in localStorage
2016-12-20 14:37:29 +01:00
c7e63f63fd
Use the user object in file manager if it exists
2016-12-20 11:30:04 +01:00
6778a7062d
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into staging
2016-12-20 11:23:54 +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
dfea802c77
better crypto hygeine, start thinking more about ui
2016-12-20 11:09:41 +01:00
e3f484d876
File manager in the home page, lint
2016-12-19 17:53:03 +01:00
7df460c766
implement createChannelId api
2016-12-19 14:55:39 +01:00
3698fe8b0e
Merge branch 'soon' into login
2016-12-19 12:51:57 +01:00
5a14db9f07
Merge branch 'test-filemanager' into login
2016-12-19 12:37:28 +01:00
dd46b9425a
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager
2016-12-19 12:37:02 +01:00
4646d5c866
Add suport for read-only mode in the file manager
2016-12-19 12:35:13 +01:00
2a624a0b60
add example usage for cryptget.js
2016-12-19 12:25:36 +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
8a7fda6341
Merge branch 'soon' into login
2016-12-16 18:10:35 +01:00
a220742f68
fix reversed color settings
2016-12-16 15:31:22 +01:00
308db7fa79
fix uncolored /pad/ content in IE
2016-12-16 15:25:06 +01:00
67baf30d65
basic outline of logins
2016-12-16 15:19:17 +01:00
2968488278
convert uint8 arrays to hex
2016-12-16 15:18:06 +01:00
d95a3ac92e
Fix an issue when deleting a key from the proxy
2016-12-16 11:41:45 +01:00
82f3d5f852
Open the file manager of someone else
2016-12-13 18:59:04 +01:00
c0d96fb10d
Merge branch 'login' into test-filemanager
2016-12-13 11:21:18 +01:00
c3e3aa69c3
Merge branch 'fileManager' into fmIndex
2016-12-12 18:27:19 +01:00
5d335ba796
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager
2016-12-12 18:25:07 +01:00
8e6830d080
Fix file manager with a chosen hash
2016-12-12 18:24:45 +01:00
2b077a8e95
add the file manager in the main page
2016-12-12 18:03:06 +01:00
f36d15d0db
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager
2016-12-12 18:03:00 +01:00
b7f2ef97c7
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into fileManager
2016-12-12 12:05:31 +01:00
fdb5c2ddb5
Fix UI issues with rename and delete actions
2016-12-12 12:03:54 +01:00
319ce5d8c8
Fix the code app
2016-12-12 10:35:28 +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
5cd7d8ec84
Fix undefined userid in new poll
2016-12-08 10:19:23 +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
b7b4a034a3
Merge branch 'soon' into newpoll
2016-12-07 16:58:28 +01:00
ddc99cecb1
Fix lint errors
2016-12-07 12:22:27 +01:00
f26cdb1a21
Fix UI issues, unclickable user column, add confirm dialog
2016-12-07 11:44:09 +01:00
6feb8548b3
Prevent the proxy handlers from being called on the parents
2016-12-07 11:12:35 +01:00
740b6e955e
Improve UI, fix issues with the table
2016-12-06 18:55:10 +01:00
94fbc2dca4
prototype cryptographic login
2016-12-06 17:34:24 +01:00
a23b3d3517
use new ot in code too
2016-12-06 16:22:58 +01:00
de0863e232
use new ot
2016-12-06 16:22:42 +01:00
4cd9bd5534
strip listeners
2016-12-06 16:21:11 +01:00
b79618c94a
don't allow listeners in /slide/
2016-12-06 16:00:38 +01:00
ebff304602
turn off some unwanted behaviour
2016-12-06 15:16:43 +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
3632834500
Lock inputs when the user is not editing them
2016-11-30 18:39:19 +01:00
eaeaf4df40
Improve UI, add title input and forget button
2016-11-29 18:57:31 +01:00
bca746bbb5
Fix uncommitted column, add toolbar
2016-11-28 18:38:06 +01:00
ffedcb63f7
Display own column at the beginning, add uncommitted column
2016-11-25 18:17:03 +01:00
4a4d4a0474
most recent work
2016-11-25 12:02:58 +01:00
e5ff7020fb
move buttons out of form
2016-11-25 12:02:37 +01:00
c88fa34558
Improve UI, fix issues with new file manager channels
2016-11-24 18:58:29 +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
19e4a2d044
Create new files, sort displayed elements
2016-11-22 18:31:49 +01:00
a957b72598
Create a new pad from the file manager
2016-11-21 18:49:13 +01:00
4fcdece4af
Test create new pad from the file manager
2016-11-18 17:42:07 +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
aa14ea7ac4
Use the old store format
2016-11-16 18:11:44 +01:00
da19608269
Translate the context menus, Shift+Del shortcut and realtime object
2016-11-16 17:11:48 +01:00
7a035fa4a0
Fix drag and drop with multiple elements selected
2016-11-15 18:15:54 +01:00
d77970975c
Add translations, ability to select multiple elements, clean the code
2016-11-14 18:41:42 +01:00
eb50177201
do a bit of work to preserve cursors
2016-11-14 18:03:17 +01:00
ac43f4cb1f
new prototype poll
2016-11-14 15:56:49 +01:00
f05efbb113
Clean the code
2016-11-14 11:06:00 +01:00
851d3df656
Ability to see, move and delete unsorted files
2016-11-10 18:33:44 +01:00
43d93938c3
Fix the list, find the unsorted files, ability to add a folder
2016-11-09 18:25:08 +01:00
cfe3d38197
Add expend/collapse to the tree, fix CSS, add list/grid view modes
2016-11-08 18:53:47 +01:00
c9cd06514c
Add "restore" from trash, improve drag and drop and update css
2016-11-07 18:50:42 +01:00
4c5cb79c20
Merge pull request #58 from xwiki-labs/replaceState
...
use replaceState if available
2016-11-07 15:08:49 +01:00
c2770a7a74
set correct hash even if browser does not implement replaceState
2016-11-07 15:03:17 +01:00
d009b7400c
fall back to default title if one is not suggested
2016-11-07 12:29:57 +01:00
e77ad4e909
better fixes for export
2016-11-07 12:26:48 +01:00
75dd4a5926
slightly better test for variable
2016-11-07 12:11:01 +01:00
b7d9998b9b
fix reference to undefined variable
2016-11-07 12:10:00 +01:00
303c65f2c3
use replaceState if available, instead of setting the hash
2016-11-07 11:20:30 +01:00
8e1bff706b
Add drag and drop, rename and delete actions
2016-11-04 18:52:26 +01:00
67bf41627d
comment out dead code so CI doesn't complain
2016-11-04 17:09:13 +01:00
002e22ee9a
turn off unwanted behaviour until we can do it correctly
2016-11-04 16:17:59 +01:00
5fc44a6e4b
Merge branch 'soon' into fixpolls
2016-11-04 14:23:07 +01:00
ce9eb47351
Initial state of the file manager app
2016-11-03 18:51:30 +01:00
2d5448458b
export messages
2016-11-03 12:45:11 +01:00
b1370c05b7
add translation completeness test to assertion page
2016-11-03 12:44:12 +01:00
5f6ebb5cc1
fix incorrect regex for c-like title detection
2016-11-03 11:30:46 +01:00
d512b113cd
address failure to parse url when hash is not present
2016-11-02 18:28:19 +01:00
6ae851ffdd
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging-soon
2016-11-02 13:01:40 +01:00
636b0fcadc
do our best to keep the console quiet
2016-11-02 12:09:41 +01:00
3de4e5709b
Clean the code
2016-10-26 17:50:59 +02: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
3d74290c7d
Merge branch 'usability5' into staging
2016-10-24 18:33:10 +02:00
9e92a597b3
Ability to edit the title in the toolbar by clicking it
2016-10-24 18:32:43 +02:00
0a9d34a6c9
hide appended color pickers
2016-10-24 15:30:23 +02:00
c858b247c1
filter absent users from the userlist
2016-10-24 15:11:19 +02:00
ac3ddbab70
expose userList for later usage
2016-10-24 15:10:49 +02:00
a8612ed1c7
Merge branch 'usability5' of github.com:xwiki-labs/cryptpad into staging
2016-10-24 14:54:35 +02:00
10bb5e1607
Add the title in the toolbar
2016-10-21 18:16:27 +02:00
1e003b13a8
ask anonymous, first-time users to set their name when they first join a pad
2016-10-21 15:17:15 +02:00
5d9b81ab2f
Merge pull request #53 from xwiki-labs/update
...
minor fixes to html and userlist
2016-10-20 11:54:29 +02:00
46c5f64369
remove absent users from the userlist
2016-10-19 12:30:25 +02:00
51a79c5218
Remove unused dependency
2016-10-18 13:38:48 +02:00
9a733bb360
Fix dropdown menus with Edge
2016-10-13 15:00:53 +02:00
39bbf8a6c1
Fix the new userlist button and make the toolbar responsive
2016-10-13 14:24:59 +02:00
24fbe22c9d
Improve the toolbar style and the way the userlist is displayed
2016-10-12 18:40:26 +02:00
d2389a5729
Change the userlist in the toolbar
2016-10-11 18:39:43 +02:00
e739c49e7f
Remove the 'about' button in ckeditor
2016-10-11 11:57:07 +02:00
b23fe783e3
Fix the color picker in Chrome and hide the buttons when not supported
2016-10-10 18:21:18 +02:00
91b4446c0b
Merge branch 'fix-chrome-style-bug' into soon
2016-10-10 17:07:50 +02:00
53fe002d3b
Merge branch 'slide' into soon
2016-10-10 17:06:39 +02:00
6c04b7967d
Remove unused library
2016-10-10 17:03:25 +02:00
d63c912af0
Use the HTML5 color picker to change the colors in slides
2016-10-10 17:01:04 +02:00
bb2317d8e6
fix chrome style bug by forcing reload of style sheet
2016-10-07 17:41:52 +02:00
765498e88e
Remove the support for old.cryptpad.fr
2016-10-07 10:39:48 +02:00
d7e170c797
Test colorpicker
2016-10-07 10:31:36 +02:00
81fce1237f
Colorpicker to choose the background color in present mode
2016-10-06 18:04:35 +02:00
5300bc363c
Fix a race condition in the slide application
2016-10-05 18:26:32 +02:00
c322aa440e
Fix the username icon hcih was not working anymore
2016-10-05 18:19:52 +02:00
8575f3f79f
Fix the "rename" feature which was not working anymore in some cases
2016-10-05 17:22:56 +02:00
a989b51d74
Fix race conditions with Alertify
2016-10-05 16:04:21 +02:00
74df38f94f
Fix race conditions that could prevent applications from being loaded
2016-10-05 11:19:18 +02:00
a28daf2715
use websocket url configuration api
2016-10-04 17:13:15 +02:00
dbc8f01b8b
fix merge errors and reach full jshint compliance
2016-10-04 16:58:10 +02:00
a30e17121d
Merge branch 'readonlyButton' into soon
2016-10-04 15:48:52 +02:00
e84a54556c
Move the toolbar buttons' events handlers in cryptpad-common
2016-10-04 15:44:12 +02:00
2ac1b02572
Merge branch 'config-sockets' into soon
2016-10-04 14:38:50 +02:00
11f63c861c
Merge branch 'titles' of github.com:xwiki-labs/cryptpad into title
2016-10-04 11:23:04 +02:00
5e76194262
use new config api
2016-10-03 19:28:36 +02:00
3dfa19b786
more flexible websocket configuration (WIP)
2016-10-03 19:19:38 +02:00
76fdadee7f
Store only the strongest hash in the localstorage
2016-10-03 18:23:59 +02:00
1c808b3da8
Add comment for the 'important' css rule
2016-10-03 16:09:59 +02:00
17b4f91810
Do not share the title in the doc if it is the default title
2016-10-03 16:05:39 +02:00
391728ee6d
Use CodeMirror in /slide #2
...
Fix title errors in the slide app caused by the present mode
2016-10-03 14:21:39 +02:00
8c33218ceb
Move the codemirror themes in /common
2016-10-03 14:19:37 +02:00
2609af2105
Use the CodeMirror editor in the slide application
2016-09-30 17:39:16 +02:00
b5b0eacebc
Remove the old (non-bower) codemirror
2016-09-29 16:24:26 +02:00
261d2fecbc
Get codemirror from bower and use that version in the code app
2016-09-29 16:23:27 +02:00
bc73fa2074
Merge branch 'fontawesome' into soon
2016-09-29 14:52:48 +02:00
f03018f3bc
Improve the top bar and use the font awesome icons in /code
2016-09-28 15:28:25 +02:00
0be8c333e0
Merge branch 'fontawesome' of github.com:xwiki-labs/cryptpad into fontawesome
2016-09-28 09:01:33 +02:00
3d54413343
Improve the UI with FontAwesome icons
2016-09-27 18:33:03 +02:00
a266f0bee1
query parameter for messages
2016-09-27 11:01:32 +02:00
c16e8d603b
Enable reconnecting websocket in code pad
2016-09-26 16:06:23 +02:00
d6525087c7
jshint compliancy
2016-09-23 17:53:24 +02:00
ed9acf1c00
Merge branch 'rememberName' of github.com:xwiki-labs/cryptpad into rememberName
2016-09-23 16:40:07 +02:00
a4843cb5d7
Merge branch 'newhashNoConflict' of github.com:xwiki-labs/cryptpad into newhashNoConflict
2016-09-23 16:07:46 +02:00
a82b7aaf8b
allow empty names
2016-09-23 16:06:46 +02:00
2267ec8c43
Slides in read-only were not updated with the latest content
2016-09-23 15:12:17 +02:00
eac0cdd6dd
Enable read-only mode in slides
2016-09-23 12:26:06 +02:00
d46bd1af5c
Improve the toolbar UI with the username displayed
2016-09-22 17:56:51 +02:00
79884e2400
Use the same username for all pads
2016-09-22 17:12:46 +02:00
73d5ea967b
Fix an error created by the merge
2016-09-22 16:34:06 +02:00
dde519795d
Merge branch 'newhash' into newhashNoConflict
2016-09-22 16:14:48 +02:00
99004428d5
Enable the read-only mode in Cryptpoll
2016-09-22 16:09:20 +02:00
47e8be1681
Remove the IMPORT button and editor toolbars in read-only mode
2016-09-21 15:03:36 +02:00
f29e3d7b0d
don't let notifications interfere with document titles
2016-09-21 14:34:56 +02:00
a9e2ca8d72
make tests green again
2016-09-20 23:31:29 +02:00
83705ae058
Improve the UI in read-only mode
2016-09-20 18:22:40 +02:00
e6785b4dad
push /pad/ state once ready to avoid OT collision
2016-09-20 16:35:55 +02:00
723df4880e
Merge branch 'slides' into merge-slides
2016-09-20 16:28:36 +02:00
b96f050555
Merge branch 'board' into merge-boards
2016-09-20 16:26:31 +02:00
fa8199bc75
don't try to use experimental user code
2016-09-20 16:22:00 +02:00
2d42cadb23
push /code/ state once ready to avoid OT collision
2016-09-20 15:14:53 +02:00
bf5dac58dd
Merge branch 'titleUserDoc' of github.com:xwiki-labs/cryptpad into titleUserDoc
2016-09-20 14:13:35 +02:00
bf8c9a2c4b
Add a button to get the read only URL
2016-09-20 11:35:57 +02:00
99b50465c7
Add the read-only mode for /pad and /code
2016-09-19 17:52:37 +02:00
42f14873cd
Merge branch 'translations' into newhashmerge
2016-09-19 14:53:40 +02:00
391b7690e6
Set the pad to readonly mode when using a 'view' url
2016-09-19 14:52:36 +02:00
368e253c9f
Ability to send a read-only URL
2016-09-16 18:45:40 +02:00
6363d3fb90
Pad titles are now shared with the userdoc
2016-09-16 12:49:47 +02:00
5c63585952
Complete the French translation
2016-09-15 18:35:09 +02:00
0d9f63b977
Merge branch 'translations' - part one
2016-09-15 10:36:05 +02:00
f086492e50
Improve the localization system
...
Improve and enable the French translation
2016-09-14 18:08:52 +02:00
cc4bca8004
execute callbacks on presentation events
2016-09-14 16:03:52 +02:00
8bf79ef915
serialize slide pads as a sorted object
2016-09-14 16:02:57 +02:00
997b46a3f7
limit the size of rendered images
2016-09-14 16:02:20 +02:00
25c8d16bf5
Use a new version-prefixed hash parser
2016-09-13 17:43:56 +02:00
c35c7cda20
hide wizard after computing results
2016-09-13 16:02:38 +02:00
0dae949c4f
fix scrolljank bug
2016-09-13 15:34:10 +02:00
c736caceba
Use a better default pad title
2016-09-13 12:24:06 +02:00
97415d8158
Merge branch 'users'
2016-09-01 17:38:25 +02:00
122a9fe068
realtime kanban board
2016-09-01 16:23:40 +02:00
4561ddcdf3
add missing semicolon
2016-09-01 16:13:25 +02:00
8031770f90
rename "module" to "APP" in /slide/ for jshint
2016-09-01 16:12:22 +02:00
8e86be81b2
Merge branch 'better-slides'
2016-09-01 16:01:21 +02:00
fb21b4e46b
fix up /render/
2016-09-01 15:54:21 +02:00
4941c1493e
better user integration. a few more common utils
2016-09-01 12:15:30 +02:00
2f2aeef0e5
add missing semicolon
2016-09-01 12:06:21 +02:00
8a659cf887
maintain aspect ratio for slides
...
display index and slide count in title
2016-09-01 12:03:09 +02:00
30ea1b59b7
integrate users into common utilities
2016-08-30 18:09:53 +02:00
6d775f61c6
add missing functions
2016-08-30 10:06:14 +02:00
168338b898
add missing functions
2016-08-29 18:10:15 +02:00
7c5ee53e81
resolve conflict and merge
2016-08-25 18:01:03 +02:00
f47a6f1cbb
Merge branch 'master' of github.com:xwiki-labs/cryptpad
2016-08-25 17:59:37 +02:00
f40b798d88
Merge pull request #30 from xwiki-labs/reconnect
...
Ability to reconnect after a connection failure
2016-08-25 17:57:45 +02:00
c168ce2d1c
Ability to reconnect after a connection failure
2016-08-25 17:56:17 +02:00
e386749e89
unlock the editor after your name has been set (or not)
2016-08-25 11:36:20 +02:00
aa91ebd24e
don't initialize until the store is ready
2016-08-25 11:23:51 +02:00
93f5a3d3e9
use more bits from the users' seed and parse into various subkeys
2016-08-25 11:23:11 +02:00
1bec02239c
coerce dates into strings
2016-08-25 11:19:09 +02:00
0add01a940
remove dead code
2016-08-25 11:08:15 +02:00
dcebb9597f
prototype of password based key derivation
2016-08-22 11:43:41 +02:00
848f16e8f5
unused function which computes values for the table
2016-08-22 11:41:23 +02:00
18ea61dc9a
use diffdom for sanitation and better redraws
2016-08-19 15:43:14 +02:00
c62d064ee9
add a 'share' button which copies the url to the clipboard
2016-08-19 13:33:14 +02:00
b229a18ccf
notify users of changes if the visibility api is supported
2016-08-19 12:14:59 +02:00
d64e06c12e
don't make empty options
2016-08-19 12:14:20 +02:00
a3f6fe8843
lock options by default
...
add edit button for modifying options
fix bug where committing didn't clear the active column
minor style fixes
2016-08-19 11:26:48 +02:00
8c914dfe1f
better filenames
2016-08-19 10:47:07 +02:00
f1619f4a0f
get /slide/ up to par with other prototypes
...
* use messages.js for some translatable elements
* style alerts
* infer document name from content
* present, forget, rename, import, and export buttons
2016-08-19 10:44:49 +02:00
269eba3c47
remove commit button if a user is removed
2016-08-18 18:31:01 +02:00
f8f66800d1
display a 'commit' button which locks your column
2016-08-18 17:54:17 +02:00
85540bad12
leave all columns locked unless you've visited before
2016-08-18 16:13:03 +02:00
d679cac666
fewer log statements for the console
2016-08-18 15:27:55 +02:00
55b1a17b0d
off by one error
2016-08-18 15:26:00 +02:00
235c0482f9
increase clickable area around editable columns' checkboxes
2016-08-18 13:25:21 +02:00
c76aaac542
don't make columns with empty names
2016-08-18 12:41:49 +02:00
d85684ef74
usability improvements
...
only one column is editable at a time
editable columns have a different appearance from locked columns
any column can be edited by anyone via an edit button
columns and rows require confirmation before deletion
2016-08-18 12:06:13 +02:00
76bfb6ab35
detect whether you are new to a page
...
prompt for your name and create a column for your username
prompt before deleting columns as well
style a few elements differently
2016-08-17 18:38:27 +02:00
e2b162bf6d
snapshot some dead code
2016-08-17 15:29:04 +02:00
55666e9f70
remember presentations, and label them correctly on the home page
2016-08-17 15:03:57 +02:00
5a3da11c40
very simple presentation with markdown
2016-08-17 11:28:50 +02:00
7eaa4ce733
recognize pads with the same type and hash as identical no matter their domain
2016-08-05 17:17:49 +02:00
da6e5d73d0
fix undefined reference
2016-08-05 15:55:00 +02:00
043041523f
on import, fall back to setting language from file extension
2016-08-05 15:48:30 +02:00
deb63d2447
share syntax highlighting selection with peers
2016-08-05 15:03:42 +02:00
2d5caf38d9
show a spinner until the document has loaded
2016-08-04 17:00:30 +02:00
fd0a7337a3
wait a full minute until requirejs times out
2016-08-04 12:44:27 +02:00
975bff5794
show a spinner until the document has loaded
2016-08-04 12:43:06 +02:00
a58f58535b
better regex for pulling titles out of c-like comments
2016-08-03 17:11:41 +02:00
5131f47cca
jshint compliance
2016-08-03 17:03:50 +02:00
306d524416
fix broken removal call
2016-08-03 16:53:41 +02:00
dd3a5d47be
migrate localStorage so people go to cryptpad.fr
2016-08-03 11:08:45 +02:00
a094e3c02e
use correct store api calls in frame.js
...
also don't log unnecessarily
2016-08-03 11:02:40 +02:00
dcc9810a42
avoid extra call to store if there are no keys to remove
2016-08-03 09:42:49 +02:00
9a5294016d
fix incorrect usage of store api
2016-08-03 09:35:16 +02:00
4e5f381325
add spinner to API. update bower deps
2016-08-02 18:56:35 +02:00
01d9923e15
export Cryptpad at window level
2016-08-02 18:55:45 +02:00
fa654a7646
slightly better regex
2016-08-02 17:08:46 +02:00
254d800a3b
add a /p/ route so that we don't break old urls
2016-08-02 15:26:13 +02:00
cd18075ac7
add some redirection logic to support old hash types
2016-08-02 15:17:20 +02:00
600f3151e9
don't use the store until it's ready to be used
2016-08-02 12:11:40 +02:00
fffa9acf15
remove unused files from fs and jshintignore
2016-08-02 11:59:54 +02:00
551d38c930
let the abstraction take care of stringification
2016-07-29 18:05:58 +02:00
9b16d529ca
add one more missing script that caused handlebar highlighting to break
2016-07-29 16:21:27 +02:00
0ada6a3d0a
jshint compliance. gotta keep those tests green
2016-07-28 17:52:26 +02:00
1f24d7126c
big ugly commit that will be really hard to audit
...
This changeset applies new styles to the poll.
it also uses the new asynchronous wrappers around the localStorage api.
this is necessary because we're migrating to a storage system that will
use an async api.
The changes to the poll just happened to coincide with the async stuff.
My apologies to anyone who wants to read this whole thing
2016-07-28 17:44:40 +02:00
7f02c899ea
add snippet for copying text to the clipboard
2016-07-28 10:08:51 +02:00
93142b364f
tests for pretty printed html
2016-07-28 09:54:52 +02:00
4833cf0d7b
add a fontpicker
2016-07-28 09:24:14 +02:00
6cb2f72aa6
pretty print html during export if possible
2016-07-27 11:38:25 +02:00
c09166efe2
scroll down when adding a new option to the table
2016-07-25 15:42:46 +02:00
42eafe9e29
don't create duplicate stylesheets in the document head
2016-07-25 15:39:54 +02:00
fe3f02f5e0
enable text foreground and background colors
2016-07-25 15:38:59 +02:00
68f8d0101d
fix flash of unstyled content
2016-07-25 15:28:27 +02:00
8ea6c03094
notify user on disconnect
...
also disable inputs
2016-07-25 11:57:06 +02:00
efd190beca
export file with correct file extension, if possible
2016-07-25 11:26:42 +02:00
5e71a5473c
add another missing script
2016-07-25 11:26:07 +02:00
992bc4f449
add missing script
2016-07-25 11:09:25 +02:00
2351d8a23e
make tests green again
2016-07-22 16:00:33 +02:00
068a3f5944
remove rows from the poll
2016-07-22 15:42:41 +02:00
c6bdb7506d
forget everything about a pad when you forget it
2016-07-22 15:18:09 +02:00
b8a3a4d188
persist usernames across sessions via localStorage
2016-07-22 14:31:40 +02:00
846d1135b9
set mode in the editor, not just the dropdown
2016-07-22 14:16:07 +02:00
446266a79b
remember the last language used on a particular pad
2016-07-22 12:25:42 +02:00
e84fbf0bc3
more helpers in common
2016-07-22 12:24:54 +02:00
70f8837681
maintain scroll position on remote changes
2016-07-22 11:57:04 +02:00
c267dd6a88
ensure that 'text' is a string
2016-07-20 12:26:57 +02:00
2f2ab4392c
clear the table on user clicks
2016-07-20 12:23:41 +02:00
64f030c344
add a clear table button
2016-07-20 12:23:08 +02:00
d2c5cfe646
add col/row ids to arrays
2016-07-20 12:22:49 +02:00
1a63faf188
infer names from the first comment on code pad
2016-07-20 12:21:33 +02:00
f77e2cec34
set text values of new options
2016-07-19 17:27:40 +02:00
52ab5147c9
add a missing semicolon so tests don't fail
2016-07-19 16:23:39 +02:00
e3f4df7e0a
push my latest changes because I'm agile
2016-07-19 16:22:44 +02:00
cde239c97a
implement row/column removal
2016-07-18 20:57:53 +02:00
9860b7427a
addition signs are slightly informative
2016-07-18 20:57:35 +02:00
ac50bf7286
height and width of the table are unreliable because of multiple users. remove them
2016-07-18 19:49:43 +02:00
a3254a2619
consistent ordering of columns and rows
2016-07-18 19:49:12 +02:00
d30eddf2f2
ui hint for 'adduser' and 'addoption'
2016-07-18 19:48:24 +02:00
a995f2306d
fix undefined variable reference
2016-07-16 12:42:23 +02:00
44fe95c76b
add titles to buttons on pad and code
2016-07-16 12:38:21 +02:00
ebf5c27453
add rename and forget buttons to poll app
2016-07-16 12:37:17 +02:00
f7a1332317
add a 'back' button
2016-07-15 19:09:35 +02:00
7dd1624206
commit polls to localStorage
2016-07-15 18:47:07 +02:00
0cf5f3cc87
realtime polls!
2016-07-15 16:46:50 +02:00
ff74a67a09
translate alertify button messages
2016-07-12 16:43:33 +02:00
d39ab5c250
point to the actual translation file
2016-07-12 15:52:36 +02:00
dea8e225db
fix double scrollbar issue
2016-07-12 15:45:49 +02:00
6f598682f8
templates for custom themes
2016-07-12 12:36:13 +02:00
02cd2fbee0
style fixes for the ansuz theme
2016-07-12 12:35:17 +02:00
c9edf69ed1
one less prototype using messages.js while we figure out internationalization
2016-07-12 12:34:38 +02:00
3eccec7054
better effort for translation
2016-07-11 17:36:53 +02:00
3bdfee71e1
move padrtc to .git
2016-07-08 16:53:38 +02:00
18ce69b756
use constants from toolbar.js, address linter warnings
2016-07-08 16:52:49 +02:00
2a7a84b774
use constants exported from toolbar for selections
...
make things a little less brittle
address linter warnings
2016-07-08 16:50:56 +02:00
cbeaa8d609
major refactoring for toolbar. CAN HAZ LESS
2016-07-08 16:45:48 +02:00
7504f79e05
add log and warn methods to cryptpad common
2016-07-08 16:45:15 +02:00
750731d3db
workaround for favicon magic
2016-07-07 14:03:06 +02:00
3ad5d71ab1
make sure the regular favicon is set
2016-07-07 13:43:08 +02:00
fd3cd73d0b
try to fix favicon bug
2016-07-07 13:40:03 +02:00
589b0087a1
listen for keyup events while alertify prompts are active
2016-07-07 13:27:45 +02:00
a2a8570453
use alertify UI in /pad/
2016-07-07 12:47:56 +02:00
e32c0aaac8
use alertify UI in /code/
2016-07-07 12:47:23 +02:00
deae7ac78f
don't hide the notification until it has been seen
2016-07-07 10:45:09 +02:00
3d3c6e4800
add wrappers for alertifyjs
2016-07-06 22:20:15 +02:00
85702f2706
inform users of changes in /pad/ too
2016-07-06 22:19:22 +02:00
1ae212af44
let users know when changes have occurred while tabs lack focus
2016-07-06 22:19:01 +02:00
6075849ed7
add favicons to /pad/ and /code/
2016-07-06 22:17:18 +02:00
73d2b6561a
add small modules for page visibility api and notification apis
2016-07-06 22:16:17 +02:00
7e8d66a141
filter unwanted elements when receiving patches
2016-07-06 14:51:34 +02:00
d8b467422a
fix default title in localStorage migration
2016-07-04 16:43:39 +02:00
7a5877d12a
don't filter pads after 30 days
2016-07-04 15:34:43 +02:00
d844551fba
add a forget button. clean up toolbar a bit
2016-06-30 17:24:25 +02:00
8a82e11306
make sure title is defined for home page usage
2016-06-30 15:53:13 +02:00
71b1f71ba0
fix migration to include ctime
2016-06-30 15:15:38 +02:00
7da58a0de9
improve pad naming UX, slight refactoring
...
* prevent naming conflicts
* migrate localestorage to use named attributes
* use ctime and atime
* display default names in table
* sort pads by most recent atime
* move more functions into cryptpad common
* change table styles
2016-06-30 15:10:32 +02:00
ec0dba3f7c
correct undefined reference
2016-06-30 14:47:37 +02:00
a3da10766a
add rename button to /code/ and /pad/
2016-06-30 10:51:19 +02:00
93dcf29c15
more functions for working with localstorage
2016-06-30 10:43:56 +02:00
93fed83a08
remove annoying border around editor
2016-06-29 15:13:45 +02:00
23788bca67
add 'ansuz' theme because I'm horribly vain
2016-06-29 15:13:24 +02:00
22929fd3f5
add title attributes for dropdown menus
2016-06-29 12:02:39 +02:00
8b1a2b7b8b
commit theme choices to localStorage
2016-06-29 12:00:12 +02:00
fb2ca04c34
add a theme selector
2016-06-29 11:51:53 +02:00
dc8e36bf20
move themes directly into ./code/
2016-06-29 11:45:57 +02:00
908e79c0b9
add autolink plugin
2016-06-28 12:09:43 +02:00
d025d13295
address some jshint complaints
2016-06-23 16:44:20 +02:00
12bbf3e8f6
don't drop values onto the window
2016-06-23 16:38:40 +02:00
ca45e3533d
pass loaded file to callback when importing
2016-06-23 16:38:24 +02:00
5b79775810
infer modes from MIME types
2016-06-23 16:37:51 +02:00
df99395b4d
fix a few more paths that I missed
2016-06-23 12:44:30 +02:00
b3deb9531d
fix paths that I broke when updating codemirror
2016-06-23 12:44:11 +02:00
82a9b05d5f
upgrade to newest codemirror
2016-06-23 12:30:40 +02:00
1a5905d9fd
more work on highlighting modes in codemirror
...
* style the select menu
* add more modes
* preset language selection to 'javascript'
* don't prompt the user with a silly hash when changing their name
2016-06-23 12:07:51 +02:00
a89511985f
add _really_ basic multilanguage support. I'll come back for css later
2016-06-22 22:54:42 +02:00
31aa09d6f6
work a bit more on import/export and code highlighting
2016-06-22 20:58:50 +02:00
242c9a99e3
implement import and export in /pad/
2016-06-22 17:00:07 +02:00
1526c26f8e
remember code and wysiwyg pads
2016-06-21 18:49:37 +02:00
0a8137e7eb
move rememberPad to cryptpad common and simplify it a bit
2016-06-21 18:46:19 +02:00
849683d586
update to use new style crypto module
2016-06-21 15:17:09 +02:00
f94c06abc0
drop a bunch of stuff and use diff dom and hyperjson
2016-06-20 18:39:30 +02:00
69f3f4c9a8
drop hyperscript dependency
2016-06-20 18:39:13 +02:00
f607fcc0ad
test using newest hyperjson. forget hyperscript
2016-06-20 18:38:56 +02:00
c3d2568d3c
add file export for codepad
...
addresses #24
2016-06-17 10:59:45 +02:00
920dbeabd1
add a save button
2016-06-16 16:39:38 +02:00
4cc5388c76
trial run of canvas export via filesaver.js
2016-06-16 16:32:39 +02:00
f818d873bb
remove usernames, refactor a wee bit
2016-06-16 16:20:51 +02:00
2b8c21d292
set styles with setAttribute. fixes style fights
2016-06-16 13:00:48 +02:00
36baf498ce
fix magicline filter and strange interaction with cursor
2016-06-16 12:59:40 +02:00
303e8d6c3e
remove debugging line
2016-06-10 17:03:54 +02:00
8af49698da
add a class to the magicline markup so it's easier to remove
2016-06-10 09:56:40 +02:00
48d222e565
depend on listmap api from bower
2016-06-06 12:38:31 +02:00
1746a4e732
use crypto from bower
2016-06-06 12:35:06 +02:00
2a3ff256b9
remove libraries which are now in bower
2016-06-06 12:29:45 +02:00
f72cb24fc5
rm LORIA
2016-06-06 12:27:42 +02:00
2c3de49922
remove realtime-input, since it's in bower now
2016-06-06 12:15:00 +02:00
beba78d7f8
update prototype dependencies
2016-06-06 12:14:07 +02:00
2798d1b1f9
all of the list/map api's dependencies are now on bower
2016-06-06 11:54:37 +02:00
58c968b319
minor cleanup in realtime-input
2016-06-03 18:55:32 +02:00
288b4d5b66
depend on main passing in the crypto module for now
2016-06-03 18:52:35 +02:00
f76dc615c0
use chainpad-crypto from bower and pass it into the listmap api
2016-06-03 18:51:31 +02:00
85dbd5cb6e
pass in websocketURL from main
2016-06-03 17:27:01 +02:00
d9a4f2f22c
missed one
2016-06-03 16:44:15 +02:00
cf2866baa7
use json-ot from bower for tests
2016-06-03 16:35:54 +02:00
5bb77bd50c
add UI.add and UI.remove methods.
...
also use json-ot from bower
2016-06-03 16:24:41 +02:00
ff0f7d15dc
use json-ot from bower
2016-06-03 16:23:25 +02:00
dccf5e8dcf
use listmap api from common/
2016-06-03 15:51:54 +02:00
58633af943
listmap can be reused. put it in common/
2016-06-03 15:47:34 +02:00
f80e9772a8
merge api.js and deep-proxy.js into one file
2016-06-03 15:45:58 +02:00
dbf1e2b870
support reusing the netflux network
...
export more internals from realtime input
2016-06-03 15:30:51 +02:00
6f7543e9cc
demonstrate chaining of 'on' directives
2016-06-02 17:50:55 +02:00
e44446f71e
proper recursive proxy initialization
2016-06-02 17:49:27 +02:00
68cec2348a
don't prompt the user with a crypto hash for their name
2016-06-02 16:56:01 +02:00
83696495a8
use chainpad from bower, not local
2016-06-02 16:54:47 +02:00
2b9ac14cb1
restructure main to take advantage of new callback infrastructure
2016-06-01 12:36:26 +02:00
fea74782a2
remove a little more dead code that I missed
2016-06-01 12:35:42 +02:00
a58d6c745a
implement remaining listeners and factor
...
* 'isProxyable' helper
* 'find' helper
* 'lengthDescending' helper (for sorting change/remove events by path length)
* implement recursive proxy creation
* implement recursive proxy removal
* implement 'bubbling' prevention (via return false)
* implement create, ready, and disconnect event handlers
* return 'this' from 'on'
* trim dead code
2016-06-01 12:28:25 +02:00
4222c0b516
simplify api
...
* refactor conditional with DeepProxy helpers
* don't call 'onRemote' until fully initialized
* use disconnect, ready, and create handlers on proxy object
2016-06-01 12:25:16 +02:00
954ee26f4d
fix undefined disconnect reason
2016-06-01 12:19:54 +02:00
a0ec5eada8
better fix for magicline filter
2016-05-31 12:51:04 +02:00
9336c4de5c
import latest chainpad
2016-05-31 12:35:01 +02:00
d0b553d198
port Yann's multiple-select implementation to cryptpad
2016-05-31 12:27:28 +02:00
e3b8a10959
fix magicline filter
2016-05-30 17:33:24 +02:00
058548b95a
revert my reversion
...
Revert "Revert "Added checkpoints with the new code from ChainPad""
This reverts commit 6e2e8bf21f
2016-05-30 14:58:20 +02:00
6e2e8bf21f
Revert "Added checkpoints with the new code from ChainPad"
...
This reverts commit da2bfe2de9
2016-05-30 10:20:08 +02:00
599f5aeec8
add sample listeners for debugging
2016-05-30 10:18:08 +02:00
3afd144562
don't make noise when adding a listener
2016-05-30 10:17:46 +02:00
e86a3567be
more minor bugfixes and general improvements
...
off by one error in deletion loop (and undefined references)
sort listeners by pattern specificity
deletions are changes (for now)
2016-05-28 13:51:24 +02:00
ce99bd9ba3
Merge branch 'two' of github.com:xwiki-labs/cryptpad into two
2016-05-28 13:15:33 +02:00
7c63219add
fix some minor bugs
2016-05-28 13:15:06 +02:00
a0c73c95d8
do away with a bit of boilerplate
2016-05-28 13:13:54 +02:00
e189092ba8
document/spec the listmap api in its current/intended form
2016-05-28 00:48:52 +02:00
55846044e1
rewrite underlying API. implement listeners
2016-05-28 00:48:10 +02:00
da2bfe2de9
Added checkpoints with the new code from ChainPad
2016-05-26 17:09:02 +02:00
014dce272b
working on better abstractions. still held together with duct tape
2016-05-26 11:55:33 +02:00
c1bca09cce
move list/map functionality into wrapper file
2016-05-25 18:36:44 +02:00
f61d06fa18
first commit for listmap prototype
2016-05-25 11:56:17 +02:00
774d349ec3
ignore hidden elements and submit buttons
2016-05-25 11:55:11 +02:00
cf85de6113
remove old bencoding code
2016-05-25 11:54:36 +02:00
d99bb8ff84
WIP : fallback to old parsing doesn't work
2016-05-20 17:46:48 +02:00
f04be53d11
fall back to old parsing if the message is bencoded?
2016-05-20 16:45:25 +02:00
976a08cc7a
move to chainpad version 2
2016-05-20 16:34:55 +02:00
297d8c2d44
reformat code for jshint compliance
2016-05-20 13:39:40 +02:00
baf523e9a5
add new functionality from xwiki development
2016-05-19 12:20:05 +02:00
0c89443c1b
fix typo
2016-05-17 17:22:18 +02:00
39fcd7dc4c
more specific filtering for magicline plugin
...
to avoid false positives for other things which are non-contenteditable spans
2016-05-17 16:57:50 +02:00
cae750cd75
update padrtc for to use bower libraries
2016-05-13 17:35:17 +02:00
ad3c53c344
use textpatcher from bower for all pads
2016-05-13 17:32:56 +02:00
0cd4f85ff0
remove migration notes
2016-05-13 17:00:01 +02:00
a7cbd8c470
we're pushing json over the wire, so let's use json-ot.validate
2016-05-13 16:42:14 +02:00
3ea270acb9
fix cursors in form prototype
2016-05-13 16:41:36 +02:00
d2c8fbf1f8
use hyperjson.amd.js, not hyperjson.js
2016-05-12 18:21:01 +02:00
663c157e2a
expose text patcher to the window via APP
2016-05-12 10:46:17 +02:00
1769ca16dc
add example for configuring the logLevel in /pad/
2016-05-10 10:23:22 +02:00
7faf57602b
implement log level settings from application layer
2016-05-10 09:39:20 +02:00
523aff3067
use upstream chainpad.js
2016-05-09 15:50:19 +02:00
dcd130cd9d
use hyperjson from bower in padrtc
2016-05-09 15:27:37 +02:00
c752e4a6e5
remove sharejs
2016-05-09 14:20:11 +02:00
6b2e986789
remove deprecated textsocket library
2016-05-09 11:57:40 +02:00
d2fa5e8f70
start using hyperjson from bower.io
2016-05-09 11:41:02 +02:00
150ebaba7b
add ability to force text diffing
2016-04-27 17:58:55 +02:00
aef6f3a85b
lock codemirror editor until chain has synced
2016-04-27 16:21:10 +02:00
6736335db2
add 'made with <3' toolbar to code
2016-04-27 15:43:31 +02:00
506a703b7d
turn off TextPatcher logging on /pad/
2016-04-27 15:42:27 +02:00
ba17b78f7a
restyle name change button
2016-04-27 15:32:58 +02:00
d79b3616c9
remove unused files
2016-04-27 15:32:15 +02:00
4c84758265
disable textpatcher logging
2016-04-27 15:30:53 +02:00
46b009d20f
remove last non-netflux pad
2016-04-27 12:30:43 +02:00
18e0131d6e
Merge branch 'migrate' of github.com:xwiki-labs/cryptpad into beta
2016-04-27 12:28:24 +02:00
32d1807350
import unused functions from /p/, to be integrated later
2016-04-27 12:25:19 +02:00
492054a938
Fix the cursor position when a remote patch is applied
2016-04-27 12:17:06 +02:00
626ecaffcd
log browser fights in /pad/
2016-04-27 11:10:31 +02:00
5bb2e12db2
Merge branch 'beta' into migrate
2016-04-27 10:51:51 +02:00
afe78dad56
Merge branch 'netflux' into beta
2016-04-27 10:44:32 +02:00
cc51e6d6ed
Update CodeMirror pad to work with Netflux
2016-04-27 10:44:04 +02:00
a735d63306
migrate markdown rendering 'pad' to netflux
2016-04-27 10:38:44 +02:00
f5f8f6e1eb
Remove the delay between a change and its propagation to chainpad
2016-04-26 17:50:54 +02:00
fa6914037c
start rewriting codepad to use realtime-input
2016-04-26 17:34:57 +02:00
2852c8f594
Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into beta
2016-04-26 17:24:51 +02:00
fe3bb4da27
Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into netflux
2016-04-26 17:18:31 +02:00
53b2644b64
Fix a issue with fights over usernames
2016-04-26 17:16:58 +02:00
3b6fe44378
Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta
2016-04-26 14:31:57 +02:00
255dc17a5d
Merge branch 'beta' into netflux
2016-04-25 16:08:00 +02:00
f9de1c9e1f
Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta
2016-04-25 16:07:24 +02:00
c14b86d84a
add missing semicolon
2016-04-25 16:07:02 +02:00
b3ef2abb84
fix jshint complain
2016-04-25 16:06:10 +02:00
85d5f5c47f
Convert netflux to es5
2016-04-25 15:29:39 +02:00
c0b8aac792
Fix an issue where metadata could be duplicated in the realtime userdoc
2016-04-25 15:29:09 +02:00
22cf18f78c
Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta
2016-04-23 16:31:35 +02:00
c509c28c18
realtime form prototype, almost in good condition
2016-04-23 16:31:07 +02:00
1a9e7299fc
working state
2016-04-23 00:15:39 +02:00
69e8f54e8f
pass in Crypto to realtime-input
2016-04-22 18:54:24 +02:00
5f16ad4a58
Update to most recent chainpad
2016-04-22 18:17:00 +02:00
aa07dd31ee
have json-ot initialize its own debug module, instead of relying on a window variable's existence
2016-04-22 17:35:07 +02:00
d3203d1c2a
Remove Crypto from the modules loaded with RequireJS in realtime-input
...
It now has to be passed in the config in the main JS file
2016-04-22 14:26:37 +02:00
8ac69ca262
Add a missing "time" property in the netflux client causing incorrect
...
timeout errors
2016-04-22 11:46:27 +02:00
be1ef7abe3
migrate canvas to netflux
2016-04-22 10:04:54 +02:00
d4943511fe
move text/ and hack/ to Netflux
2016-04-22 09:47:26 +02:00
4c95602347
remove a little bit more dead code
2016-04-22 09:46:41 +02:00
b140b6429d
remove a little bit of dead code
2016-04-22 09:46:06 +02:00
2c6cf9883b
stop using deleted file
2016-04-22 08:19:58 +02:00
bbdc9da853
delete duplicated file
2016-04-22 08:19:28 +02:00
cce50390a0
don't depend on library to set hash
2016-04-21 19:04:15 +02:00
5f4825f3a0
don't change the hash from realtime input
...
let applications handle that logic
2016-04-21 19:03:50 +02:00
80fb5e1e21
don't rely on RealtimeSocket exporting textPatcher
2016-04-21 17:59:30 +02:00
4f426651ad
remove TextPatcher from RealtimeTextSocket
2016-04-21 17:41:50 +02:00
a527024a8c
start on realtime form prototype
2016-04-21 15:51:04 +02:00
02ff1a63a4
Merge branch 'netflux' into beta
...
Conflicts:
www/assert/main.js
2016-04-21 15:47:07 +02:00
04f6299938
reconcile differences with netflux
2016-04-21 15:44:56 +02:00
565fb1d186
include small snippets for preventing browser fights
2016-04-21 15:40:29 +02:00
ffbd428b87
better logging of browser fights
2016-04-21 15:06:03 +02:00
4d44661f3b
more correct tests
2016-04-21 15:05:41 +02:00
a18c793f98
use latest hyperjson
2016-04-21 14:53:53 +02:00
980ff8a0ca
Fix a test that was failing on chrome
...
it failed for reasons which are irrelevant to our application
2016-04-21 12:16:48 +02:00
9efcc443cd
add 'format' to TextPatcher's API
2016-04-21 12:16:11 +02:00
0769e50414
move TextPatcher to highest application layer
2016-04-20 18:56:18 +02:00
1d70335228
provide all callbacks before starting
2016-04-20 18:27:20 +02:00
9498937b43
add a FIXME to the assert page
...
tests were failing (unnecessarily) on Chrome
2016-04-20 18:15:17 +02:00
a3787ee4dc
Merge branch 'netflux' into beta
2016-04-20 15:25:00 +02:00
06b464c524
move sheet/ to .git
2016-04-20 15:04:43 +02:00
cdf02ac725
remove input pad
2016-04-20 15:00:21 +02:00
11961b4f1d
export stringifyDOM to REALTIME_MODULE
2016-04-20 14:50:56 +02:00
5db487db3f
remove old pad entirely
...
hyperjson version is considered a strict improvement
2016-04-20 14:26:56 +02:00
010566d3c3
pushDelta was mistakenly deprecated. restored.
2016-04-20 14:20:34 +02:00
1639c5b099
use hyperscript and hyperjson from common
2016-04-20 14:14:44 +02:00
3598c93098
move new hyperjson into common
2016-04-20 14:14:06 +02:00
103bb69daa
move custom hyperscript into common
2016-04-20 14:13:08 +02:00
e357549eda
push browser fights into an array for inspection
2016-04-20 14:01:21 +02:00
b83fb7b823
improve brFix logic
...
stop exporting functions which we wish to deprecate
2016-04-20 12:29:16 +02:00
1c7954ed51
Grab Fabric off of the window
2016-04-20 12:13:04 +02:00
06786b6e02
Remove redundant declaration
2016-04-20 10:37:20 +02:00
df22c246c4
serialize text nodes correctly
2016-04-20 10:10:26 +02:00
7ca5f47d02
remove multitest pad since it offers no significant benefit
2016-04-18 17:31:37 +02:00
bafdd588dd
fix /hack/ to not require sharejs textarea
2016-04-18 17:14:00 +02:00
f2db6b83eb
better sizing for palette options
2016-04-18 16:40:44 +02:00
5ce158d2e2
add more colors
2016-04-17 20:21:19 +02:00
7c4b334ad3
here's a canvas app!
2016-04-17 20:04:49 +02:00
41276fffb5
repair /text/ application, conform to new API
2016-04-17 14:15:34 +02:00
cb979844f6
implement text patching at application layer
2016-04-17 14:06:30 +02:00
4a41575e6d
accept onLocal in config
2016-04-17 14:05:33 +02:00
d3c2c901b6
implement cursor transformation in a common library
2016-04-17 14:02:45 +02:00
92d89f6cac
start to factor sharejs into two modules
2016-04-15 18:17:45 +02:00
13dc77b7f6
remove commented line
2016-04-15 18:16:54 +02:00
41e635b2e5
realtime-input.js : turn on logging
2016-04-14 16:27:34 +02:00
69e8e18283
Remove the pipe character in the hash
2016-04-14 16:10:08 +02:00
d62e9fc1c9
add a missing semicolon
2016-04-14 15:41:02 +02:00
4095201d15
Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into integrate
2016-04-14 15:40:37 +02:00
c32045d7d0
Fix an issue with missing characters when several users were typing at the same time
2016-04-14 15:30:42 +02:00
822b2bd2b9
Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into integrate
2016-04-14 14:47:22 +02:00
be09a1808d
Remove old code from realtime-input
2016-04-14 14:46:42 +02:00
5a5b9ad718
Merge branch 'netflux' into beta
2016-04-14 12:37:28 +02:00
4af987a2a2
point to correct toolbar.js
2016-04-14 12:36:25 +02:00
3ade46adc7
Merge branch 'newtests' into beta
2016-04-14 12:33:12 +02:00
6884b0890a
Fix the typong tests not working properly
2016-04-14 12:24:17 +02:00
b12a01e08f
report test results on the page, not in the console
2016-04-14 12:16:10 +02:00
feaae609ad
fix broken path for padrtc
2016-04-14 10:48:25 +02:00
ecc41d14af
Use canonical serializer for json serialization
2016-04-13 17:46:41 +02:00
fc77ef66b3
Merge remote-tracking branch 'origin/sortify' into HEAD
...
utilize canonical stringify function
Conflicts:
www/_socket/main.js
2016-04-13 17:36:05 +02:00
319f5b95f7
Use canonical serializer for json serialization
2016-04-13 16:54:34 +02:00
9683fd9aec
Always serialize the DOM in one way.
2016-04-13 16:46:31 +02:00
698338b49a
Use canonical serializer for json serialization
2016-04-13 16:43:59 +02:00
e207d8b579
Merge branch 'diffdom' into netflux
2016-04-13 16:19:56 +02:00
468827dadd
newest tests
2016-04-13 16:10:38 +02:00
c867ab04ab
rename /_socket/ app to /p/
2016-04-13 16:01:45 +02:00
a1fe941f69
Always serialize the DOM in one way.
2016-04-13 15:00:19 +02:00
f4c5b2a996
Add sane defaults to TextPatcher diffs
2016-04-13 14:51:15 +02:00
259772dd62
Turn on TextPatcher logging for _socket
2016-04-13 13:54:25 +02:00
0537c28919
Add switchable logging to TextPatcher.js
2016-04-13 13:53:20 +02:00
8a36963582
Enable ChainPad PARANOIA mode but remove the part which causes most slowness
2016-04-13 13:51:01 +02:00
284da6a4e9
minor improvements I made to the /hack/ pad last night
2016-04-13 10:16:44 +02:00
9f0cc4ed64
update hack with a slightly better UI
2016-04-12 18:51:03 +02:00
71c0a06c3b
Merge branch 'hack' into diffdom
2016-04-12 18:17:01 +02:00
19cd991dba
trim dead code, comment, very minor optimizations
2016-04-12 17:29:20 +02:00
f75c246029
remove dead code from pad/main.js
2016-04-12 17:17:14 +02:00
9f45ccb2d9
use console.error for stack traces
2016-04-12 16:47:30 +02:00
d705b947ab
Merge branch 'diffdom' into netflux
...
basic cleanup while performing a larger merge between two prototypes
2016-04-12 15:56:43 +02:00
2ffa69dc15
remove checks for a non-existent race condition
2016-04-12 15:55:03 +02:00
368d72b337
add missing semicolons to TextPatcher.js
2016-04-12 15:39:53 +02:00
851ccfbdb6
detect falsey operations in OT and ignore them
2016-04-12 15:37:47 +02:00
400f6efde1
json-ot.js : jshint compliance
2016-04-12 15:37:47 +02:00
a0999d1d2b
add a comment about why hashes are being stubbed
2016-04-12 15:36:03 +02:00
ca94d30386
detect falsey operations in OT and ignore them
2016-04-12 15:35:07 +02:00
9f9cd8d8cd
realtime-input.js : fixes for jshint compliance
2016-04-12 15:07:05 +02:00
793149a608
json-ot.js : jshint compliance
2016-04-12 15:00:46 +02:00
06a3b63923
jshint compliance for toolbar.js
2016-04-12 14:58:24 +02:00
3b8238ef3b
add missing semicolons to pad/main.js
...
jshint compliance
2016-04-12 14:51:32 +02:00
5cead3fad3
add missing semicolons to TextPatcher.js
2016-04-12 14:51:06 +02:00
e6ab03164c
import TypingTests.js and expose at the console
...
RTWYSIWYG-54
> implement tests for components of the WYSIWYG editor
2016-04-12 14:34:47 +02:00
94e57e4a26
update location of text-patcher.js
2016-04-12 14:21:31 +02:00
b37dab1f49
Merge branch 'diffdom' into netflux
...
Simple cleanup and unit tests
2016-04-12 14:15:04 +02:00
a07774e81a
Implement tests for serialization
...
ensure that complex DOM elements can serialize and deserialize without modifications
RTWYSIWYG-54
> implement tests for components of the WYSIWYG editor
2016-04-12 14:12:44 +02:00
6bb37aed44
main.js : support tab insertion in /hack/ pad
2016-04-12 14:05:56 +02:00
6b9d982d40
stabilize _socket/realtime-input.js
...
...as common/RealtimeTextSocket.js
2016-04-12 13:10:57 +02:00
1a22592afa
remove unused modules from realtime-input.js
2016-04-12 13:06:52 +02:00
39071021eb
stabilize typingTest.js as /common/TypingTests.js
2016-04-12 12:53:23 +02:00
9805958ad7
stabilize text-patcher.js into /common/TextPatcher.js
2016-04-12 12:46:49 +02:00
2c34833d2c
break text-patcher's functionality into components
...
text-patcher.js now exports diff, patch, log, and apply change
in addition to the previous 'create' method.
2016-04-12 12:27:33 +02:00
7782069dbd
Merge pull request #15 from xwiki-labs/diffdom
...
merge diffdom into netflux
2016-04-12 10:21:19 +02:00
a1f9b10175
remove offending line from chainpad entirely
...
RTCHAINPAD-3
2016-04-12 10:02:11 +02:00
4071a3aa25
revert to using the chainpad in /common/
...
now that we have found the problem that caused the backspace bug
we don't need a special chainpad for testing.
2016-04-12 09:55:50 +02:00
4ba68eb2bf
fix leaky variable in chainpad
...
Patch.transform declared a 'toTransform' variable without using 'var'
this caused it to leak onto the window during operational transformations
2016-04-12 09:52:36 +02:00
05108efdfa
correct chainpad's transformation function
...
addresses RTCHAINPAD-3
Pending further testing, this change will still need
to be corrected in https://github.com/xwiki-contrib/chainpad/
2016-04-12 09:44:08 +02:00
360fee9feb
Fix a new cursor error with Codepad
2016-04-11 17:58:30 +02:00
c2e0dded3a
Fix an issue with the cursor sometimes disappearing when a patch was received
...
Update CodeMirror to the latest version (5.13.2)
2016-04-11 15:47:40 +02:00
713c90242b
Hide the usernames when they have not been changed
2016-04-11 15:00:22 +02:00
c53baab99d
Update Codepad with the latest improvements
2016-04-11 14:43:39 +02:00
0b3d6e15b8
Replace the Netflux old client (netflux.js) by the Netflux2 client.
...
Move the WebRTC peer-to-peer use case in /padrtc, which still uses the old
Netflux client
Use es6-promises.min.js to solve a issue with some browser and the new
Netflux client
2016-04-08 16:54:03 +02:00
cd357a9136
turn an alert into a console.error
2016-04-07 17:03:30 +02:00
ec64e0d381
use getAttribute to inspect document elements
...
el.getAttribute('attr') is more reliable than el[attr].
2016-04-07 15:55:57 +02:00
f5b0e1a5df
Add comments, debug variables. initialize better
...
Expose Hyperscript via window.REALTIME_MODULE
Make sure to pass in a JSON.parse'able initial state.
Add comments detailing the problems with not using setAttribute
2016-04-07 15:50:56 +02:00
842b9d4243
Generalize _socket/realtime-input.js a little more
...
Anything JSON related should be at the application layer
2016-04-07 15:48:38 +02:00
cf9f60bd57
The server don't send back anymore messages to their sender
2016-04-07 11:27:14 +02:00
eb4ea7a6b0
Remove the content from the ACK messages sent by the server
2016-04-05 15:06:38 +02:00
ba4faea939
Update the pads to run with the latest improvements to the websocket server
2016-04-05 12:17:43 +02:00
5ef7e29a9b
Add the latest changes from _socket into the netflux pad
2016-04-01 17:58:33 +02:00
b59a14c5ac
merge hyperjson changes from realtime xwiki
...
more resilient class serialization.
comments
2016-04-01 11:20:19 +02:00
2691d85582
use forked chainpad with assertions for _socket
2016-04-01 10:51:47 +02:00
b41f0e8c50
Merge branch 'cjd-fixed-it-with-hax' into netflux2
2016-04-01 10:51:27 +02:00
c50690349b
comments describing the role of each argument
2016-04-01 10:46:54 +02:00
df78d284c4
initial state should be valid JSON so JSON parse doesn't fail
2016-04-01 10:44:23 +02:00
96e03fcfa4
Use latest chainpad without mutations
2016-03-30 15:29:28 +02:00
d5772c6315
when json-ot produces json that fails to parse...
...
export the relevant data to a window variable so we can inspect it better
2016-03-30 14:39:41 +02:00
aaf7c777cc
add debugging info to the textPatcher
...
* kill dead code
* add assertions
* better logging for insertions and removals
2016-03-30 14:38:10 +02:00
523df40d09
Debugging concurrent typing:
...
track whether there are local operations in progress, such that we can tell
whether a remote change is interrupting the DOM's conversion to hjson.
2016-03-30 14:36:11 +02:00
e446a3645c
don't send funny BR attributes over the wire. Properly initialize the typing test
2016-03-29 17:21:02 +02:00
22290590cb
don't rely on window scope in typingTest.js
2016-03-29 17:02:56 +02:00
772ca5d30e
comment out debugging line
2016-03-29 17:01:57 +02:00
6c340a6527
chainpad testing = true, reject non-compliant messages
2016-03-29 16:53:40 +02:00
afa1104d85
Pull the cursor out of bogus BR tarpits when it gets stuck
2016-03-29 15:36:03 +02:00
bac0e0ff88
implement hyperjson filtering
2016-03-29 15:35:40 +02:00
e51635c4bb
fix index error
2016-03-29 15:34:58 +02:00
3aebf7d2c2
minor changes to pass linting
2016-03-29 12:35:23 +02:00
29e24f556c
kill another window variable
2016-03-29 12:13:57 +02:00
e699073d45
attempt to preserve the magic line plugin while someone else is typing
2016-03-29 11:54:55 +02:00
941f5361ea
forgot to add 'typingTest', which main depends on
2016-03-29 11:16:50 +02:00
d852c578d8
removed dead code
2016-03-29 11:16:13 +02:00
5591aae8fa
Clean up main file
...
* convert.js includes the vdom library, which we aren't using anymore
- removed, and replaced with the simple functions from Hyperjson and Hyperscript
* removed several variables that had been exported to 'window'
* moved the testing functions out into their own file for easier reuse
* restructured realtime initialization to be more compact
2016-03-29 11:12:46 +02:00
478ccbf984
revert changes to chainpad
2016-03-29 11:04:34 +02:00
e3b78e20de
Merge branch 'cjd-fixed-it-with-hax' of github.com:xwiki-labs/cryptpad into cjd-fixed-it-with-hax
2016-03-25 18:01:51 +01:00
e26246178f
start to clean up and give things more sensible names.
...
get rid of the textarea entirely
2016-03-25 18:01:23 +01:00
b372b0b77c
small change to chainpad in order to make it more likely to fail if the authDoc goes into the wrong state
2016-03-25 17:35:07 +01:00
f3fb674504
Merge branch 'cjd-fixed-it-with-hax' of github.com:xwiki-labs/cryptpad into cjd-fixed-it-with-hax
2016-03-25 16:50:17 +01:00
98c85cef8b
xxx
2016-03-25 16:49:27 +01:00
12dcbc9121
fix quick red fox and make test.cancel work again
2016-03-25 16:14:17 +01:00
62eabbc7ae
If a message does not match parent hash, don't delete it from storage
2016-03-25 15:23:19 +01:00
dbf31798d5
json-ot triggering PARANOIA errors in ChainPad
2016-03-25 15:01:17 +01:00
03932d0169
small changes to chainpad for testing
2016-03-25 14:52:44 +01:00
669bcc1935
If there is a difference in the hjson then send a message back
2016-03-25 14:26:31 +01:00
f62ec85a4c
Shuffled around some assertions and logs
2016-03-25 14:14:19 +01:00
420a7098a6
more testing and crap
2016-03-25 12:45:51 +01:00
4b35a145e3
Push WIP
2016-03-25 11:04:27 +01:00
42c972116b
leave TODO re: diffDOM and magicline
...
Hyperjson guarantees that magicline elements are not sent across the wire.
DiffDOM must guarantee that magicline elements will not be removed on remote edits.
2016-03-24 12:50:04 +01:00
e066730b68
add notes about how hyperjson is to be used
2016-03-24 12:46:35 +01:00
cd462ed872
Merge legacy websocket version
2016-03-24 12:28:45 +01:00
c047d5310f
implement optional filtering in hyperjson
...
Implemented via callback, return falsey if you want to filter an element
and all of its children from the serialized result.
Conflicts:
www/common/convert.js
2016-03-24 12:16:42 +01:00
0d33af773f
implement optional filtering in hyperjson
...
Implemented via callback, return falsey if you want to filter an element
and all of its children from the serialized result.
2016-03-24 12:11:31 +01:00
475ca9bea8
hyperjson.js : used split instead of filter... oops
2016-03-23 12:33:05 +01:00
1bd5cb9e27
hyperjson.js : used split instead of filter... oops
2016-03-23 12:31:16 +01:00
b2753ef7b7
fix string manipulation off-by-one
2016-03-22 19:29:58 +01:00
f98fda7604
fix string manipulation off-by-one
2016-03-22 19:28:50 +01:00
4f3fcb08a4
better error reporting when the operational transform fails to parse JSON
2016-03-22 12:13:15 +01:00
0ff4906f0e
implement better serialization of class names
...
RTWYSIWYG-27 : poorly formed yet valid HTML caused hyperjson to produce element
selectors which hyperscript could not parse.
2016-03-22 12:13:01 +01:00
fbe6225681
Don't attempt to use the cursor selection when it has length 0
...
RTWYSIWYG-20
RTWYSIWYG-24
2016-03-22 12:12:46 +01:00
0c6222b5f9
better error reporting when the operational transform fails to parse JSON
2016-03-22 10:19:13 +01:00
79a9998b13
implement better serialization of class names
...
RTWYSIWYG-27 : poorly formed yet valid HTML caused hyperjson to produce element
selectors which hyperscript could not parse.
2016-03-22 10:16:14 +01:00
bd24821c6c
Don't attempt to use the cursor selection when it has length 0
...
RTWYSIWYG-20
RTWYSIWYG-24
2016-03-22 10:06:42 +01:00
de6db0285c
Limit the size of the usernames to 32 chars
2016-03-16 17:48:27 +01:00
38d797a4f1
Fix issue with Chrome and WebRTC
2016-03-16 17:38:26 +01:00
7237c751d5
Move 'vdom' to the main 'pad'.
...
Hide the right-hand panel (can de bisplayed with a 'debug' button)
Hide the IDs of users if they don't change their name
2016-03-16 17:09:08 +01:00
e77d85bc82
Trigger an onReady() method when the user's pad is fully synced (the history is loaded)
2016-03-16 14:00:14 +01:00
eca4ec699c
Ability to change the username (the user ID is displayed by default)
2016-03-16 12:02:39 +01:00
6e50ae94dd
Remove unused code
2016-03-15 10:51:19 +01:00
5da8560e22
Fix the user list in the toolbar keeping old data with the WebSocket server
...
Chainpad is no longer responsible for the userlist or the ping
2016-03-15 10:37:27 +01:00
3a188625e0
Improve the detection of a disconnected peer to update the user list with the WebRTC service
2016-03-14 15:20:00 +01:00
77e7fb5724
Fix an issue with the WebRTC service where it was impossible to join a channel once someone had left this channel
2016-03-14 14:49:19 +01:00
06e5c84702
Clean some code
2016-03-11 17:32:45 +01:00
29033f344c
Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into netflux
2016-03-11 17:15:55 +01:00
b1e8bcddef
Fix the user list not working with the WebRTC service and causing major issues
2016-03-11 17:09:27 +01:00
c576241104
Add a Chainpad adapter to make Chainpad know the userList
2016-03-10 18:48:38 +01:00
fb0e82931d
correct malformed json
2016-03-10 14:08:15 +01:00
ae8f6f7f2c
Ability to choose which protocol to use (Websocket or WebRTC) with Netflux
2016-03-10 14:03:31 +01:00
3a7af63c54
correct malformed json
2016-03-10 11:58:23 +01:00
b7885eb539
Fix channel history
2016-03-09 18:35:39 +01:00
136e2d8cf2
pass in missing textarea argument so textpad starts working again
2016-03-09 11:02:12 +01:00
8258018c1d
Revert "fix undefined reference"
...
This reverts commit 7d65540123
2016-03-09 10:32:57 +01:00
c67451bc1a
Revert "remove broken functions from convert module"
...
Because I forgot that the /render/ page was still using vdom
This reverts commit 93fb944e1f
2016-03-09 10:29:51 +01:00
c536ecbc1c
Temp commit
2016-03-08 15:13:57 +01:00
870b2dbb7e
Add the WebRTC server in Cryptpad
2016-03-08 11:45:03 +01:00
c4f62fb812
First try with WebRTC
2016-03-08 11:25:37 +01:00
09a06a8bc5
Replace the chainpad server by the netflux server
2016-03-07 17:35:31 +01:00
60c3aceb0d
Add chatflux server
2016-03-07 17:18:47 +01:00
deb2084fc5
Add the socket connection checker
2016-03-07 12:00:45 +01:00
d3e2a2f52e
make verbose logging switchable via a conditional
2016-03-07 11:59:36 +01:00
1c54af69a1
update minor editors to use new realtime-input api
2016-03-07 11:52:18 +01:00
9b228eea6b
modify vdom main.js to adhere to new realtime-input api
2016-03-07 11:36:33 +01:00
fefb904261
realtime input changes
2016-03-07 11:34:16 +01:00
fd99dba4a3
modify realtime-input api to take a single object as configuration. merge netflux API
2016-03-07 11:33:46 +01:00
62ba579d4a
Add Netflux API with WebSocket service V1
2016-03-07 11:07:37 +01:00
53d3e475f7
ui hints for hackpad
2016-03-04 16:47:59 +01:00
d2f4fbcee9
fail the toolbar from the application layer
2016-03-04 16:46:18 +01:00
d7b34cf6be
don't call toolbar from within realtime-input.js
2016-03-04 16:45:11 +01:00
e8469ae1bb
test out extended realtime-input api
2016-03-04 16:41:34 +01:00
5e1566eaec
fix incomplete 'onAbort' block
2016-03-04 11:07:12 +01:00
52fe892bae
invert logical relationship with flag
...
otherwise updates don't actually propogate
2016-03-04 11:05:58 +01:00
938df2b92f
lock the editor until the chain has synced
...
add 'onAbort' hook. lock the editor if the connection fails.
2016-03-03 18:05:05 +01:00
1d6ccc99a1
add 'onAbort' hook to realtime-input.js
2016-03-03 18:04:14 +01:00
e5bef52850
reintroduce the toolbar
2016-03-03 16:05:07 +01:00
6ff5b10486
remove local diffDOM version
2016-03-03 16:04:08 +01:00
93fb944e1f
remove broken functions from convert module
2016-03-03 15:18:05 +01:00
7d65540123
fix undefined reference
2016-03-03 15:12:43 +01:00
c246adc57b
Lock contenteditable until chain is done syncing.
...
Don't bother patching the dom until the chain has synced
2016-03-03 14:38:07 +01:00
1c0074258c
go back to using diffDOM from bower
...
The latest version is required. You'll need to update.
2016-03-03 10:49:59 +01:00
79bd82a62e
main.js : integrate with patched diffDOM
2016-02-29 17:59:00 +01:00
6884fabda9
Use local diffDOM instead of bower_components
...
At least until the PR gets accepted
2016-02-29 17:05:04 +01:00
f5a8727254
remove some unused functions from cursor.js
2016-02-29 16:52:07 +01:00
db1515c445
cursor.js : commit before cleaning up
2016-02-29 16:27:55 +01:00
7e367e770e
resize vdom debug panel to 30% width
2016-02-29 15:37:51 +01:00
91ada5ce7a
export Operation from chainpad. for use with OT
2016-02-29 15:28:32 +01:00
5425699f43
check if possible parent exists before checking if it contains another element
2016-02-29 15:27:11 +01:00
67bdb8a65a
fix a bad regex that occasionally threw an error
...
'nothing to repeat'
2016-02-25 12:35:11 +01:00
e87a4599a4
main.js : tiny patch until things are working correctly.
2016-02-23 16:22:09 +01:00
9ce59c985f
only do stuff with the cursor when a remote edit takes place
2016-02-23 15:54:25 +01:00
39f56d4fd1
throw error when checking for the index of a node that has no parent.
...
it probably isn't in the dom if this is the case.
Check if it's there before using this function
2016-02-23 15:53:58 +01:00
de46be85ba
add better helpers for finding and resetting the cursor
2016-02-23 15:52:58 +01:00
7e7f1fee76
include abstracted json-ot, add comments, start to use cursor stuff
2016-02-22 18:01:57 +01:00
c09036bd29
snapshot cursor.js, as some things are working quite well now
2016-02-22 18:00:46 +01:00
4eee1f5210
add orderOfNodes function to tree library
2016-02-22 17:56:17 +01:00
7689151fc0
pull json validation for OT into its own module for reuse
2016-02-22 17:54:59 +01:00
fbb9163e42
main.js : clean up and commit before making big-ish changes for cursor fixing
2016-02-19 14:12:22 +01:00
2c8a2406c6
cursor.js : snapshot before code deletion
2016-02-19 14:07:43 +01:00
1beb3f5355
snapshot of treesome.js before deletion
2016-02-19 14:07:16 +01:00
8ead5ca129
realtime-input.js : add notes regarding integration of the netflux api
2016-02-16 15:14:38 +01:00
3cb94b8d80
jshint compliance
2016-02-15 16:07:46 +01:00
d1885fbab6
better jshint compliance for common files
2016-02-15 15:42:08 +01:00
539cc3a2fa
remove unused files from common directory
2016-02-15 15:41:36 +01:00
afa2811472
remove local version of marked.js, prefer bower version
2016-02-15 11:49:47 +01:00
587f95b6d7
don't overflow
2016-02-14 12:01:05 +01:00
a01331cb9a
hide styling textarea no matter what
2016-02-12 16:44:54 +01:00
a600ece5c5
fix jshint complaints in common directory
2016-02-12 16:22:20 +01:00
4a05a859e6
fix initialization routines
2016-02-12 16:21:52 +01:00
f1915d3b7c
fix jshint complaints in pad directory
2016-02-12 16:21:17 +01:00
fe3917c0f1
fix jshint complaints in codemirror directory
2016-02-12 16:20:55 +01:00
2c5a2b6023
remove unused code, add todos, fix minor errors
2016-02-12 12:03:15 +01:00
c5ab5dfe26
realtime style editor with lorum ipsum
2016-02-12 11:45:40 +01:00
967d636df9
address more jshint complaints
2016-02-12 11:39:37 +01:00
f6c848385f
hyperjson.js : jshint complains about var index in for loop
2016-02-12 11:21:33 +01:00
0fbbb51f7f
drop this useless line
2016-02-12 11:19:36 +01:00
d1dd497457
html-patcher.js : add missing semicolon
2016-02-12 11:17:10 +01:00
62ea172ff4
errorbox.js : add missing semicolon so jshint doesn't complain
2016-02-12 11:15:59 +01:00
3b5c932252
jshint ignore eval line
2016-02-12 11:10:59 +01:00
7f92abc7bf
Merge branch 'diffdom' of github.com:xwiki-labs/cryptpad into demoEffect
2016-02-12 10:24:11 +01:00
a7da21ccba
Remove the cursor treatment
2016-02-11 16:22:59 +01:00
86c4a69a97
Switch to patching with DiffDOM for testing :D
2016-02-11 16:10:44 +01:00
653ba33b65
Merge branch 'vdom' of github.com:xwiki-labs/cryptpad into demoEffect
2016-02-11 13:15:57 +01:00
2031191261
testing=false
2016-02-11 13:13:58 +01:00
37db31b09e
Attempt an operational transformation and if the result is not valid JSON then fail
2016-02-11 12:34:06 +01:00
e16299b5c4
Revert "restub OT until it's verified"
...
This reverts commit 350c9e6c76
2016-02-11 12:33:12 +01:00
c22269e36e
cursor.js : make the console a little less noisy
2016-02-11 10:02:47 +01:00
350c9e6c76
restub OT until it's verified
2016-02-11 09:44:47 +01:00
99a23154b7
files for unstubbing OT
2016-02-11 09:38:58 +01:00
c740c0ec92
add stuff for walking the tree
2016-02-11 09:32:58 +01:00
ad184b1114
add stuff to recover the cursor
2016-02-11 09:32:41 +01:00
1aea11bb30
describe all the prototypes which are available
2016-02-10 16:50:00 +01:00
9b13fd8f34
pull cursor correction code out of main.js
...
put it in cursor.js
2016-02-10 11:38:53 +01:00
3b0ac3af4c
More sensible styles
...
respond to viewport size
don't use gigantic font
2016-02-10 10:53:56 +01:00
b43674eb53
switch back to two-panel layout
2016-02-10 10:52:46 +01:00
f33e061c9a
visit /hack/ to see what this is
...
I'll leave it up to the users to decide
whether XSS is a bug or a feature
2016-02-10 10:47:33 +01:00
019750bea8
realtime-input.js : callback onInit if exists
2016-02-10 10:40:52 +01:00
61fbf81dcd
factor out rainbow stuff into rainbow.js
2016-02-05 11:55:37 +01:00
7102a0a164
make rainbows
2016-02-05 11:48:34 +01:00
aa3880f442
up to date
2016-02-03 16:48:49 +01:00
d2f6c63d8a
realtime-input.js : changed the api and left an undefined reference. fixed
2016-02-03 12:58:54 +01:00
150c9a300d
scale viewport so mobile is readable
2016-02-03 12:50:36 +01:00
d96124229b
clean up realtime-input.js, break API
...
use an object for configuration, so as to be more extensible.
modify applications which use the API to match.
2016-02-03 12:45:45 +01:00
e43b9715e8
remove /md/ prototype
...
use /text/ and /render/ instead.
2016-02-03 11:52:23 +01:00
64cc177a60
remove vmd directory
...
it was only a prototype, and only contained code which was no longer useful
2016-02-03 11:46:11 +01:00
e220113e98
fix the 'crapstorm' bug
2016-02-01 19:41:55 +01:00
ed03a48092
minor patches that make things a bit more reliable, still some bugs
2016-02-01 19:41:13 +01:00
ac0f7852fc
committing latest changes for review
2016-02-01 15:28:33 +01:00
2016550e01
virtual-dom.js : identify problem area?
2016-02-01 14:28:13 +01:00
08fb010627
give 'onChange' a name
2016-02-01 14:27:43 +01:00
b52327be49
restyle /text/ page
2016-02-01 14:14:48 +01:00
266e5eccce
change styles for rendered page
2016-02-01 14:14:32 +01:00
2adfeaaaaa
test having multiple textareas in one page
2016-02-01 14:13:35 +01:00
3cffdc982f
remove unused functions from render/main.js
...
better comments
2016-01-31 13:15:50 +01:00
317abf36f3
make rendered images sort of responsive
2016-01-31 13:14:45 +01:00
388c6de64a
minor style tweaks for /render/
2016-01-30 18:04:01 +01:00
ec172b6d21
rendered html should be scrollable
2016-01-30 17:30:00 +01:00
a484b920e3
disallow resizing of textarea
2016-01-30 17:26:39 +01:00
d9d4abb9a5
don't let the textarea overflow the body
2016-01-30 17:25:20 +01:00
dcbbeea734
solarized dark color scheme in /text/
2016-01-30 17:15:59 +01:00
c2eb29b75e
fix typo
2016-01-30 14:24:26 +01:00
fd1e5d5735
better styling on render page
...
now solarized dark
2016-01-30 14:18:20 +01:00
a718f89e08
make a new pad that doesn't allow input.
...
It simply renders markdown that's being written in the same channel
but in another editor that allows input.
2016-01-30 13:59:20 +01:00
2e3b424a1a
sanitize markdown before rendering to prevent XSS
...
draw rainbox borders on element redraws in vdom method.
This lets us see what being redrawn, as the vdom.diff method
is breaking a few things.
2016-01-30 13:54:12 +01:00
13f5371199
remove duplicated files
2016-01-30 13:53:21 +01:00
aa6bbabc62
prototype a vdom-based markdown editor
...
avoid unnecessary redraws.
discover a bug, apparently vdom replaces all child elements after an
element which was modified.
As such, changing b in [a, b, c, d] causes b, c, and d to be redrawn.
This is undesirable.
2016-01-29 15:06:10 +01:00
d14e42fedd
start on a vdom-based wysiwyg realtime
...
There are still a few conditions that cause it to 'explode'
when different browsers disagree on element semantics.
Overall it's a much cleaner approach, but it will require
extensive tuning to improve performance, as there are still
many complete dom traversals which will not scale for large documents
2016-01-29 12:40:45 +01:00
1f7f90165f
Slap marked.js onto a textarea
...
Multiple people can now edit markdown and see the results in realtime.
2016-01-29 12:30:17 +01:00
d5a1629a93
A really basic shared text area with encryption.
...
...and not much else. If you want to hack on something
this is a great place to start.
2016-01-29 12:29:24 +01:00
50121c8ab6
a really basic collaborative input
...
type="text" is typically slower than the same code
when used to sync a textarea.
WATCH OUT!
2016-01-29 12:28:11 +01:00
b18dfef656
sharejs textarea is used by realtime-input.js
2016-01-29 12:27:29 +01:00
997ce1147f
realtime input wraps up basic realtime stuff
...
so we don't have to rewrite the realtime api for every application.
starting to move towards a portable api :D
2016-01-29 12:26:49 +01:00
40b8c0efe8
drop in chjj's marked.js for a cool demo
2016-01-29 12:26:27 +01:00
2d8ffdf31c
Merge branch 'master' of github.com:ansuz/cryptpad
2016-01-29 11:54:26 +01:00
0c2e057f9d
export component APIs from convert
2016-01-27 10:10:47 +01:00
b958caebdd
dom, vdom, hyperjson, and an api which provides a matrix of conversions
2016-01-26 17:26:33 +01:00
4cf2a8a0bd
rtwiki.js : catch some typeErrors
2016-01-26 11:32:12 +01:00
84c0ea6d26
refactor: pass in ifrw.CodeMirror into andThen()
2016-01-17 00:43:10 +01:00
663e987345
fix race condition in codemirror initialization
...
over slow connections, iframes don't load fast enough to be ready for code
which depends on certain features existing.
wait until they're ready, then initialize.
2016-01-16 07:37:00 -05:00
2ed9f0867a
Merge branch 'master' of github.com:xwiki-labs/cryptpad into codepad
2016-01-15 11:24:21 -05:00
c71b060dc2
main.js : wait until your editor is defined before trying to reference it. addresses a race condition that caused ckeditor to fail half the time.
2016-01-14 05:14:45 -05:00
ff52f050e5
chainpad.js : pull in upstream changes to chainpad.js. new APIs
2016-01-13 09:47:11 -05:00
9fc44cdf0c
add notes to clientside js files
2016-01-13 05:43:58 -05:00
af80bed07b
XWR-190: Make CryptPad version with rtwiki/CodeMirror
2016-01-08 11:52:33 +01:00
9626dfc365
XWR-190: Make CryptPad version with rtwiki/CodeMirror
2016-01-07 18:13:45 +01:00
9a932a3f56
Patch Realtime into CodeMirror in CryptPad
2015-11-25 10:09:23 +01:00
32f44161a7
Patch Realtime into CodeMirror in CryptPad
2015-11-25 09:48:30 +01:00
88fb6772e8
Cleaned up the front page and added a little piece of code to show recent pads
2015-02-02 17:53:10 +01:00
51544db9a2
Completed adding of customization system and bottom infobar
2015-02-02 16:01:33 +01:00
84164123b6
not quite finished
2015-01-30 18:12:20 +01:00
0e44b10aeb
Seperated common crypto operations to common file and made common toolbar used for both pad and spreadsheet
2015-01-30 16:52:23 +01:00
e039e90a24
upgrade to most recent chainpad
2015-01-30 16:41:01 +01:00
c13bfe978a
Switched cryptpad to use common/toolbar.js which is shared with cryptsheet
2015-01-30 11:10:51 +01:00
50c10f818e
Added cryptsheet to cryptpad suite!
2015-01-29 17:55:18 +01:00
4a63ba7df3
Give cryptpad a proper main page
2015-01-28 17:58:55 +01:00
652a1da7a4
oops changed some work in the js file
...
Revert "change logo"
This reverts commit 9325100a02
2014-11-06 13:03:20 +01:00
9325100a02
change logo
2014-11-06 12:56:57 +01:00
3330fae47e
typo
2014-11-04 10:53:49 +01:00
8fc732d879
remove the 'magic line' because it causes problems with the realtime
2014-11-04 10:52:15 +01:00
0d3ded68a0
use a websocket which automatically reconnects if the connection is lost
2014-11-04 10:51:53 +01:00
e3a54c11ee
remove some code which may be over-engineering
2014-11-03 21:47:54 +01:00
2a1f3f9027
show a little spinner which spins when loading and when people type
2014-11-03 21:44:35 +01:00
87aa1aaf91
don't start measuring lag until after syncing and update readme
2014-11-03 20:43:43 +01:00
6d68bb0bde
error when opening error message window D:
2014-11-03 16:16:26 +01:00
6cbdcdec65
Show users editing and lag, properly send message to indicate that all users have left channel and show basic error box if disconnected.
2014-11-03 16:07:39 +01:00
5ae599fa07
support different ports for websocket and http
2014-11-03 11:13:41 +01:00
a6b88e276c
use the slower version of applyHTMLOp
2014-10-31 17:28:35 +01:00
b6523adb1f
rand fixed
2014-10-31 17:05:09 +01:00
1508c7ba71
and so it begins
2014-10-31 16:42:58 +01:00
yflory