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