1f700a8374
fix confusing error message
7 years ago
1a950319a1
Fix broken links
7 years ago
f1c1d87d3f
Fix template importer
7 years ago
0c2987a6d1
Import template in existing pads
7 years ago
d4dfbddaa6
Add icons in the user menu
7 years ago
d0c38d31e4
Owned todo
7 years ago
db9eee383c
Owned profile
7 years ago
9cba630700
lint compliance
7 years ago
01fb497e1b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
4288f536f1
Use requireCSS to load FontAwesome
7 years ago
a718603b36
Automatic account deletion
7 years ago
a794efe931
Merge branch 'staging' into oo
7 years ago
faaff60f74
Fix broken FAQ link
...
Add a forward slash before faq.html... for the expiring pads FAQ link.
7 years ago
632e6c2e6c
Merge branch 'metadata' into staging
7 years ago
99712ec2f0
getMetadata RPC
7 years ago
01dd6953b9
Fix the previous fix...
7 years ago
c3f7b74baf
Fix CkEditor's toolbar initial state
7 years ago
44cd235f48
Fix CSS with Bootstrap 4
7 years ago
2704ee1ed7
Account deletion translations
7 years ago
fa4b625f0d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
67cdb6bd13
Fix initial values in the pad creation screen
7 years ago
bd6b6dcb49
actually fix weird checkbox logic, and lint compliance
7 years ago
dc783ce3e4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
96a63a3b7b
fix weird checkbox logic in share menu
7 years ago
91b3ef45f3
Fix mobile detection
7 years ago
4f2a91b82d
Pad creation screen UI improvements
7 years ago
07e361b88d
Account deletion button
7 years ago
c135893638
Improve UI for polls on mobiles
7 years ago
f1107ae6e5
Don't count other people's owned pads against your limit
7 years ago
ab8306f5d4
Merge branch 'soon' into staging
7 years ago
b3429c2d24
Merge branch 'creation' into soon
7 years ago
1dabc76bb9
Fix sframe-boot version
7 years ago
de97c5a3ff
Fix mobile detection when hiding the userlist
7 years ago
d6228a39bd
Fix userlist notifications missing for join events
7 years ago
03bcd2f00d
Lint compliance
7 years ago
3eec812aff
Merge branch 'staging' into creation
7 years ago
b1d5beca6f
Translations + UI for pad creation screen v2
7 years ago
645e47bd72
Catch chainpad errors in polls
7 years ago
e56d762409
Catch chainpad errors and display it in the UI
7 years ago
c9ed6d6bf8
New pad creation screen
7 years ago
7944bc1a82
merge staging branch
7 years ago
64afcb7c0b
comment out busyloop workaround for tippyjs
7 years ago
ca65e6e54a
Merge branch 'soon'
7 years ago
03ae9d5714
Merge branch 'soon'
7 years ago
2f262b12c6
Fix help box issues
7 years ago
442f15df98
Add help text in all the apps + french translation
7 years ago
cbd29794b8
Improve keyboard shortcuts in the pad creation screen
7 years ago
7a70d69d8e
Hide editor toolbars by default when using a small screen
7 years ago
f45023ed1f
Remove connection lost popup when websocket connection is lost
7 years ago
689368cdd7
Fix feedback for markdown toolbar and cke toolbar
7 years ago
0af90ef88d
resolve merge conflict
7 years ago
978b6b95df
WIP make oo encrypted
7 years ago
62186bd4bd
Remove tooltip when the element is removed from DOM
7 years ago
b0dba481d8
Fix small UI issues and IE issues
7 years ago
b7b560fcb8
Enable Cmd key support in shortcuts
7 years ago
12bfcbe701
Add fixed order for rightside icons in the toolbar
7 years ago
95bbc3d130
Add the mediatag button back in the code app
7 years ago
ee3b926e84
Get rid of ckeditor's reset_all class...
7 years ago
ee4d12bd57
abstract repeated call
7 years ago
2c90cb5907
Move help button in drawer and fix drawer style
7 years ago
753b7550ca
Save button in the pad creation screen
7 years ago
a4a6385e86
Add keyboard shortcuts for the Ctrl+E or Cmd+E modal
7 years ago
dbe8ab014d
Select all in drive
7 years ago
f96a5003b0
empty spreadsheet file in test.bin
7 years ago
d975bb9cc0
Fix focus after pad creation screen
7 years ago
118ceef2f2
formatting and lint compliance
7 years ago
60b2384885
Move initial state into a help block
7 years ago
5c53868c3b
Delete pads after 3 months of inactivity
7 years ago
329fd61bb1
Remove lag when creating a pad from the pad creation screen
7 years ago
22f130d948
Remove lag when displaying loading screen in login and register
7 years ago
a697ad9762
Merge branch 'soon'
7 years ago
599afa4fc5
Merge branch 'soon' into staging
7 years ago
61dbf94f2d
Fix pad attributes not working for readonly pads if you know the edit hash
7 years ago
8c42125ea0
Merge branch 'soon'
7 years ago
7ff9bbe2b0
Fix share modal with new pads
7 years ago
a0ec51dde5
Fix share modal with new pads
7 years ago
480b499d7b
Hack to remove onbeforeunload popup
7 years ago
7ede2e1a07
Fix cursor position when editing a task in todo
7 years ago
c34161a988
Update oocell config
7 years ago
acf09c807d
Fix fonts
7 years ago
9ba912d953
Clean onlyoffice files
7 years ago
db71fe5bf8
Rename font files
7 years ago
d53ea25111
Merge branch 'soon'
7 years ago
5f50bedce2
Fix empty properties for readonly pads
7 years ago
15a8196037
Enable pad creation screen
7 years ago
2eef1e96e6
Remove invalid error reports
7 years ago
7cb3282634
New apps for text, slide and spreadsheet
7 years ago
766fa72841
Fix initial value of the preview link in the share modal
7 years ago
5c1e5a3f49
Merge branch 'staging' into oo
7 years ago
5dbc99343a
Improve 'rename' input in the drive
7 years ago
b04e3def64
Fix invalid translation key
7 years ago
649fefad54
Send cookie when history keeper has changed
7 years ago
2ac9c3ba66
Report RPC errors when deleting owned pads
7 years ago
037a6ccc35
Fix INVALID_RESPONSE error in the file app
7 years ago
54a91f1153
Ability to reorder and edit tasks
7 years ago
70e014cdfc
Hide infinite spinner and disconnect modals when pad is deleted
7 years ago
e83e589cf0
Kick from pad when an owned channel is deleted + whiteboard and poll
7 years ago
728a6a868d
Manage expired channels
7 years ago
ac527c6411
add a logout page
...
allows destroying user session with a minimum number of loaded dependenciesi.
Can be Used for SSO forwards (logout).
Co-authored-by: Nicolas PARQUET <nparquet@linagora.com>
7 years ago
3bb6d5a83c
Remove full history timeout
7 years ago
f8399eaaa6
avoid concatenating 'undefined' in drive interface
7 years ago
ff151869de
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
7ebfa43408
Improve assert translations to detect issues in objects (tips, type, etc.)
7 years ago
d676a5e7db
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into keywords
7 years ago
bee5494abb
add some sanity checks to the todo app
7 years ago
5bba9b6c39
Refactor login to remove duplicate code
7 years ago
c2e9c60756
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
4df4c48fbd
Improve UI for pad creation screen
7 years ago
8213d0d926
guard against null pointer exception
7 years ago
83eb304716
lint compliance
7 years ago
970122b41d
Send the channel id to the text analyzer
7 years ago
80df45f257
Get text from ckeditor
7 years ago
fb192a2c45
Add a configurable background color in the file app in view mode
7 years ago
91e42f1518
Fix the bug introduced in the share modal fix
7 years ago
0b1795e5a1
Fix an issue preventing the share modal to be used more than once
7 years ago
ad2cde4705
Add warning about anonymous drive in localStorage
7 years ago
bdafc101c9
Ability to remove owned channels from the drive
7 years ago
1c39e8b1bb
Fix worker app
7 years ago
b6e91c772e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
a1d9f44bbd
Delete owned pads from server when removed from the owner's drive
7 years ago
f134f11b73
new getDeletedPads rpc
7 years ago
5089f1206d
Pad creation screen translations and link to settings
7 years ago
74deb60f0f
Fix issues with the new context menu in drive
7 years ago
36550b781f
Don't check for stronger hash if we have an edit hash
7 years ago
86144eda22
Display a message about pads deleted from the server
7 years ago
9a317018e2
Remove deleted pads from the drive
7 years ago
3d3f58b3fc
Improve share modal customization to make it work with async functions
7 years ago
fd4ed3ce3b
Fix subscription button in settings
7 years ago
548a32090e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
4d0312115a
Add a link to the account server for subscribers in settings
7 years ago
5827905dbd
Import OnlyOffice code from the 'onlyoffice' branch and sframe it
7 years ago
2b8414ca78
provide hints for running CryptPad
7 years ago
80cd3e208a
lint compliance
7 years ago
4e8335bfdd
fix support for custom button classes
7 years ago
2995782079
Different colors for ok and cancel in alertify
7 years ago
4de6bd6195
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
014aacc76a
Added a new RPC to get file offsets of messages by hash or of last 2 checkpoints, also improved checking of valid channel names and fixed a pull-stream bug and exposed async-store to the window
7 years ago
69c33e2f83
Ability to disable profile
7 years ago
51587d1006
Ability to disable feedback on the entire instance
7 years ago
006d99e19a
Fix undefined friends
7 years ago
af2bde27c6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
c90ba890ca
Add more configurable options and add a new way to use custom config
7 years ago
ffa392a7e2
Merge pull request #221 from ryanpcmcquen/patch-1
...
Fix Org mode regex.
7 years ago
2e436f16c9
Refactor context menu in drive
7 years ago
ff4a49d59b
Fix Org mode regex.
...
More details here: https://github.com/mickael-kerjean/nuage/pull/16
7 years ago
4bea1aa2df
Display default avatars in IE
7 years ago
adf7e14891
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
bc9a88fbe9
Add support for org-mode in th code app
7 years ago
b08c1d94a1
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
02dbe9e458
enforce maxUploadSize
7 years ago
6a906e3770
Fix share modal extension point
7 years ago
e791add4ec
Remove + icons from folders in the trash
7 years ago
51b4d269be
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
6e086ee779
Add shortcuts in the share modal
7 years ago
fc8847dae4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
08ae327386
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
c5ebbe1a56
New share menu
7 years ago
e52c1fe65c
remove Symbol polyfill
7 years ago
a91a047d73
more polyfill for IE
7 years ago
50e3e3ce91
polyfill Symbol for IE
7 years ago
1dd07ea48a
polyfill MAX_SAFE_INTEGER everywhere
7 years ago
3858aa976a
better warning in case of errors in /file/
7 years ago
4c49cd7592
Fix template picker not displayed anymore in framework
7 years ago
c77e4adf1e
Use local name instead of title in filepicker if it exists
7 years ago
2f74324dac
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
f79e1dfda0
Fix a race condition that could wiped the content of coed and slide
7 years ago
3118dd8312
set logLevel to 2 by default for sframe apps
7 years ago
88a04fdb07
Don't create sfcommon a second time in code and slide
7 years ago
ee605183e5
Make sure we don't have duplicates in the webchannel members
7 years ago
20f05d2f6f
Fix Phantom viewers' revenge
7 years ago
f3d8fd3590
Ability to import local pads on login
7 years ago
47203c37f1
Remove console error caused by setTimeout called with undefined
7 years ago
a40315aff7
Remove ability to delete comments in polls for readonly users
7 years ago
85edc028ff
Remove logging about filepicker rpc
7 years ago
a4b35728dc
Todo app has a hash in the omnibar
7 years ago
68ce7fe53d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
d59bc4612d
Ability to disable the drive for anonymous users
7 years ago
844d04df87
allow custom logout hooks defined in app config
7 years ago
5b4e5480cb
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
9b78580d8e
make usage-bar display optional
7 years ago
db0d2e161c
Hide pad creation screen features if it is disabled in app config
7 years ago
b01d00f74a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
daef08a9b3
Add an advanced new pad modal
7 years ago
cd26a4c093
Added a test of /login/
7 years ago
e377d606be
Fix spinner style in the new settings category
7 years ago
69aee6c21b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
378322a521
Don't finish the test until ChainPad settles, trying to eliminate a flicker
7 years ago
c460e2820e
Fix a 1px offset for the userlist in Firefox/Windows
7 years ago
bd9c44dbb2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ef480fea79
Add a settings category for the pad creation screen
7 years ago
4808c8b374
Fixed poll which was not working with automated testing
7 years ago
05ad38cfe1
add more config parameters to share menu extension
7 years ago
c31b5aa6c0
make extension point cover share menu for files
7 years ago
13b704d9f6
Fix undefined webchannel when uploading a file
7 years ago
ca3697ae3a
implement extension point for share menu
7 years ago
5346afe51f
step towards customizable login functionality
7 years ago
1fba82540a
remove example code from todo app
7 years ago
151d33db18
Added testing of /poll/ :D
7 years ago
8c9490868b
improve owned pads management in the drive
7 years ago
d74c2a0395
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
e5b9f089fb
Fix undefined webchannel when uploading a file
7 years ago
864e24b2ce
Fixed typo in test
7 years ago
73126ed597
Display the owner and expiration time of a pad in the properties modal
7 years ago
ecd8ef6418
improve thumbnails creation performances in code
7 years ago
77dcc1c705
Fix a race condition when switching language in the code app
7 years ago
65ccfe39ef
Add a 'properties' button in pads to display pad data
7 years ago
071d385850
Remove an unnecessary websocket connection
7 years ago
7defde3c59
lint compliance
7 years ago
0cea5f4596
Create an owned pad and view owned pads in the drive
7 years ago
1ec41f4e09
Ability to pick a background image in slides
7 years ago
59c4df3d9b
Fix 'NaN' txid for RPC when using IE
7 years ago
0f02d76b56
Fix missing callback when uploading files to the drive
7 years ago
d2845b95b6
Fix multiple file upload prompt
7 years ago
f329d65bc8
Ability to reduce the width of ckeditor
7 years ago
10aaa06781
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
869909b101
implement more reliable check for whether a channel on the server is new
7 years ago
b6430d640e
temporary measure to address infinite reload loop due to inaccurate inNewFile condition
7 years ago
bc5554f5f6
Display an error when visiting the bounce app without href
7 years ago
2fd22c6db6
Fix task list in markdown when using one empty line between tasks
7 years ago
5e8b183ee6
Fix uncommited column in poll hidden in published mode
7 years ago
7164d2dfdd
lint compliance
7 years ago
26f5a1fe74
signal that onLocal is called by onRemote
7 years ago
888739e333
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
fa6106a6bb
Use CSS to remove the loading screen
7 years ago
b0fe323a4c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
c0b5dc7536
make loading screen tip presence configurable
7 years ago
a26031c119
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
0e6e68aaff
Remove print prompt in slides since the browsers already have a prompt
7 years ago
892dfb18f7
check if users have service workers
7 years ago
5f42a9749f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
4aa8d92a53
handle errors when constructing thumbnails from file metadata
7 years ago
5532b779fd
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
d1d75f2f25
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
590e77aafa
lint, missing semicolon
7 years ago
4117eb71cc
Report the number of tests
7 years ago
c928be028a
Upgrade the testing framework to allow multiple tests
7 years ago
f7d30318cc
Disable editable inputs in poll's read-only mode
7 years ago
edc236e17b
Disable edition in pad read-only mode
7 years ago
f4078d68f0
Remove the 'edit username' button in the userlist in readonly mode
7 years ago
78f738143b
Hide the markdown toolbar in read-only mode
7 years ago
3177fd7857
hide whiteboard palette in view mode
7 years ago
37dcf7285a
Need to be exactly true, not just truthy
7 years ago
dc7dbb3e96
Accidentally made a test which hangs...
7 years ago
cbd7351d53
Improved logging if there's a non-empty-newdoc
7 years ago
d9323cc458
stubbed a failing test
7 years ago
cfc9ce33d6
Hide the tags button for anonymous users
7 years ago
09433e0bf0
display existing tags in the prompt in drive
7 years ago
3c0806659b
Better logging if we trigger the doc emptystring issue
7 years ago
7842c730a4
support for testing on safari
7 years ago
e587e9cd57
allow specifying the browser in selenium
7 years ago
38e28ebc9a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
3c2d6af4f0
save pending tags when clicking OK on tagPrompt
7 years ago
47e4ce623a
Fix import pads from anon drive at registration
7 years ago
d666e9e7ee
Remove tag and filepicker buttons for anon users
7 years ago
c18d4297e1
Fix friend requests from the userlist
7 years ago
6a2d79249d
Added some nice testing
7 years ago
f292407c6e
Fix present mode in the code app
7 years ago
50ddad5e41
Fix an issue with the tag prompt removing all keyup listeners
7 years ago
92a8e107d7
Use the correct hash when opening the todo app for the first time
7 years ago
bb548b3428
Merge branch 'staging' into better-testing
7 years ago
3188ea3f35
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
6ac4fa4689
wip
7 years ago
a08cf8faa8
Allow drive to receive updates after leaving history mode
7 years ago
afcf3d06b3
unpin pads when they are removed from your drive
7 years ago
1a0ac9830a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
c0e49211c4
eat errors related to cursors
7 years ago
bba974947b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
6bcc72ff83
Fix pads using an old URL
7 years ago
8582f92892
Attempt to handle the possible scenario where we are overwriting an existing pad with the initial content.
7 years ago
50b6a23067
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
76af3b90a7
stub createUnpinnedWarning0
7 years ago
7b8321c263
make a test fail so we don't forget to fix the bug
7 years ago
a863011a0c
Fix profile in read-only mode
7 years ago
0d05d880ee
Fix the bounce app
7 years ago
b30efff5d1
Better way to check if we're using the safe origin in bounce
7 years ago
b1765c6ae3
Fix pad creation screen with anonymous users
7 years ago
c269929319
Fix creation page not displayed in pad and slide
7 years ago
362104ec09
lint compliance
7 years ago
89cc583f53
Call the handler if onReady is called for a ready channel
7 years ago
dcfccf88cd
Merge branch 'creationpage' into staging
7 years ago
353b146644
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
1922dbfd75
Creation page with mobile support
7 years ago
dd44b4da99
Removed old /less/ directory which is nolonger used :)
7 years ago
7a09bf43eb
Fix a truly silly mistake in rpc.js and make the pad-not-pinned message get removed if a registered user joins
7 years ago
008b2cc67e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
12b0f3e201
Pad Not Pinned: Better CSS, moved element outside of the title element, added it in poll, better colors, tippy, and login/register in same window
7 years ago
06422e6d5a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
38bd27303b
WIP rpc framework
7 years ago
617c4b6044
CSS refactorings and pad-is-not-pinned work
7 years ago
e96d54e655
Add a pad creation page
7 years ago
0080dd7624
Fix codemirror width with small screens in the code app
7 years ago
4377f2cee7
Fix missing translations in the drive
7 years ago
203c5d64c1
Focus codemirror after using the markdown toolbar
7 years ago
e72270d4a4
Add feedback when sharedworker is defined
7 years ago
1ac4abc482
Remove old code
7 years ago
64303b4090
Merge branch 'refactor' into staging
7 years ago
3e064e6638
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
604ea1c95f
Feedback about webworkers
7 years ago
ba74f9d37a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
1dabea84d9
Overrides to colortheme.less will nolonger block the adding of new keys to the original file
7 years ago
61935500f4
Lint compliance
7 years ago
9eb33e39e6
Enable change events in the drive
7 years ago
c702a23c77
Initial work on the 'pad will expire' logic
7 years ago
17636769e4
Remove the second network created for the drive
7 years ago
291eb57027
fix auth app
7 years ago
52712c4bb9
Use the network from the async store for pads
7 years ago
e397f66b56
lint compliance
7 years ago
de7806504b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
f52d987515
Ability to resize avatars before uploading them
7 years ago
34223e4b78
remove accidental inclusion
7 years ago
0b54a76211
lint compliance
7 years ago
cd29208267
fix toolbar's incorrect gotoDrive title
7 years ago
e85e2dcabd
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
d3d9e2e771
WIP: refactoring rpc code
7 years ago
afcc888a8b
make flat dom quiet again
7 years ago
e164edec03
Fix the webworker app
7 years ago
b14228da18
Merge branch 'staging' into refactor
7 years ago
c59c6072f3
Remove jquery from outer
7 years ago
fc027ba00b
Test webworker app
7 years ago
c6b8bbea59
Fix tests
7 years ago
04e02871bc
Merge branch 'refactor2' into staging
7 years ago
4903bd0757
Enable messenger in async store
7 years ago
bd85f1b003
Fix file upload and remove unnecessary dependencies
7 years ago
7c8572c99d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
5187b3f26c
Flow compliance and fix a few bugs in rpc.js
7 years ago
664625a6ef
Fix more async store issues
7 years ago
d1277d7026
Merge branch 'staging' into refactor2
7 years ago
3f892e04a5
fix codemirror overflow css
7 years ago
5c3237e093
Fix issues with the async store
7 years ago
b3688db202
Use async store
7 years ago
0840570fbf
Async store part 1
7 years ago
96cf83af34
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
385ac9607c
pass 'self' into common-util instead of using window
7 years ago
acd8ab7446
Add the markdown toolbar in profile
7 years ago
b0a384e8e0
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
74e59a513a
Add the markdown toolbar to the slide and poll apps
7 years ago
22c5ff757b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
650d26afea
use unified listmap in profile app
7 years ago
68d602f74a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
644f6e9985
Use the bounce app to open links from inner
7 years ago
5eacc158d9
make tests pass again
7 years ago
812df7de6f
Merge branch 'merge-staging' into staging
7 years ago
be5c5831dd
lint compliance
7 years ago
444ba91287
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
b0f553e9ea
Add a markdown toolbar to help with the markdown syntax
7 years ago
77c81f2426
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into merge-staging
7 years ago
4ff4ccd1d3
use faster and more correct 'find' implementation
7 years ago
e3f04ef076
Merge branch 'soon' into staging
7 years ago
71cf3a4ddf
fix creation of personal todo list
7 years ago
701af29192
fix broken register/login process
7 years ago
a3c093838c
merge latest staging and resolve conflicts
7 years ago
56102d3689
use unified listmap
7 years ago
661db129b2
lint compliance
7 years ago
80978377f2
return transformed cursor value
7 years ago
2e00214783
drop unreachable code
7 years ago
ee6c2097f5
resolve merge conflicts
7 years ago
9795ac32cb
Ability to burn an anonymous drive from the browser
7 years ago
4b5abdecbe
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
280a7c2765
Clean cryptpad-common
7 years ago
98c2b0c802
Merge branch 'soon' into staging
7 years ago
3ff0eb116b
don't let search interfere with renaming
7 years ago
eba1c9dfac
Add chainpad log to the debug app
7 years ago
a660c03f97
Fix scrollbar in the debug app
7 years ago
30cea8888d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
06011065d2
Add a debug app
7 years ago
60c4973d62
resolve merge conflicts
7 years ago
585f9d2e4e
repair broken 'clear channel' button
7 years ago
000f3edd1d
Constants file
7 years ago
477f14bb8b
Put constants in a separate file
7 years ago
9d662bd337
fix right-click pad creation in drive
7 years ago
d726c95f0b
fix namespace collision
7 years ago
c8a9afb6c8
remove duplicate loading screen
7 years ago
7f88d1d43a
Improve drive loading speed
7 years ago
06ede6b294
Fix export in apps using framework
7 years ago
c35e3d644e
Make sure dates are stored as numbers in the drive
7 years ago
655dfe971d
Add translation for the edit username button in the userlist
7 years ago
eb88efd83f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
80803ad076
Fix empty codemirror after thumbnail creation
7 years ago
a8d5a68eb5
open links correctly in contacts app
7 years ago
7441a68fb9
update test after merging api changes
7 years ago
d1beb6493b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
b96ea47f1f
strip tracking parameters when parsing urls
7 years ago
e2cf46d725
Add new keyboard shortcuts for the drive search
7 years ago
cf26c4c286
Improve the toolbar UI for smaller screens
7 years ago
fc02f97d78
Use less2 classes in the user menu
7 years ago
41a082c46d
Fix video thumbnails
7 years ago
fd258fc277
Fix preview button tooltip in code
7 years ago
fe9261f6a2
Fix modules order in TODO
7 years ago
af8aa25228
Add an option to never rename a file during the session
7 years ago
31b31654ec
Lint compliance
7 years ago
25d3d321da
Ability to rename a file before uploading it to the server
7 years ago
2813b7219e
Fix the public key using the wrong domain in settings
7 years ago
a96e49d55a
Fix filepicker creating a new netflux network when initialized
7 years ago
630ac45948
Fix laggy and blinking tooltips
7 years ago
1f53304ad3
Display a dropdown menu inside another one
7 years ago
014e12b5b5
Ability to update the username from the userlist
7 years ago
bdd24ed14f
lint
7 years ago
7cfe64fc5b
Remove cryptpad-common dependency for some inner apps
7 years ago
1514ad5df3
Move the 'logged out' screen inside the sframe
7 years ago
5a2afb5c95
Remove Realtime and Messaging from common
7 years ago
30c8c253dd
Remove util and hash from common
7 years ago
c9e1de042c
Remove common-interface dependency from cryptpad-common
7 years ago
dc207393fd
Separate UI elements from cryptpad-common
7 years ago
50da6b3b2e
Needs to be handled in chainpad-listmap
...
Revert "Do content checks on the drive so if it gets corrupted, the patch will be rejected"
This reverts commit eaa7b6e8e5
7 years ago
eaa7b6e8e5
Do content checks on the drive so if it gets corrupted, the patch will be rejected
7 years ago
354c63bd64
Clean old code
7 years ago
ac66511f0a
Merge branch 'staging' into new-diff
7 years ago
be848c1bec
Fix broken readonly link in drive
7 years ago
f931574dac
lint compliance
7 years ago
7b62a8042e
Remove TextPatcher and begin to include ChainPad directly using requirejs instead of sniffing off the window
7 years ago
840cd91bcb
manual merge
7 years ago
75130150d5
Refactored out TextPatcher and JsonOT and replaced with new ChainPad
7 years ago
cf5ccf04f2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
101482b8cc
Migrate settings to use a sandboxed iframe
7 years ago
7f8147b18b
Merge branch 'soon'
7 years ago
c1ba08cfc6
Make sure thumbnails are .png
7 years ago
0956905ca8
Wipe localForage on log out
7 years ago
6b9ffe8dd1
Make thumbnails more secure
7 years ago
454fc8498c
remove old* apps
7 years ago
e07bb0f7b3
roll back to old transform function, except in pad
7 years ago
a592317e35
lint compliance
7 years ago
fef97ed60e
Fix an creating duplicates mediatags in markdown preview
7 years ago
9060464f37
Create thumbnails only when the tab is not focused
7 years ago
a37e6c7979
lint compliance
7 years ago
2a3a5c4342
Ability to disable thumbnails
7 years ago
5dff9a32b6
Fix comments order in polls
7 years ago
1871749b6f
Fix -1 viewer in the userlist when disconnected
7 years ago
cf3024ef5b
Ability to display an error in the toolbar state
7 years ago
8de9a596f1
Fix cursor in thumbnails
7 years ago
fd7bb3aadb
Make sure the infinite spinner modal is not displayed multiple times
7 years ago
3ebb5ca493
Fix issue in diffMarked creating text nodes for each character
7 years ago
5438970ab4
typo
7 years ago
e0f7df80b3
Fix avatar upload and use less2 everywhere in profile
7 years ago
7f9b21405b
Add missing files for profile
7 years ago
e99836bae2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
4250688856
Migrate profile to use sframe
7 years ago
744809101c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
867df1db56
fix '+New' button in drive toolbar
7 years ago
907e2cb517
lint compliance
7 years ago
abc511a56e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
68accaf653
Todo in sframe with less2
7 years ago
11b8b380fd
Merge branch 'staging' into evilham
7 years ago
04f26ff886
Merge branch 'staging' of github.com:evilham/cryptpad into evilham
7 years ago
0a14c715ad
add test for support of invite urls
7 years ago
5dcfbd07ab
Merge branch 'theming-improvement' into staging
7 years ago
4933aafbc8
Added default values to avoid breaking existing themes.
7 years ago
4c0049ad55
don't log presence of other users as 'joins' when you have first joined
7 years ago
325f685f3e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
1cbf1aec92
prevent undefined access in non-sframe apps
7 years ago
ac1b67ad67
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
1245b4d244
Enable thumbnails in poll and whiteboard
7 years ago
d644054e3f
lint compliance
7 years ago
ed253e6c75
Merge branch 'staging' into evilham
7 years ago
df1a700cb2
disable thumbnail test. add test for flat dom
7 years ago
02cd7e5b58
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
69890ebd8f
prototype alternate datastructure for trees in listmap
7 years ago
23c305f71f
implement removeItem so localForage doesn't complain
7 years ago
735f0a7e30
Merge branch 'theming-improvement' into staging
7 years ago
83da9cf752
Moved colours to colortheme.less to enable theming
7 years ago
8251247da2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
6f020b67ca
Add thumbnails to framework apps
7 years ago
98c66ef8f6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
bf817f20ee
Fix file upload in code and slide
7 years ago
f031af4e9d
fix broken media-tags in contacts
7 years ago
24572a40d2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
f4adbd980e
Thumbnails for the code app
7 years ago
ba97aa7ad2
allow file upload handler to create thumbnails for whiteboard
7 years ago
6157c57a4b
disable color palette when interface is not editable
7 years ago
8359902f6a
fix typo in poll
7 years ago
69f9a7ebf3
make userlist change notifications configurable
7 years ago
027b9fa383
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
aa37997aa3
Enable JSON-OT again because it is working now that the arguments are passed in the right order <facepalm>
7 years ago
bac608adfe
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
dc90811090
only call onReady once in sframe-listmap
7 years ago
bac10472f3
lint compliance
7 years ago
39b4cb9226
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
18b5b20d27
Add thumbnails for PDFs
7 years ago
aee51f1317
lint compliance
7 years ago
447b0a74ee
handle errors for videos when uploading
7 years ago
30a69fae13
Add thumbnails for videos
7 years ago
21f8ae7570
Keep the correct ratio for image thumbnails
7 years ago
2dd3c42fd5
Fix handlers registered again on reconnect in drive and poll
7 years ago
a0bcb901d3
Add titles in poll when options or usernames are overflowing
7 years ago
74985fd0f2
Use text for the addUser button in polls
7 years ago
6db5a34323
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
c17fc2efe7
improve option order in poll
7 years ago
2be22867c1
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
13718d0263
Fix recent pads in chrome
7 years ago
2e5fdf709a
Merge branch 'soon' into staging
7 years ago
de8339fea7
hide alertify when you are in presentation mode
7 years ago
9b02b36724
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
d7e9498143
Fix and then disable the new OT
7 years ago
288e141c1f
add missing sframe method
7 years ago
c1d05a00ba
Improve media-tag export in pad to work with existing CSP
7 years ago
3e4faf1be1
Add new state messages in the toolbar
7 years ago
6d080bcb45
Ability to export mediatag images in pad
7 years ago
a0dd867f33
Fix pending state not removed after friend invite rejected
7 years ago
c25be21138
Fix the upgrade button in the drive
7 years ago
cc6b2192e4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
a3c7aa67d8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
094856a511
Fix renaming pad with multiple dots in the name in drive
7 years ago
bf832ba784
fix comment overflow
7 years ago
7bc2f81852
Fix pinned column not always stored in polls
7 years ago
88e7f9a218
Add last access and creation times in the properties window in drive
7 years ago
22e3baed4b
Fix sort issues in drive
7 years ago
f43606f71d
Present mode to display only the parsed markdown in code
7 years ago
515214aed1
Use present mode in embed code
7 years ago
201c974df6
Merge branch 'thumbnails' into staging
7 years ago
7b8490ad20
Use less2 in contacts
7 years ago
dd63cd13d7
Fix profile page title
7 years ago
81d0b3272d
Fix multiple infinite-spinner errors piling up on top of eachother
7 years ago
9e4c48f537
lint errors
7 years ago
a149152f11
Merge branch 'staging' into framework
7 years ago
4197b7b968
Fix missing icon in list mode for files with thumbnail
7 years ago
d941b1098a
Remove selection in whiteboard when uploading to the drive
7 years ago
4116d08dd1
Display thumbnails in the drive and then file picker
7 years ago
6920129126
Embed images from the drive in whiteboard
7 years ago
867b971c33
Compressed images: PNG recompressed pixel identical, JPGs recompressed visually identically. Saving about 9.8%≈580kB overall, to speed up initial and repeating client connections.
7 years ago
2fd120100a
Merge branch 'wb' into staging
7 years ago
15337603bb
Merge branch 'staging' into framework
7 years ago
a6b34491fc
freeze the editor when reconnecting
7 years ago
854c1e94a4
make infinite spinner error message go away if ChainPad settles after it has been popped
7 years ago
a859ab081a
Fix fouc in drive
7 years ago
7b6432f134
Lint
7 years ago
6926d42292
Autoload template picker to make it faster to appear when used
7 years ago
1c8e1a36e8
Add file type in the pad attributes for existing files
7 years ago
b86f8e3f26
Fix uloaded files not moved to the correct folder in drive
7 years ago
88d0a2b8a6
Merge branch 'master' into staging
7 years ago
5ed60a0ad7
Fix image ratio in slides
7 years ago
753e2d797e
Merge branch 'staging' into framework
7 years ago
62bc72847f
Add an error message when trying to tag a deleted pad
7 years ago
c773b5d076
Remove a brittle test which can make a pad inaccessible, switch from transformFunction to (new) patchTransformer and add another DOM.normalize() which is needed
7 years ago
69dd3a60ab
Hide template and fileupload buttons for anonymous users
7 years ago
8e1f15e88d
Get title suggestion based on poll's description
7 years ago
e317265594
Merge branch 'master' of github.com:xwiki-labs/cryptpad
7 years ago
0d912402e5
patch for bug in Firefox ESR
7 years ago
91381ca77d
Fix lint errors
7 years ago
50090a3af6
Add placeholders for the comment form in poll
7 years ago
95ad25973e
Ability to delete a stronger pad from readonly mode
7 years ago
b28c1537e8
Fix history in readonly mode
7 years ago
620ba4ed5d
Fix fouc in drive
7 years ago
b31bbebf7b
Buttons are missing in whiteboard when zoomed in
7 years ago
a5a08176fb
Merge branch 'master' into staging
7 years ago
54b5a2d654
Fix style issues in poll (Chrome)
7 years ago
86767184da
Fix style issues in poll for Edge
7 years ago
00e8d32d60
Fix column position in poll for Chrome
7 years ago
b110e1b8da
Fix style issues in poll for Edge
7 years ago
ecb537ac7f
Move code to render.js in poll
7 years ago
75b3ff9c60
CSS issue in polls
7 years ago
c46280d032
Fix style issues for Edge
7 years ago
128c9c2f4e
Merge branch 'staging' of github.com:CatalinScr/cryptpad into catalin
7 years ago
f0bdc3b26f
second try
7 years ago
d50a692986
add note about tags to prompt
7 years ago
c8928a0811
Switch the transform function and also stop calling textPatcher without the metadata
7 years ago
035150614d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
484e216054
Fix hashtag button in the toolbar
7 years ago
4c19375f4d
Avoid missing characters in poll's inputs
7 years ago
a12239405b
fix toolbar 'home link' to visit home page from drive
7 years ago
dd141b5c9f
Disable comments when a poll is not published
7 years ago
36aee2d174
lets try normalizing the dom before applying a patch
7 years ago
828a685ba8
Fix broken browser fight logging
7 years ago
aa744567ed
Fix thumbnails in sframe apps
7 years ago
5e7bf0cfb8
Embed an image in whiteboard
7 years ago
f0eb58ee95
Merge branch 'staging' into framework
7 years ago
9509d538e0
Cursor not being updated at the right times before applying a patch.
7 years ago
888028c542
Lint
7 years ago
e5a54b5978
Fix folder highlighting with drag&drop in the drive
7 years ago
1c7c37c121
Add the file class to pads in 'template' and 'recent' categories in the drive
7 years ago
ab3648a30a
Merge branch 'newpoll' into staging
7 years ago
1c4f1c785d
Improve stability and UI in poll and its comments
7 years ago
7559bc062e
lint compliance
7 years ago
503111d26a
use recompiled media-tag
7 years ago
427afc3954
override modified file name in pdfjs
7 years ago
d85db64939
add tags from drive
7 years ago
0aecfad854
Occasionally the language selector only says "Mode" rather than the language
7 years ago
ae87320408
Preview pane cannot be resized after it has been hidden and then shown again
7 years ago
1f35798194
stop event propagation from tag prompt
7 years ago
c936e5ae73
make context menu open correct app on correct port
7 years ago
d9e97b86e6
Merge branch 'staging' into framework
7 years ago
383c2f54cb
1. Add a class cp-hidden-if-readonly which is display:none if the pad is in read-only mode. 2. Don't show color pickers or options when in read-only on presentation.
7 years ago
deed04108b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
a90c078e84
correct reference to undefined
7 years ago
26dfc65c25
Comments in polls
7 years ago
5304dc319f
Enable redirection to the previous page after registration
7 years ago
ceb8ff18bd
Fix ghost icon in drive
7 years ago
846b1a9fb3
Improve description UI in poll. Enable tags and mediatag
7 years ago
68bda92291
Use codemirror for description in poll
7 years ago
b8ce149db6
add hint about tag usage
7 years ago
f15ec4efe9
add tagging to whiteboard and file apps
7 years ago
f90742603e
style fixes
7 years ago
d6570ad9f2
Standardize media-tag embedder and make media tags always absolute URL, Standardize import/export logic for codemirror apps, fix arrow key navigation in presentation fullscreen mode before first click.
7 years ago
707d3b3e94
Ability to export polls as csv
7 years ago
5cf86bf74a
Update UI in poll and remove old code
7 years ago
09c0a473e2
fix function signatures
7 years ago
3337689630
Wrong translation key in toolbar
7 years ago
94d2f4472b
Stop using presentSuccess because it is hidden behind the modal in slide
7 years ago
126742a1c3
Fix bugs in sframe poll and update UI
7 years ago
351b95d6a9
resolve merge conflicts
7 years ago
6c7b135f91
lint compliance
7 years ago
94c392b79f
secure messaging
7 years ago
53f65f6a87
Merge branch 'staging' into framework
7 years ago
fa6938baa8
1. Migrated /slide/ to use framework
...
2. Fixed CSS not being applied on /slide/
3. Minor changes to /code/ to reuse code which is also used on /slide/
7 years ago
1e5bc5da14
onReady should only be called once, onContentUpdate should be able to throw and there should be a generic normalizer
7 years ago
7230c780a1
Get rid of last usages of cryptpad-common in pad/inner
7 years ago
12e82e80ec
When changing the title of a presentation, the title in the bottom of the slide should also change
7 years ago
0a99478d9f
catch diffdom errors and plow through
7 years ago
0f9e93e1de
make tests pass again
7 years ago
48c49e5a75
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
19e58cec94
prevent typeError
7 years ago
66da349ee4
Sandboxed Poll app with less2
7 years ago
f95acda758
Minor refactoring of /pad/ ; moved /*/main.js into a common file ; framework'd /code/
7 years ago
6dbc02e81a
Merge branch 'staging' into framework
7 years ago
1c791b5b51
Fix framework by removing some async and also fix media tags
7 years ago
90d00c10b1
Make metadata-manager a bit more robust
7 years ago
9b2251005c
Merge branch 'staging' into newpoll
7 years ago
8de1852ab9
Lint compliance
7 years ago
2c10f9b07b
Merge branch 'staging' into newpoll
7 years ago
e02a779c14
Use secure drive as default drive
7 years ago
b4de31c827
Merge branch 'newdrive' into staging
7 years ago
c1275b5671
Prepare secure poll
7 years ago
4c394e0031
Fix UI issue in poll
7 years ago
342b6012f7
manual merge of staging into framework
7 years ago
cf6030ab8b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
e62c5e1d07
Add some debugging lines to help synthesize error cases
7 years ago
9571b3c018
persist whiteboard content across sessions
7 years ago
748172585e
update for modified id
7 years ago
4cd7d8eda4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
345bfc1cea
Remove migration for pad attributes
7 years ago
52be5501d6
remove invalid test
7 years ago
69014e5fde
Fix mediatags in pad not cached
7 years ago
b3e066eaca
show loading screen tips during loading screen
7 years ago
77fe6a9bba
small bug fixes
7 years ago
1b01855dd2
Merge branch 'staging' into framework
7 years ago
1fd7a6e2b3
Mistake in mkEvent which makes all events only work once
7 years ago
368a6b2406
manual merge, still wip
7 years ago
cdeac00633
Merge branch 'staging' into newdrive
7 years ago
a8eecee590
Fix access to undefined variable in drive
7 years ago
91e36171eb
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
138ad17e3e
Fix 'import local pads' in settings creating duplicates
7 years ago
59ad96e491
Make sure the user is redirected to the drive at registration
7 years ago
d2f1d0c0e9
Fix readme pad not added at registration in sframe drive
7 years ago
ae54cbca33
Refactor sframe-cpnf-inner to export chainpad
7 years ago
44018ee7e1
Improve the LessLoader check to hopefully stop the message saying cookies were blocked.
7 years ago
b15527565c
Allow passing arguments when firing events
7 years ago
0eb2165f31
Implement a new pad framework and make it work (seemingly) with /pad/
7 years ago
d9845d3450
Refactor sframe-cpnf-inner to export chainpad
7 years ago
f418ee9632
Improve the LessLoader check to hopefully stop the message saying cookies were blocked.
7 years ago
72f03b2a47
Allow passing arguments when firing events
7 years ago
1afbd4648d
Fix old drive
7 years ago
b871faffc9
Enable tags in code and slide
7 years ago
6aeb366767
Lint
7 years ago
0600ce59ec
Display the 'spinner' when typing in sframe apps
7 years ago
1d7683503f
Fix link origin in sframe upload table
7 years ago
92c808812a
Fix missing style in toolbar/less2
7 years ago
deba699d08
Remove old style for sframe drive
7 years ago
4049931924
Lint
7 years ago
c364377d7c
Use less2 in sframe drive
7 years ago
47fe7b1c53
Drive in sandboxed iframe
7 years ago
dfdeb7b113
Fix style and race condition for history mode
7 years ago
a810d7bd85
Fix style and race condition for history mode
7 years ago
456370b1aa
Base for Drive in sandboxed iframe
7 years ago
95302366d1
lint compliance
7 years ago
68f7d4bc0a
more conformant tagPrompt behaviour
7 years ago
db4c3e7e2c
Merge branch 'master' into staging
7 years ago
b5b84f540e
fix preview mode class
7 years ago
f990200996
drop any notion of crypto from sframe-listmap
7 years ago
a1c124f1be
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
95542bcdaf
Lint
7 years ago
c9223cb942
listmap does not care about 'readOnly' mode anymore
7 years ago
88914ec6cc
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
8a09e39f46
Enable tags in pads
7 years ago
d2b27f3588
resolve merge conflicts
7 years ago
4af01e6e9e
make listmap consume cpNfInner
7 years ago
72f0952835
Make sure we can't open a pad using the wrong app
7 years ago
35a313d6ee
Make palette realtime
7 years ago
6fdd66167a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
3023e8c855
Fix templates in whiteboard
7 years ago
732585ea7b
Sandboxed iframe for the whiteboard app
7 years ago
029a8e3023
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
d72146ba7f
use setAttribute for assigning attributes in hyperscript
7 years ago
a78b597ebb
lint errors
7 years ago
8ce364a252
Add a button to empty the trash in the drive
7 years ago
a1e7bf701d
Select the element after clicking 'show in folder' in the drive search
7 years ago
f9d27d2783
WIP secure contacts
7 years ago
483160a96a
Fix tab notifications in code and slides
7 years ago
1131ef0172
Fix language selection in sandboxed iframes
7 years ago
0a656ca8d6
Fix the splitter in code and add it back
7 years ago
018f71df04
Add drop handlers for mediatags in ckeditor
7 years ago
c00d295466
Add missing translations
7 years ago
a927f40f02
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
974658453c
Mediatag integration in pads
7 years ago
08e0ae424d
log errors in less compilation
7 years ago
15db6b180c
copy bug fixes from changes
7 years ago
5b45e92250
delete range requests after they have completed
7 years ago
4f6909fce3
set icon to 'faded' styles
7 years ago
086d4bae32
clean up contacts initialization
7 years ago
96d0456f31
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
1091e0b375
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
47ce645897
implement slice
7 years ago
a8f7beb20b
remove deprecated apps
7 years ago
6ed4f2fc64
fix a thing
7 years ago
8a564bf350
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
513f8e73d4
refactor cryptpad.ready to use nthen
7 years ago
c50c297490
Fix the size of the loading screen for the filepicker
7 years ago
b643ccc232
typo
7 years ago
652c916690
change the command in the documentation so that it will not change itself
7 years ago
5f0383ae99
update version of sframe-boot because it was changed
7 years ago
845f75f8a7
remove a 100ms dead spot from page load
7 years ago
b24e9b84af
Manual merge, update the CSS in loading.js and document that loading.less does nothing.
7 years ago
8a32b72ffc
1. implement cryptpadCache which has put() and get() functions that can be used like a localStorage that auto-flushes when a new version is released
...
2. change loading.js to use packaged css in order to get the loading screen up as quick as possible.
3. change LessLoader to cache less in cryptpadCache
7 years ago
4d688289cc
lint-compliance
7 years ago
2797a77f5d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
47cfa0cf45
Focus the editable content when opening a codemirror pad
7 years ago
f039fc7ff5
develop a system for avoiding z-index problems
7 years ago
bafa401473
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
fa64adbbe5
Hide visible elements while loading the slide app
7 years ago
fbd4be6135
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
d360e2d0f4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ab64bf9e59
Use less2 for the loading screen
7 years ago
710418f42f
Make LessLoader able to cache even inside of the sandbox iframe and don't load less compiler unless needed
7 years ago
a332168926
fix some bugs in prompts, alerts, confirms
7 years ago
0db33d48fc
properly handle variable args in Cryptpad.alert
7 years ago
8a87ec180e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
0d8c292fef
Merge branches 'staging' and 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
789a923792
Change font-awesome to be pulled through LessLoader which will rewrite the font file URLs to use ver= parameter
7 years ago
d46cc8226d
Update LessLoader to be capable of loading CSS as well as less files and properly rewrite the URLs
7 years ago
dc86579d46
use an 8 character password for tests
7 years ago
e1f090bb9d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
244e3ecba7
support forefront flag in alert config
7 years ago
63cb5dfc1e
Make less loader rewrite urls to use version parameter
7 years ago
d967df2cec
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
e3c0ec29f7
Hopefully chase out a race in sframe-channel
7 years ago
8c41e0bdd6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
437f50fd4a
Migrate the file to a sandboxed iframe
7 years ago
1713167a5d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
981a919328
Added tooltips back to sframe land with hopefully a more robust removal.
7 years ago
5ac3e97dc8
Merge branch 'master' into staging
7 years ago
7d720c73a9
Merge branch 'soon'
7 years ago
ddbda08c88
Fix an issue when cleaning the template category in the drive
7 years ago
9d229b8868
lint compliance
7 years ago
5b3667fd4e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
63700cb791
Fix an issue when cleaning the template category in the drive
7 years ago
a87ccdc37e
remove redundant lines
7 years ago
da0e31fa54
guard against possible type errors
7 years ago
0f9da69185
Show if a pad has been renamed in the drive
7 years ago
499b5ea2ba
warn that a password is too short before doing anything else
7 years ago
a0b3201df3
fix focus on alerts, prompts, and confirms. call back from alerts
7 years ago
a74915ab58
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
671c893e8a
Duplicating code like a moron, this should hopefully get fixed later.
7 years ago
5a4836fe6d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
79094aa4bb
Fix closing the title input when the title is not modified
7 years ago
58c38dd77b
focus on the current window when you pop an alert
7 years ago
b9545f45f7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
306fec2d0e
improve messages for template picker confirm
7 years ago
1943c83f69
clean up api for Cryptpad.confirm
7 years ago
8d3ebdbaf7
I'm stupid
7 years ago
041071e61c
manual merge
7 years ago
7334173b4a
Hopefully fix infinite spinner whenever there is a disconnect (pad)
7 years ago
9271b0c1a8
Try to fix half-codemirror bug
7 years ago
304a8df808
Remove unneeded migration and fix attributes migration
7 years ago
5a1abc8986
let's try using actual js syntax
7 years ago
134c6057c1
Merge branch 'slide2' of github.com:xwiki-labs/cryptpad into origin/slide2
7 years ago
59d25b4c1a
use camel case, not snek case
7 years ago
520b8967fd
allow people with short passwords to log in
7 years ago
8ef27dca08
Lint
7 years ago
1aef844fc3
Fix title attribute for truncated titles in the drive
7 years ago
55fe882f64
Fix readonly mode in code
7 years ago
bd422178c4
Hide the filepicker button in readonly mode
7 years ago
51f1be9f7a
Improve the input style when renaming a folder in the drive tree
7 years ago
642511dc3b
Disable exiting present mode when in embed mode
7 years ago
403b62f131
Fix ghost icon modal and improve UI on mobile
7 years ago
757d0a2800
Save the state of CKEditor's toolbar (visible or hidden)
7 years ago
5bf966633c
Merge branch 'staging' into slide2
7 years ago
514bff7065
Add slide number in the title in slide2
7 years ago
0ed6846e07
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
b5b9f931c7
don't use common-realtime
7 years ago
32e8c8ef4b
implement alertify without alertify
7 years ago
a302ee5d25
guard against undefined arguments
7 years ago
c3a07e879c
Merge branch 'staging' into slide2
7 years ago
fc069dac48
Ask the user before loading the template picker
7 years ago
05793c220c
Fix secure iframes on Edge
7 years ago
290d668ceb
Fix race condition preventing slide to work on Edge
7 years ago
de5d925154
autoselect user href in settings
7 years ago
e950ce74cb
focus on input when opening filepicker
7 years ago
739903d511
don't check account usage if you aren't logged in
7 years ago
bbf7ed3827
refactor drive to use dialog.selectable()
...
fix class on alertify-like boxes
7 years ago
1ae7076790
Merge branch 'master' of https://github.com/xwiki-labs/cryptpad
7 years ago
f2aaaa9751
Move slide to secure iframe
7 years ago
809b56625d
refactor ui elements
7 years ago
bca9ba66cb
enforce a configurable minimum password length when registering
7 years ago
1958bca984
restore hashing screen in login and register
7 years ago
fab6264ce6
use loading screen from pages.js
7 years ago
e8298f165a
only display first letter of name if user has no avatar
7 years ago
85003f7a23
lint compliance
7 years ago
cca3c04d43
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
15e24ebe4f
ui for hashtag picker
7 years ago
1b97996ef8
implement util.once
7 years ago
0423a5f4e2
Clean secure iframe code
7 years ago
04a04aef2b
Add setAttribute/getAttribute in secure iframes. Store attributes in settings
7 years ago
61b228db79
Fix double / when storing a file
7 years ago
8b2733e2da
Fix typo
7 years ago
c713b44a4a
Merge branch 'soon'
7 years ago
d98bbf7df9
Fix the pad app when cryptpad is in an iframe
7 years ago
3ca9f41290
Get embed code for pad and code
7 years ago
0bb6698399
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
e85b34f127
Add embed options in the secure pad hashes
7 years ago
47ec959032
make sure contenteditable is not set in read only mode
7 years ago
6a735b441f
use paul's print styles
7 years ago
e7de9229a8
Do not print toolbar and collaboration ( #178 ).
...
paul
7 years ago
b3d5e04bb4
lint compliance
7 years ago
3d2a2da74e
add listAllTags api
7 years ago
31a6881dba
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
305feebbbe
Fix scroll position when refreshing the drive tree
7 years ago
0e8a26e8eb
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
1c50bb3f61
clear hung tooltips
7 years ago
53eb9bb541
Remove the logo from the filepicker loading screen
7 years ago
729c013af7
Get mediatag embed code from the file app
7 years ago
904936209a
Remove loading tips in the file picker
7 years ago
98cd69e53e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
204e45dfae
Enable templates in pad
7 years ago
4108520d20
Add contacts in the new menu if the user is logged in
7 years ago
38e1ed93e4
Merge branch 'code2' into staging
7 years ago
acaf45a0e0
drop thumbnails if metadata is too large
7 years ago
78b338c379
Merge branch 'code2' into staging
7 years ago
db86a2dbee
Merge branch 'code2' of github.com:xwiki-labs/cryptpad into code2
7 years ago
d2787e3eff
Make code2 the default code app
7 years ago
4069945bc4
Merge branch 'code2' of github.com:xwiki-labs/cryptpad into code2
7 years ago
d42d988d36
make test more resilient
7 years ago
cd7b00d45b
make pixels 100px
7 years ago
e8ac5ed87f
add a test for thumbnails
7 years ago
b1a1f4ba13
add encrypted thumbnails to metadata for images.
...
correct decryption logic
7 years ago
b8e913c95a
more thumbnail methods
7 years ago
ffbb21dd2c
use cryptpad-september build of media-tag
7 years ago
c0f14dea5e
Store code2 and set the title at the first visit
7 years ago
86e23ac19f
Use less2 in secure iframes
7 years ago
f12f4bb925
Integrate filepicker secure iframe in the code2 app
7 years ago
a164115e8c
Add media-tag-nacl to cryptpad so it will be hosted on the server
7 years ago
1072e3e797
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ae60b5845f
implement search-by-tag for filesData
7 years ago
72ef730f23
implement tag-related functions
7 years ago
0302c06d0e
send feedback if client does not support symbols
7 years ago
52019dc763
make get and set pad attribute return only cloned data
7 years ago
89b7b644f3
Enable drag & upload in code2 and prepare filepicker
7 years ago
e2719d9098
Add media-tag-nacl to cryptpad so it will be hosted on the server
7 years ago
885282ddea
Fix undefined friend
7 years ago
a60709ff73
Infinite spinner popup leads to frame attempting to reload and failing
7 years ago
b8971cdc23
Add previewMode settings to code2
7 years ago
0d008aaa2e
Add indent settings to code2
7 years ago
f54dc7505c
Migrate indentation settings to a settings subobject
7 years ago
0893bcc0e5
Merge branch 'staging' into code2
7 years ago
f06683e949
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
0ce32464fd
Fix flickering avatar in firefox
7 years ago
9a23b77b46
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
ba0e935add
stub localStorage, and handle errors that might come from touching localStorage
7 years ago
be8ea4102e
keep trying to parse the hash until it works
7 years ago
4db4f66786
Remove an unnecessary fix for Safari
7 years ago
a2ed266048
Move the code app in a secure iframe
7 years ago
1044531806
Fix Safari iframe size issue
7 years ago
a34d1793e0
drop 'loading' text from loading screen
7 years ago
595fa4c2e4
Merge branch 'soon'
7 years ago
181a19a9a0
polyfill for array.fill
7 years ago
51fa6287c1
Enable notifications in secure pads
7 years ago
642dc17910
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
901917983b
Fix an issue preventing pads to be stored in the drive
7 years ago
40f062abda
restore app usage report in new pad
7 years ago
8fb7fef3f5
regular expressions are never falsey
7 years ago
24eac9b4a6
test for flakey tests
7 years ago
7d2a76f4d6
delete dead code. fix off-by-one for messages. turn off history button when history is exhausted
7 years ago
288c03bb41
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
fe03e6ae83
bad code, lint
7 years ago
430a6f7b77
lint compliance
7 years ago
190dff1c9b
Use the bounce app for opening a link with the right click
7 years ago
dec870d2bd
Fix selection in the drive search results
7 years ago
4bceef8952
Fix the upload status table missing in the drive
7 years ago
0b4e044540
Fix the plugin to open a link in a new tab in pad
7 years ago
d9a4a32bf9
Fix avatar for anonymous users in secure pads
7 years ago
00fda0d7d7
Fix avatar in read-only mode (secure pads)
7 years ago
88cb4fd83c
Enable friend requests from secure pads
7 years ago
147d88d845
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
e43c68aa48
Fix viewers number in secure iframe
7 years ago
f89015d9ed
Update the tab title to match the pad title in pad2
7 years ago
1280cd1659
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
51c065d13c
Fix link to main in the new toolbar
7 years ago
d9bf2abcd8
Fix old hashes not working anymore in pad
7 years ago
536fe04790
emit notification when alert, confirm, or prompt are called
7 years ago
e4a356d873
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
056285a7b6
Move pad2 to pad and create bounce app
7 years ago
d4589c4699
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
6c65e5ff72
Fix the ghost icon in the drive and add missing text
7 years ago
5fbbaee2f5
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
6314487d98
handle unfriends in ui
7 years ago
5c2b58e703
log error synchronously so we get a trace when pinPads has no callback
7 years ago
841e3af8da
handle unfriends. clean up. better input validation
7 years ago
c66a0c55e0
ensure that function signatures are correct
7 years ago
91f6e3e543
remove a lot of dead code
7 years ago
e62faf7c7b
Edge fix, always use async iframe onLoad rather than invoking it manually
7 years ago
54eefd3d94
replace contacts with contacts2
7 years ago
57d0c6c973
Merge branch 'new-messaging' into staging
7 years ago
9e04d039d7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
22d754d514
handle user renames
7 years ago
0a6f81850f
Handle infinite-spinner errors and properly inform the user
7 years ago
a99eb9365e
correctly set indentation preferences when changing languages
7 years ago
f58d4c941f
clean up a bit
7 years ago
ea5f47f0f9
remove some TODOs and solve some wee bugs
7 years ago
b75a951a98
encode messages with 'author' field instead of 'channel'
7 years ago
7bbea28831
minor anti-xss changes...
7 years ago
013b75ae67
implement history range requests
7 years ago
b71f1860db
make uid function reusable
7 years ago
443d8a8941
remove unnecessary files
7 years ago
75fde58846
Well that was stupid... (fix bug introduced in acfaaa7d56 when trying to make jshint compliance)
7 years ago
dc283c2d74
Load 1, load 2... not load 1, load 3.
7 years ago
5d9599c9b7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
cbac5e417c
Make loading screen come much earlier on pad2
7 years ago
b6881349be
Fix an issue with the notifications in secure pads
7 years ago
ec64ac485d
Fix 'not a function' error
7 years ago
acfaaa7d56
jshint compliance
7 years ago
2ad9fcee17
Manual merge of notify.js
7 years ago
8a9755611a
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
2dacd57e76
fix caching on favicon
7 years ago
33025a9df9
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
c33b128bf4
Enable feedback in pad2
7 years ago
e81bb3fe08
Fix profile link in the userlist
7 years ago
d6c33fdf4f
Ghost icon to add a pad
7 years ago
89a13d4b21
work on contacts2 until feature parity is reached
7 years ago
002eed0d6f
make most of the messenger api async
7 years ago
d9f5e3638e
Big caching improvements :D
7 years ago
98daf10ed1
Ability to collapse the root directory in the drive
7 years ago
b4864b96ac
Add a recent pads category in the drive
7 years ago
4f3b4a30ee
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
4b70fc9f49
Use resources from the original origin in pad2
7 years ago
20a68ad71c
Hide the template button if the pad2 is a template
7 years ago
aa9e0d3cd3
Enable AppConfig in pad2
7 years ago
4089803785
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
f40d2c0b20
Add templates to pad2
7 years ago
8d020833af
Add missing file
7 years ago
bffa4d01a8
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
b081603455
Update requirejs
7 years ago
8d837d22ea
Add history to pad2
7 years ago
b2e6df1f9d
Add import & export in pad2
7 years ago
1da11a1883
Disable edition in readonly mode in pad2
7 years ago
e2d39de143
Forget button in pad2
7 years ago
e4020ba8d4
Fix pad creation in pad2
7 years ago
140c6f3776
Add limit warning in pad2
7 years ago
30aef71603
Enable avatars in pad2
7 years ago
f88a6f63fe
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
fb4808e1e1
Fix queries callback arguments
7 years ago
6dd1643738
Manual merge work done on loading page to pad2
7 years ago
8b702e0150
wip
7 years ago
e65b2f4e9f
Add shareButton to pad2
7 years ago
beb45740d0
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
90f892de9c
Useradmin menu, notifications and share button in pad2
7 years ago
253ab68d8d
Merge branch 'staging' into new-messaging
7 years ago
498c8229e9
Make following a link inside of the iframe only fail rather than carrying the iframe away from the pad.
7 years ago
0693a98890
create a thumbnail when uploading images from whiteboard
7 years ago
b17044ad98
add support for thumbnails in metadata
7 years ago
dd9b38066e
Change display name in useradmin menu
7 years ago
a96d447e8b
Add notifications in pad2
7 years ago
5e22e1dc59
use CryptPad instead of Cryptpad in titles
7 years ago
cf6d8c83b2
Fix title setter logic and separate it from UI
7 years ago
ec87f3f897
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
415399ef64
Changes to support title change in metadata
7 years ago
d1affebd14
Title in pad2
7 years ago
604415b32c
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
fab3d67b75
Enable title in pad2
7 years ago
909bda4302
This should fix laxy metadata
7 years ago
a4dbf39c4a
fix pdf display problems in chrome
7 years ago
2490ee253f
Added setDisplayName RPC
7 years ago
887a26b1a6
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
0b34ceb0eb
Added RPC setPadTitleInDrive()
7 years ago
bed7d95bf3
use latest compiled cryptpad media-tag
7 years ago
4e62f79594
stop referring to deleted file as background image
7 years ago
3a5526e247
infer pdfjs document title from iframe url
7 years ago
25466aa2f9
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
1d237735ef
Useradmin menu in pad2
7 years ago
3b5af3ea74
sframe common changes
7 years ago
d1157c4d72
Add missing file
7 years ago
d237c76f6c
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
f5855a2870
Add account name in metadata manager
7 years ago
3c0197cbf4
Firefox fails to boot the iframe if there is no number on setInterval
7 years ago
d88704fb50
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
a4850a7fcc
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
fc5bdd3bed
Add lazy metadata to fix parse errors in pad2
7 years ago
ad9f2ff223
Made pad2 server more generic and easy to implement
7 years ago
a125253cde
lint compliance
7 years ago
290763d6c5
don't complain about bad realtime state just because you disconnected
7 years ago
226ef1fd00
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
7 years ago
fb512c8923
Toolbar in pad2
7 years ago
3b20dcd435
add optional cache-busting to favicon
7 years ago
52d344c3d1
Merge branch 'soon'
7 years ago
ee874878dd
clear tooltips when the userlist is redrawn
7 years ago
f207edfd28
handle errors when deriving keys. fix incorrect reference
7 years ago
e04c0b89a1
manual merge of staging
7 years ago
5b7d1cccd7
fix display and logic for tab setting checkbox
7 years ago
3315449114
Lets try this...
7 years ago
4c949a61e7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
6b174934c8
Try waiting for iframe document.onload instead of looping and waiting for document.body to exist.
7 years ago
e7ef1e1c2b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
7c49ca6e3f
Fix initial text size in code
7 years ago
2874ccb5dc
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
2a8abc2699
comment out splitter code
7 years ago
725e19925c
Yeah, that was silly...
7 years ago
b0b1ed037c
Add a filter to catch XSS-like entities and also stub a on-load test which would otherwise make pads inaccessable.
7 years ago
130b330ede
refactor messaging
7 years ago
638a94785f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
7ca60e55a7
Lock the pad's inner-iframe down with CSP
7 years ago
5e6e76dfc1
make regex case insensitive
7 years ago
736288a85b
lint compliance
7 years ago
5037f444e9
update markdown sanitization strategy
7 years ago
878a565f89
tiny little performance improvement in something that really doesn't need it
7 years ago
007db0b080
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
7a698d092e
When Cryptpad.clearTooltips() gets called, don't clear tooltips unless their associated element has gone missing so it won't clear a tip someone is trying to read.
7 years ago
66cacf08da
allow users to write with tabs instead of spaces
7 years ago
64849507b3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
a5f9b49bfb
make poll box bigger so it show text in smaller windows
7 years ago
82fadde249
restyle info-box in drive
7 years ago
958294f109
put code settings in their own tab
7 years ago
c8d7675ede
remove z-index on splitter in code
7 years ago
17b986a6ca
fix toolbar drive link (oops)
7 years ago
ae0b2ca1a8
add label for code indentation
7 years ago
284124a32d
WIP
7 years ago
4acd9957a9
Set the url if there is none
7 years ago
33e73dd5e5
fixed one last fight
7 years ago
9c0b0cc6a8
Merge branch 'staging' into pad2
7 years ago
1e56fa31c0
yay, they talk and they don't fight
7 years ago
1c526feffb
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
fbb880f277
implement customizable indentation widths
7 years ago
b3d349bf80
Merge branch 'staging' into pad2
7 years ago
8efac4e661
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
7 years ago
0dde1d7507
wip
7 years ago
baf64114a6
point to homepage in drive
7 years ago
9dce40f3af
only add the splitter once
7 years ago
4026994310
make splitter work when scrolling
7 years ago
c304071492
wip
7 years ago
e49a42db18
Merge branch 'staging' into pad2
7 years ago
1f9bd866c3
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
7 years ago
edad5deeac
fix logo not showing sometimes in chrome
7 years ago
c036bb26be
use proper bootstrap class
7 years ago
52565076b9
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
7 years ago
4b25ab80d6
wip
7 years ago
b34e252eda
improve whiteboard styles
7 years ago
844967a880
continued refactoring
7 years ago
8b2cb37c2f
improve poll looks
7 years ago
5821d3e72f
remove useless title
7 years ago
a4aeada585
make the file dialog placeholder visible, center file list
7 years ago
d47e26efd5
add margin in code
7 years ago
e08ed72653
generate the tooltip after the button
7 years ago
665e81912e
put the tooltip on the actual button to prevent tippy from popping when not intended
7 years ago
34ba673cd3
improve file upload UI
7 years ago
34a5a32c44
lint compliance
7 years ago
cdf3cee9c8
split out message rendering into ui
7 years ago
fcdfa52aa9
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
58b3b32cc3
big messaging refactor. split UI from logic
7 years ago
6ca6755d02
more missing titles in toolbar
7 years ago
2cc6c636db
Add some missing titles
7 years ago
d3f2398865
bump tippy to 1.2.0, add dynamicTitle option
7 years ago
8301bd44be
Merge pull request #164 from pbondoer/staging
...
UI improvements
7 years ago
85e383d5c5
add invisible splitter
7 years ago
90075cd48e
media-tag to less file
7 years ago
d15280c6ce
prevent pdfs from being huge
7 years ago
c427f375dd
add bootstrap css to /code for image uploader
7 years ago
f585ddccdf
fix image sizes in /slide/
7 years ago
fc95f1b6a8
lint compliance
7 years ago
ba9696ba33
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
a612f02be2
Merge branch 'staging' into pad2
7 years ago
c63807fd2b
implement channel.send
7 years ago
35a55a15ed
wip
7 years ago
d835005905
simplify in-memory message format
7 years ago
8f285eba9f
make file picker ui even prettier
7 years ago
797cc2b105
handle messages which fail to decrypt
7 years ago
65dfd99171
major wip
7 years ago
c53e738054
improve file picker ui
7 years ago
798a3dc520
automatically fill in display name in poll
7 years ago
0588564bc9
overflow on poll div
7 years ago
be29236af1
fix pdfjs styles
7 years ago
bad5160885
fix bad reference
7 years ago
05aa5ed347
hide new feature until it is finished
7 years ago
395f6e1b27
reset confirm text for alertify
7 years ago
dd6a057962
add 'msg' class for pierre
7 years ago
9865359bb0
don't tell users about new versions
7 years ago
c8c44d3bfc
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
7 years ago
0d1f19f5d4
Big manual merge
7 years ago
f6d45d05f6
use logo in toolbar
7 years ago
11c72499a0
don't add duplicate messages to the history
7 years ago
fb13e656b7
get new messages when reconnecting
7 years ago
52854c5a8e
ignore history range responses
7 years ago
e786117110
get new messages when reconnecting and WIP get more history
7 years ago
2ce341fed6
disable input field when disconnected
8 years ago
aba4e34e7f
reuse inline styles as a mixin
8 years ago
195cb01d72
better styles for messaging input
8 years ago
1fac0b9bc4
make todo text bold
8 years ago
66d81429bd
integrate file embed into code editor
8 years ago
dc7db074e8
open pad links when clicking in readOnly mode
8 years ago
71d88b156d
make empty profiles for users on first visit
8 years ago
8b0831ac5d
save images drawn with whiteboard to your CryptDrive
8 years ago
fe826133b3
make some markdown styles reusable
8 years ago
35cf23ce2c
clear tooltips when redrawing the userlist
8 years ago
4c6f8d71e1
don't invoke spinner if it does not exist
8 years ago
311f709dc4
lint compliance
8 years ago
c147d342a3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
542d0cd17f
drop support for legacy pad list
8 years ago
93e007b52a
reduce png sizes
8 years ago
1c238100c8
don't throw alerts in the middle of someone's presentation
8 years ago
7cd42d5ff1
use provided clearTooltips function
8 years ago
3fa010027c
implement clearTooltips
8 years ago
a68a225d79
fix read-only synchronization bug
8 years ago
9734a4db80
append new items to the top of the todo
8 years ago
69eaccbdef
don't create empty todo entries
8 years ago
e84edb2c2b
disable problematic tooltips
8 years ago
9c07793d0d
remove tips on checkbox state change
8 years ago
ba9cab762c
Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo
8 years ago
8e83501c72
Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo
8 years ago
459e0b3b16
CSS and bug fixes for todo
8 years ago
d4ffa7903f
better popup logic
8 years ago
0b81781f35
make the input bold
8 years ago
2af96d74fc
automatically focus on the create todo form
8 years ago
77d6da841f
Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo
8 years ago
3da76e3ae8
Update style for the todo app
8 years ago
85366f2368
use new translations
8 years ago
d99d071716
WIP checkbox titles
8 years ago
e6031c2209
slightly better styles
8 years ago
8cfd8d3270
add translations for todo
8 years ago
c390bdd518
resolve merge conflicts
8 years ago
0612a50ab4
Add fadein/fadeout when adding or removing a task
8 years ago
082632048b
fix styles for very wide todos
8 years ago
a15ff9ba2a
hide dates in todo
8 years ago
f0581f2cf4
also style the whole box
8 years ago
d7d7f212bb
add classes to style fake checkboxes based on checkstate
8 years ago
304d37a334
use styled checkboxes
8 years ago
b5603c89f0
add checkboxes to todos
8 years ago
796bf89491
Update of the front-page
8 years ago
4f63921fc9
better width styling on list. lint compliance
8 years ago
35635c3e2f
CSS fix for the todo app
8 years ago
3efb9d21f5
pull in bootstrap. submit form on enter
8 years ago
83f79a3883
slightly better styles
8 years ago
180e643af9
Style of Todo App
8 years ago
5083299e8a
Merge branch 'todo' of https://github.com/xwiki-labs/cryptpad into todo
8 years ago
f67fb32bf1
Add, delete, display a task in Todo
8 years ago
56514d7e17
add val api
8 years ago
ac718b6dfa
Merge branch 'todo' of https://github.com/xwiki-labs/cryptpad into todo
8 years ago
a61faebb2b
App Todo - Init and HTML
8 years ago
522476a2a6
initialize data model and provide basic methods
8 years ago
4345fc0662
Todo app
8 years ago
e3b9c03fc0
TodoApp - Init
8 years ago
658b00814b
TodoApp - Style and translations
8 years ago
a9a65e4ca9
remove unused code
8 years ago
4b53e02f6c
oups
8 years ago
2e3be27278
resolve merge
8 years ago
dcf5719eaf
handle most of the boilerplate stuff
8 years ago
0d43a84c2b
move example into another folder
8 years ago
5c07eac4de
Change title and footer
8 years ago
f5454f232a
pull in todomvc vanillajs example
8 years ago
ae693ff5a7
lint compliance
8 years ago
6622735db0
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
55cb0734e2
make bad state timeout configurable
8 years ago
469f49fc0a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
a80b00a765
Move the file picker in common
8 years ago
d44f0696af
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
2d0635a409
use custom version of tippy
8 years ago
09793e0d7d
jshint
8 years ago
683769f30a
Fix tooltips
8 years ago
9633025afe
CSS for the removeHistory button in contacts
8 years ago
97f1bbedc5
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
b9bba76b4e
Make the delay for tooltips configurable
8 years ago
dd98e2222a
WIP erase chat history button
8 years ago
128d5b2c6d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
b22127f10c
add history removal
8 years ago
a5a73ce326
Fix print button in slide
8 years ago
3bd5f01e53
Fix slide ratio in preview mode
8 years ago
140964478e
Enter + shift key to add a new line in chat
8 years ago
331b4dddea
Clean debugging code
8 years ago
e26e041a5b
fix jshint errors
8 years ago
c33d2a2db0
New tooltips
8 years ago
88813aee02
Show that only html can be imported in pads
8 years ago
b56a782f01
Store the userlist state when it is closed using the icon
8 years ago
82c87144cb
Remove the friend request button when the request is sent
8 years ago
5ce49af57b
Make CryptDrive fast again
8 years ago
1dc98dcff1
CSS for the contacts input field
8 years ago
e2d031c76a
Add support for markdown syntax in contacts
8 years ago
cba113a2b0
Lint
8 years ago
91ebbdfdb4
View contact status
8 years ago
221a3b4fed
Fix duplicate leftside entries when disconnected in profile
8 years ago
22a28a8fd9
Fix undefined description in profile
8 years ago
39fd0d0f5f
notify if you're focused on a conversation in a bacgkrounded tab
8 years ago
7540f12040
Fix profile creation button not centered
8 years ago
f719b34e09
Add tab notification in contacts
8 years ago
baf439648e
Add the contacts app in the dropdown menu
8 years ago
36d792874a
Fix initial text not removed in /contacts
8 years ago
3545a66320
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
743b87b70f
Add initial text in /contacts
8 years ago
df0442c2bf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
eb4b5ca77c
stub history removal. coming soon
8 years ago
aa8181ab2b
Contacts app translations
8 years ago
73e32f273e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
009d01abde
Fix friend removal and update user data
8 years ago
0cd94e2ba8
add title to contacts app
8 years ago
f2320190b8
change friends url to /contacts/
8 years ago
756b561bbc
lint compliance
8 years ago
6306de5265
set avatar border-radius to 4px
8 years ago
c452f25414
stub invite app
8 years ago
1aecdeb075
fresh media tag build
8 years ago
7114bfaa52
lint compliance
8 years ago
9ef45fe9f1
add background-color to names in chat
8 years ago
e2c17dbeb4
resolve conflicts
8 years ago
0340b45f2c
migrate profile to include edKey. don't propose connecting to users with whom you are already friends
8 years ago
557f13f796
Unfriend and update username - beta
8 years ago
7be1e249e1
add fa-share-alt to pad initialText
8 years ago
96d2ff67e1
user-plus as icon for add-friend
8 years ago
c3ba7cd792
fix race condition
8 years ago
d0d38aa2a3
feedback on first visit
8 years ago
9527a5def7
avoid a CSP error. silence pdfjs warnings
8 years ago
9707433944
comment out debugging info
8 years ago
7a225af11e
fix some minor slide navigation bugs
8 years ago
575d4612f9
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
eda9908c3b
prevent accessing attributes of null
8 years ago
eeb2ee2d17
add clear channel rpc
8 years ago
8fb5762eea
Lint errors
8 years ago
89af8e4472
fix funny off-by-one thing
8 years ago
ac684a8dc7
Use the APP toolbar in profile
8 years ago
2d509e3e25
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
b3e225cb3b
Replace spinner by text and fix mobile UI
8 years ago
f450a28d11
improve logic for guessing titles within code documents
8 years ago
0483d15b8f
lint compliance
8 years ago
c0cb5c4263
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
f4bca0f9c0
Modifications for latest media-tag
...
* use latest built media-tag
* include pdfjs and configure its path for media-tag
* check whether decryption events affect an avatar. crop it if so
8 years ago
5b3cca58bd
modifications to handle latest media-tag
8 years ago
7f5c301734
Add display name in the settings useradmin menu
8 years ago
fb21a650ce
Lint errors
8 years ago
d09f5b70c7
Fix slides CSS
8 years ago
159ccc2866
Fix mediatag flickering
8 years ago
ce50dbf3ca
Hide the 'templates' list header if the category is empty
8 years ago
42075e4b5f
Make everything 16px and 32px
8 years ago
16d0527e92
Add a page title in drive, settings and file
8 years ago
5d5f936682
Hide the upload table in code
8 years ago
a0b14faf89
Fix the font in settings and drive
8 years ago
e732284845
Lint
8 years ago
112c4c85e5
Left menu in drive
8 years ago
8f5a244999
Replace mediatag markdown syntax by html. Enable file upload in /code.
8 years ago
9f9e593e0f
Lint
8 years ago
560671ae7d
Make avatars circle
8 years ago
125018c8c3
New settings page
8 years ago
c02fa39524
Make drive search bar blue
8 years ago
438e7e6cf9
Fix display name in useradmin (friends app)
8 years ago
e6188bfb63
Fix useradmin dropdown position
8 years ago
97d8d86395
Fix avatar in static pages
8 years ago
e8f3df5a46
Clean less
8 years ago
159d72f33b
Merge branch 'msg' into staging
8 years ago
8e2e8b1653
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ff10c282d4
Avatar in the user admin button
8 years ago
be6ee672d3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
f0523a0153
Avatar in the user admin menu
8 years ago
e10de1219b
feedback on view hash usage
8 years ago
52eb8e307c
feedback for language used
8 years ago
086e5909dd
Merge branch 'soon' into staging
8 years ago
781974ec7c
center 'Create a profile' button
8 years ago
1c531ccd47
Pin the chat channels
8 years ago
4a37bc4a1c
abort the realtime session if it does not synchronize for 30 seconds
8 years ago
29c6ed6e9b
hide slide arrows when there are no more slides in that direction
8 years ago
c096872467
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
8 years ago
eff27ff6c5
focus username button
8 years ago
c60a71e210
add connect button and view profile button
8 years ago
94f8e4b8a3
use validateKeys when instantiating object
8 years ago
22fbc7e5d8
implement getter for public keys
8 years ago
ecef970250
float connect button right because flex styles messed up the pencil icon
8 years ago
df103c4074
Messaging app
8 years ago
f9a43d6570
select everything before file extensions in drive when renaming
8 years ago
1c462d5c4a
use random token for feedback instead of date
8 years ago
21f1527c71
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
8 years ago
5c7441f82c
Display the friend list in the friend app
8 years ago
fac715dd09
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
8 years ago
4b23ef74d7
add support for curve message signing and curve validateKeys
8 years ago
a5e8f6ae81
Add friend app and fix avatar size
8 years ago
af31771e3a
Share a channel id, not a hash
8 years ago
852b2eaf1d
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
8 years ago
26a83003b5
Create an owned channel
8 years ago
5b5a7ab286
Hide the friend button when the resquest is accepted
8 years ago
f02285d103
fix lowercased p
8 years ago
5d96c68ad7
fix profile app display on chrome
8 years ago
de420de021
Fix the folder's path in the search results page
8 years ago
d3bbdc27c0
lint compliance
8 years ago
bce0b03ba4
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
8 years ago
909e00bbc3
create a listmap object using public key crypto
8 years ago
96fde4e5ed
Add missing file
8 years ago
df53166b37
implement and use prototype curve encryptors
8 years ago
d293ba4d44
add support for invite hashes
8 years ago
37d5b0afb9
Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg
8 years ago
95e2efab89
Add to friend list
8 years ago
e353627204
log users out if they do not have curve keys. add curve keys to object on registration and login.
8 years ago
4016a95540
prototype invite app
8 years ago
465ef74f2b
Fix rpc
8 years ago
bf17ad3f1e
Friend button in the userlist
8 years ago
8dc8aa27ab
Lint
8 years ago
35e8c1a63b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
43ac71603c
Move pad attributes in pad data
8 years ago
9f6ecea5d9
fix nacl reference error in media tag
8 years ago
3e802c2443
Fix overflowing content in profile
8 years ago
dfad622b76
Merge branch 'soon' into staging
8 years ago
69f4ce2abd
Fix middle click on the drive button
8 years ago
cbd9fc4076
Merge branch 'staging'
8 years ago
3fe0baa956
disable pin limit caching
8 years ago
9c1eaf9c1a
lint compliance
8 years ago
fa06f9d413
fix minor bugs in poll
8 years ago
90bcadd87b
Merge branch 'soon' into staging
8 years ago
be7e7fec43
don't bypass warnings when registering
8 years ago
cab595f959
Fix duplicate folders in the drive
8 years ago
42375190e6
style buttons for long titles
8 years ago
c27c140130
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ac8da0d52d
load codemirror in the correct context. fix selection events
8 years ago
789274fd4f
Fix font-size in slides
8 years ago
7377d39b39
hide print button
8 years ago
43b877ad27
fix styling on media tag download button
8 years ago
1fd0ba488a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
04a28433ae
replace inner content of media tag download buttons
8 years ago
f85af7ef4c
hide useless messages
8 years ago
a59853f9c2
use new media tag
8 years ago
8cf694bea6
Lint
8 years ago
47c6c64b8a
Allow emojis in default avatars
8 years ago
ffd184d50e
Fix overflowing names in the new userlist
8 years ago
92d88d1644
don't change allowed media types until we have media-tag scoping
8 years ago
678986dac4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
fa2d857d70
Fix css issues with Safari
8 years ago
efedfe0667
show preview pane by default in /slide/
8 years ago
81c8949aee
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
1df5e6e855
Fix toolbar buttons for Safari
8 years ago
8b0210baf1
hide useless error
8 years ago
991cb896bd
Fix avatar in /pad
8 years ago
70c9f3df75
Fix avatar size
8 years ago
f09ae9b19c
jshint compliance
8 years ago
4a9a564913
don't try to handle error thta never happens anymore
8 years ago
b15aa3360a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
6ac056e314
make explicit file size RPCs unauthenticated
8 years ago
9b131dc49c
Fix CSS in the slide app
8 years ago
5694505719
Fix syntax highlighting
8 years ago
335898a4c7
Hack the drawer to close it when clicking outside
8 years ago
472a62730b
Fix profile creation and add a link to the profile app
8 years ago
f357ec32c2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
b153dda6ff
Add avatars in the user list
8 years ago
c2e153e8ed
more fouc fixes
8 years ago
555d0a09f8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
568ce70afd
Add a spinner for the history and update history buttons
8 years ago
2144587919
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
c25f2df721
Added caching versions to some of the images which are loaded by js
8 years ago
4ab82710ab
Remove the background color from the text-color button in the slide app
8 years ago
7e69d051c4
Lint errors
8 years ago
26193aeaa7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
b9320e6005
Toolbar improvements
8 years ago
9e91739044
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ecff05425f
feedback for slide printing
8 years ago
75c2a1fd73
jshint compliance
8 years ago
b8934c0b97
smarter redraws of drive/settings usage bar
8 years ago
5a3e9c785c
Fix ckeditor toolbar
8 years ago
cc5b7615ad
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ed0121d172
Lint errors
8 years ago
8abc94d37b
Replace folder images in the drive
8 years ago
b7cb1a8d5f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
8279ef3130
Fix conflict between ckeditor toolbar and userlist on small screens
8 years ago
b037cfbfdb
set usage tips relative to bottom of screen, not top
8 years ago
1763cf72d1
tell anonymous users they can't upload
8 years ago
7a87775372
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
45f180955b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
56a25e1036
Small fixes for the new toolbar
8 years ago
1179992a90
update feedback key name
8 years ago
4a5f5de78c
restore missing stylesheet for poll
8 years ago
bbf9916a91
fixes for file app
8 years ago
39149a052b
add new feedback keys
8 years ago
7a5c5ce0a3
load scripts asynchronously
8 years ago
9b8866ed72
handle RPC_NOT_READY error for logged out users
8 years ago
a9f8f42e3c
use minified less compiler
8 years ago
fca1ef4d36
hide unstyled content until the loading screen is displayed
8 years ago
877c5a8d0e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
19ff8a345d
Avatar upload in the profile app
8 years ago
5e56ad912e
remove the last bit of compiled css
8 years ago
7a7307d560
fix logging when resetting
8 years ago
6c94605b9b
File upload in the profile
8 years ago
7439bbaba2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ed45814020
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
cfc5907237
remove unnecessary style rules
8 years ago
85d8eda847
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
176e47f394
Add the profile app
8 years ago
1c1869a22c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
7de2683169
make all apps use clientside templates
8 years ago
f232675cc9
create a favicon if it does not already exist
8 years ago
3be6433fdf
send feedback on name changes
8 years ago
bdca6b10c2
use templates in poll.js
8 years ago
bb74935b08
allow pin limit caching to occur at api level
8 years ago
00a554ca0d
Fix the donate button style with the new toolbar
8 years ago
e9bfaa9a60
compile less clientside. remove compiled css
8 years ago
67a096a8a4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
7b37146034
don't let spacebar keyups propagate outside of the title
8 years ago
9195c0cd12
is isOverPinLimit in toolbar
8 years ago
fce0a37f50
cache pin data once retrieved from the server
8 years ago
8f2db44793
Remove getTitle from the file app
8 years ago
33ea8cb183
Make sure we don't call both the yes and no handlers in prompts
8 years ago
3076ade23a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
36ef4178dc
Remove the editable title from the file app
8 years ago
51e06e68a7
don't change slides when navigating through history
8 years ago
ffcbde4325
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
48ece55ed5
style fixes, and dynamic less compilation
8 years ago
38f568635d
Fix duplicate media-tag in slides when adding or removing a slide
8 years ago
ce44a8d351
Fix the backup button in anonymous drive
8 years ago
06a0590f73
New folder icons
8 years ago
cc341ca6d4
Lint error
8 years ago
0d4d104e08
Mobile support for the new toolbar
8 years ago
b4b851959f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
61a891267f
more feedback
8 years ago
c1d2fa6b52
Unhack validateKey for the history mode
8 years ago
90cc3e6a5e
New userlist in the whiteboard app
8 years ago
2710279904
Use the new share button in the file app
8 years ago
5a48cba999
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
684269fdda
Userlist in polls
8 years ago
35bfa1dce4
test client-side templates in whiteboard app
8 years ago
a11befaa0f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
13288ee18b
Update the userlist in code, slide and pad
8 years ago
852c028822
don't allow editing if pad type is wrong
8 years ago
92b6e60573
Small improvements for the new toolbar
8 years ago
eddfb936f2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
115813c191
Merge branch 'new-templates' into staging
8 years ago
3657e978fd
give main2.js a more sensible name
8 years ago
118b83c420
make register and login user clientside templates
8 years ago
ab54dcf84d
make libs pass jshint
8 years ago
8d956c3de6
New toolbar
8 years ago
48f9745619
clientside templating
8 years ago
503e9de07c
Lint errors
8 years ago
b7a0547b77
New toolbar colors
8 years ago
3052ec8abb
Merge branch 'newCk' into staging
8 years ago
c3f636851a
Fix path size width in drive
8 years ago
c22f610d5c
Fix the drive integrity check
8 years ago
fb388f2610
Fix an issue with invalid drive before migration
8 years ago
59fb5bd8be
One toolbar color per app
8 years ago
5a248db267
Merge branch 'staging' into newCk
8 years ago
728272d936
Fix undefined function
8 years ago
f13d23241c
Upgrade CkEditor to version 4.7
8 years ago
d822dfe37a
add forget button to file app
8 years ago
7fd36a72f3
re-add download button for file app
8 years ago
f02a381e32
avoid horizontal scrollbars
8 years ago
cc5d5d4f1d
make pdfs in file app big
8 years ago
dbfad9d227
Lint
8 years ago
91d46cdee4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
d3b9ac2511
Update the preview and present content on Ready in slides
8 years ago
5fd4870b8b
Merge pull request #138 from pbondoer/staging
...
Fix poll auto-focus inputs
8 years ago
626e54d7b5
Fix poll auto-focus inputs
8 years ago
54adb680e7
Hide the slide number in the title outside of present mode
8 years ago
17838f1d70
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
1b66383bac
don't create color-picker if readonly
8 years ago
a38819f5b9
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
1ad1b78c64
Fix the history mode with readOnly and old URLs
8 years ago
b2a70f86d3
disallow concurrent logins
8 years ago
35e0de463b
disallow concurrent scrypt cycles
8 years ago
06ca70d11e
lint compliance
8 years ago
f29f430e7c
better handling of non-rpc messages
8 years ago
f1aef66fc9
Fix the drive history
8 years ago
008c417111
Context menu was not hidden after a click in the drive
8 years ago
377a90961b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
e40f43bd20
Migrated pads were not displayed instantly in the drive
8 years ago
44b8bc7b7d
make context menus unselectable
8 years ago
928dadcf77
Fix toolbar dropdown menus not visible in slide
8 years ago
1df11f2813
Update the font-size when entering/leaving present mode
8 years ago
66d8c0ed11
Add a preview mode to the slide app
8 years ago
a5924cb803
Make sure the initial title is set in the userDoc when creating a new pad
8 years ago
8b5f4dbd47
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
3a36040ba7
lint
8 years ago
0e9ebddf11
fix the things
8 years ago
c0e2c1060e
don't reload when slide hash changes
8 years ago
24c14ffbf3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
5bfd8470cb
Display the file size before downloading it
8 years ago
3f85471ab3
update footer and package.json for upcoming version
8 years ago
594405de73
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
cbe21959b4
Update UI for the file/media app
8 years ago
06eceed8b3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
17146d7af9
send feedback for uploads
8 years ago
c2c04bd5d8
Lint
8 years ago
2068a8b85b
Embed the mediatag library in the file app
8 years ago
cd5705b3f3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
1e9bc89855
Fix drive icons when the name contains a long word
8 years ago
5ce453afa0
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
e73e32ab3a
fix too-tall download button
8 years ago
927f6404b8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
66b076111e
Add an upload button to the slide's file picker
8 years ago
c2e5ef7048
better sizing for videos
8 years ago
c717d01714
fix pdf height
8 years ago
b480346f5b
more efficient media-tag
8 years ago
0d47e68d3e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
0eb50b8b6c
drop pdf.js dependency
8 years ago
f3f1cf9e6d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
a237eec41e
Add a file picker in the slide app
8 years ago
20874c76f1
prevent code blocks from overflowing slides
8 years ago
a4f45caebb
Lint
8 years ago
0a4e876139
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
8738b42861
Update the drive UI to show that Upload and New are linked to a folder
8 years ago
d25a0893cf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
3184e5d235
don't reload page on hash mode change
8 years ago
1077b3b267
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
a98353af6c
Add a button to upload a file in the drive
8 years ago
295f9c00a6
send feedback on buttons
8 years ago
d5c7eb49a4
send feedback on toolbar hide and CKE buttons
8 years ago
7e0a2abc2c
Fix the file name when restoring an element from the trash
8 years ago
5b523be171
Fix drag&drop for pads in the drive
8 years ago
e51f678bb9
Don't display the popup whne moving a file to the trash
8 years ago
497ddeee6d
Upload files with drag&drop in the drive
8 years ago
687b4d8307
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
69c3bd392f
update built media tag to latest XWiki version
8 years ago
494b44e2b1
fix lint errors
8 years ago
d8ebe566d8
Don't call mediatag for non-image files
8 years ago
37d3d04f0e
Clean mediatag integration code
8 years ago
802146e2af
don't put download buttons in a div
8 years ago
19cb920a7c
Don't redraw a media-tag everytime the content has changed
8 years ago
2032c08066
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
f9c26645cf
Upload images using the slide app
8 years ago
17e4e9be27
download anything that isn't an image in media-tag
8 years ago
8a599eb9b1
Merge pull request #136 from blumeva/staging
...
change minimum opacity
8 years ago
fc9ecb0f7c
change minimum opacity
8 years ago
ea79294494
Merge pull request #134 from pbondoer/newpoll
...
More poll improvements
8 years ago
88c2c0afde
Merge pull request #135 from blumeva/staging
...
Staging
8 years ago
74c9b663dd
changing whiteboard
8 years ago
40cf7ea107
change whiteboard
8 years ago
1b574da053
fix typo
8 years ago
7ad89bd9af
don't interrupt boot because of localStorage failure
8 years ago
3337e2133a
more thorough tests for localStorage presence
8 years ago
a57f8679c5
Fix a race condition in the file app
8 years ago
4eeea93265
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
11e2226f1a
Fix lint errors
8 years ago
c779e328e8
warn users if their browser does not support localStorage
8 years ago
d7292e69c6
Fix undefined variable
8 years ago
d367f71760
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
c70eb73d52
Merge branch 'master' of github.com:xwiki-labs/cryptpad into staging
8 years ago
803bad1421
Move the file upload code in a separate file
8 years ago
d344f03778
proper button text
8 years ago
2b5339193c
bring admin back
8 years ago
b2eef94232
use numbers, not strings
8 years ago
848010842f
dont sanity check silently
8 years ago
56f2c46c75
document a line
8 years ago
cd1c957929
NaN safety
8 years ago
0118fdbd00
use a local variable
8 years ago
49370764c1
change whiteboard translation
8 years ago
b8e394db67
poll: Implement multiple choices
8 years ago
a58162a617
Make the drive tests work when not logged in
8 years ago
c702313489
change label texte
8 years ago
2fb5e3ae35
Merge branch 'staging' into newToolbar
8 years ago
969cec5d60
Make sure everything is synced before migrating the drive
8 years ago
7dd9ed543a
Merge branch 'newDrive' into staging
8 years ago
376b60c21c
New toolbar temp
8 years ago
9c5bade83e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
d1f4617419
Fix a race condition causing the preview part to be empty
8 years ago
c9725af508
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
db9b9547d9
don't complain about missing callbacks for messages which are not our responsibility
8 years ago
685b352db8
poll: Add show help button
8 years ago
30bdb9881c
Fix undefined element in select dropdown menus
8 years ago
298e34a9de
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
8471dab6b1
Provide hints in theme and language dropdowns
8 years ago
5d565660a9
tiny fixes
8 years ago
6bc191725f
poll: support disconnect and fix trash button
8 years ago
b3221c0fb4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
0c957989d2
add link to upload table when complete
8 years ago
5d6a0dcc1b
Fix width transition when dragging preview
8 years ago
6dd80c26b1
Make editing more visible
8 years ago
3ff3eac283
Fix a race condition causing the drive to be empty
8 years ago
a5cb5f2ceb
Merge branch 'staging' into newDrive
8 years ago
1b671edce9
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
9a4a6e9b40
Always display the upgrade button in the drive
8 years ago
9cc25d4c9f
Merge branch 'staging' into newDrive
8 years ago
7134b00544
Add a button to display the context menu for the trash on mobiles
8 years ago
d24458e4b0
Fix the tests to work with the async migration
8 years ago
a57f7c6ce7
Fix lint errors
8 years ago
4bcad3e154
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
47857ec382
use cached pinned usage data
8 years ago
75c3c10b20
Merge branch 'soon' into staging
8 years ago
c1402fbb0a
Lint error
8 years ago
b36484931d
Lint
8 years ago
1fb638f519
clean the code
8 years ago
9d758a040b
Fix an issue with the search field not displayed properly
8 years ago
08902c0910
drop extraneous argument
8 years ago
23318357a6
make fewer RPC calls for usageBar
8 years ago
df586a223c
update limits, usage, plan, and note whenever they are checked
8 years ago
8bad0c556e
change log to error
8 years ago
b0e00d337e
more careful validation
8 years ago
fd88162624
Merge branch 'staging' into newDrive
8 years ago
7c9e86e351
Merge branch 'soon' into staging
8 years ago
9694272083
Fix html code not parsed
8 years ago
9ca10ba524
Merge branch 'staging' into newDrive
8 years ago
7f120c8fc1
Merge branch 'soon' into staging
8 years ago
78e6118153
Merge branch 'staging' into newDrive
8 years ago
444c41974e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
df5cbfb53e
Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon
8 years ago
6a96aa6819
Disconnect the network when migrating the drive in another tab
8 years ago
2a94bdaf05
test
8 years ago
ca95b5c42b
Remove unused console.log
8 years ago
f8c69573fd
Disconnect other tabs when migrating the drive
8 years ago
c4e5741ae0
update upgrade button logic
8 years ago
f1a9002417
use upgradeURL with usage bar
8 years ago
51e0d40572
Make sure the old storage key is removed after migration
8 years ago
b0fe04381d
Merge branch 'staging' into newDrive
8 years ago
fe2fef5e4c
support dragging and dropping multiple files
8 years ago
1c2ea04f11
Drive refactoring
8 years ago
fe42f5e88c
ask for new cookies and resend commands on NO_COOKIE errors
8 years ago
e723228060
always show upgrade button in drive
8 years ago
da533b106a
improve type checking in getFileSize
8 years ago
2f851ab97e
fix lint errors
8 years ago
d25477e8c6
don't let tooltips interfere with DOM interaction
8 years ago
811d031ffd
Fix the 'File' entry in the drive 'New' menu
8 years ago
5641a4a839
Add the file app in the 'new' dropdown menus
8 years ago
ac91d2f413
Fix the upgrade and donate buttons in the home page
8 years ago
ee57458158
Remove the pin limit alert
8 years ago
f43132a63b
bump version in footer and package.json
8 years ago
ec9a4dec5e
Merge branch 'soon' into staging
8 years ago
77d4ffba86
animate preview mode sidebar
8 years ago
65233c2464
remove unused variable
8 years ago
767793b5ca
fix stuck loading tip
8 years ago
8f7aaecc1c
cache some selectors and decrease memory demands
8 years ago
f631973f1f
optimize file upload
8 years ago
55af84cc90
lower spinner timeout interval
8 years ago
c65ca5cfc6
restore deleted line and add missing semicolon
8 years ago
8bd9ad8847
add automated registration test
8 years ago
07279c8dc7
export boolean Test.testing
8 years ago
c8bd1bb2ac
Trying to improve the tests which fail always when running remotely
8 years ago
71bd808e4f
Send everything through the test global function
8 years ago
244bd7b378
;;;
8 years ago
7d557df74b
a new and more horrible way of sniffing the logs out of the instance
8 years ago
0d4b74cfba
;;;;;; keep these ;;; for later ;;;;;
8 years ago
24f37ea414
Delicious testing
8 years ago
5e57578fa9
Merge branch 'master' of github.com:xwiki-labs/cryptpad
8 years ago
30f66ab7ba
hotfix 'undefined/' bug
8 years ago
7b94106bac
fix inverted conditional :/
8 years ago
2e03485db4
remove known bad entries from localStorage.userHash...
8 years ago
936bf8df9d
return falsey if userHash is junk
8 years ago
105e5cdac9
fix 'undefined/' userHash
8 years ago
401e908963
use media-tag with xhr error handling
8 years ago
3465710237
Merge branch 'mediatag' of https://github.com/Regzox/cryptpad into tag
8 years ago
8ab9248a78
Fix ES6
8 years ago
21c39572be
Update media-tag and fix bower dependencies
8 years ago
daf112a5b5
take api settings into account for upgrade button
8 years ago
ebfa228bc0
add upgrade button to all static pages
8 years ago
149568689a
color donate button green
8 years ago
ec6ad6772b
send feedback on donation
8 years ago
cb2efe138b
Media Tag integration, image, audio, video, pdf
8 years ago
76c530037b
enable donate button in all apps
8 years ago
9ca5bc507e
add support for donate button
8 years ago
a70014dd11
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
99a44f119f
don't send referrer headers on pads which may link outward
8 years ago
92a7970eb8
fix merge conflicts
8 years ago
1240b864ef
fix misconfigured history
8 years ago
f434f002c4
poll: make locks clickable
8 years ago
3915b30055
provide a register button on login
...
also direct users from file to login
8 years ago
b6bb576a34
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into newpoll
8 years ago
66520b6041
cleaned up the accounts, limits and revenue sharing and unified the config in one place
8 years ago
1092285a68
merge master
8 years ago
6c1861dbc6
Merge branch 'soon' into staging
8 years ago
2ecf257fcd
Sync localStorage with sessionStorage in auth because safari...
8 years ago
3f3d64992d
resolve merge conflicts
8 years ago
57017c68fa
hacks for cross-domain safari
8 years ago
cf658c1b3a
backport live changes
8 years ago
a04f179d8b
hide preview mode on phones
8 years ago
df2b00122a
New drive structure without file names
8 years ago
dc2b0ae6b4
jshint compliance
8 years ago
b32c329269
remember whether you were using preview mode for a pad
8 years ago
d9f7470f06
copy user details into sessionStorage for safari
8 years ago
a5ffd278a7
write styles for code in .less
8 years ago
3803f6a20f
only render preview if preview container is visible
8 years ago
617e027f12
catch markdown preview errors
8 years ago
c5bb830757
don't preview if hightlight mode is not markdown
8 years ago
fd83ae3e61
implement createRandomInteger
8 years ago
4d9060f49e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
378bf2aa94
yflory's word wrap fix
8 years ago
dc80b6b11f
throttle markdown preview
8 years ago
f5f8e148ca
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
90f5713d4a
Fix an issue with the search bar redirecting to incorrect location
8 years ago
97cc4a6d54
add styling for tables in markdown preview
8 years ago
e6c04ccb49
bump server after paying for an account
8 years ago
6faca87e73
set preview content in read only mode
8 years ago
6324d9bbb0
feedback on template feature usage
8 years ago
c3437382fb
Fix the release version in the what's new popup
8 years ago
4fae1b16c2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
70cae0d2c3
safely access pin reset response
8 years ago
a50805545d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
d55b7e411c
Display an alert in the drive when the limit is reached
8 years ago
dac9d0647d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
259d34b7c8
jshint compliance
8 years ago
40b99e7bbf
Get the file name before downloading the entire file
8 years ago
6dc3c62ba4
check for src before trying to ajax
8 years ago
a6cf761172
don't store media tag pages in the drive
8 years ago
90a9764fa4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
346c289204
Fix lint errors
8 years ago
71dc0af6c7
better test for success error codes
8 years ago
0b6c587e2b
fetch and decrypt metadata with range requests
8 years ago
eb31d0323c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
a99080fb74
push the rest of the code
8 years ago
408a4dad94
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
3964f4feee
Display the progress when downloading a file
8 years ago
dd73ad2dd5
add decryptMetadata function
8 years ago
5179252d3b
fix merge conflicts
8 years ago
4ee42b87d4
make file crypto great again
8 years ago
c45f08f147
Use a download button instead of downloading a file automatically
8 years ago
0c2f84058b
Improve css for the file app
8 years ago
9c00a730f2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
538aec6ef5
Display a message when pinPads returns an error
8 years ago
03da870a7a
jshint compliance
8 years ago
af4fd3c6d3
resolve merge conflicts
8 years ago
67a04a16ec
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
1ab6eb3c5d
Add a queue for multiple uploads in the file app
8 years ago
ba5ef5157e
show pretty representations of storage usage
8 years ago
0a54f0cf2d
better alignment of preview and code entry
8 years ago
e78299aed6
use async file decryption, listen for progress events.
8 years ago
bcd0303821
style /file/ with .less
8 years ago
ef155d8ccf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
310909dc9e
handle new error codes
8 years ago
d014fccfce
Fix lint error
8 years ago
2082b328b4
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
814c81fb13
Display an alert when CryptPad has a new version
8 years ago
34606ea8ba
use newest xwiki media-tag
8 years ago
5a83259233
listen for decryption errors
8 years ago
2cee9534c5
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
d324a054f2
add progress bar to file upload
8 years ago
21f9e31e75
Add a placeholder for the user app
8 years ago
164342920e
fix inverted condition
8 years ago
620f4dc512
Add translations for the markdown preview button title
8 years ago
51bd41d4e8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
0bd4caeb7e
Add the task list code to the markdown renderer
8 years ago
d187945e94
jshint compliance
8 years ago
3ba94a1ba2
correctly set release version number
8 years ago
2b60b81a68
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
d13dde856a
Add the markdown renderer file and change code's default content
8 years ago
4debec39bb
update footer with next release codename and corrected matrix link
8 years ago
73ec91aa5e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
80479fdc90
use rpc calls from cryptpad common
8 years ago
7befaccd88
move more rpc calls into pinpad
8 years ago
56bcdff890
Add a preview of the markdown content in the code editor
8 years ago
b72415b56b
Fix old hashes not working with the new parser
8 years ago
6b7aeb9121
Fix the text example
8 years ago
fe0f21594a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
953e7155f0
Send only the hostname to the accounts server
8 years ago
afef456b18
fix undefined reference
8 years ago
8fe0282b7b
jshint compliance
8 years ago
827233dcba
new translation keys for file upload
8 years ago
834830fc4f
Fix the Ctrl key + click to select multiple files
8 years ago
1a7c4d5ebe
Store the FS_hash in the user object after the merge
8 years ago
87fa28180a
Display an upgrade button in the settings page
8 years ago
c1b43db363
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
7ee6864ea4
Add the user menu in the login and register pages
8 years ago
1542aa96bc
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
dc2cdb7c08
Add the usage bar in the settings page
8 years ago
cc893723de
add some TODOs, log uploaded content so we know it's working
8 years ago
2dd04f7631
get limits from the server
8 years ago
716245f864
Make all the buttons look the same
8 years ago
0f37d9def7
Change the button font size in the toolbar
8 years ago
48496416e7
Use the same font-size for all the toolbar buttons
8 years ago
8172f117a7
Fix Hash.alert not a function
8 years ago
0e58859393
Fix lint error
8 years ago
771348720b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
03274c3776
Display an info message in the anonymous drive
8 years ago
57979f6314
Display the public key using a href in the settings page
8 years ago
a9b670fdf5
don't parse trailing slash as part of encryption key in old hashes
8 years ago
9bbd3161ca
update tests for new API changes
8 years ago
06f3d0eefe
shim isArray if not exists. correctly report how often this occurs
8 years ago
50d9f72b3a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
601226115b
New anonymous drive
8 years ago
30f6ef3f85
handle more response codes, use metadata
8 years ago
18d959ef16
handle non-200 status codes
8 years ago
ed95bbb08f
Fix lint errors
8 years ago
89a993be3c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
0f13198119
Move the parseHash code into parsePadUrl
8 years ago
4c4c21342d
don't try to decrypt nothing
8 years ago
69e933dd17
better error handling in file download
8 years ago
42f3a62cac
handle errors with XHR
8 years ago
213708d8dc
center media tags
8 years ago
6c68b5e6ca
use new media-tag, listen for decryption events
8 years ago
7dd5907ff0
Merge branch 'limit' into staging
8 years ago
22efde87d5
correctly estimate upload size
8 years ago
a993ab6616
use new encrypted file encoding in media-tag
8 years ago
8c49150725
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
e0293a1162
Merge branch 'master' into staging
8 years ago
57ee7de7d4
Update and return the storage limit
8 years ago
d3854b9774
Fix selection issues in the drive with Chrome
8 years ago
371edff943
Fix an error when moving unsorted files to root in the drive
8 years ago
b76dcba1d6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
733c3abefa
Update the upgrade button in the drive
8 years ago
becba33b05
Scroll to the selected element in the drive
8 years ago
419fb15425
Remember the scroll position in the drive tree
8 years ago
5d0535966c
Center vertically slides in present mode and checkbox to disable transitions
8 years ago
5d37a50a87
try to estimate upload size
8 years ago
6d30d7f89f
strip junk bytes from base64 more safely
8 years ago
1525712deb
new encrypted file format
8 years ago
8f5989b6b0
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
cf81b02096
Make sure the spinner is always centered in the loading screen
8 years ago
5a21be8112
Improve UI on mobile
8 years ago
5aba2d4640
remove unused variable
8 years ago
5c8586f8a3
Fix typo in file upload
8 years ago
1e4fc5a979
lint
8 years ago
3c4b6a89d2
Fix a conflict with the arrow keys and renaming a folder in the tree
8 years ago
96ccb94397
Add the share button when a file upload is complete
8 years ago
c00158d23a
Move code to common-history
8 years ago
97a28d3938
test file encryption/decryption
8 years ago
6a1c799a6e
support async tests
8 years ago
922e7803e9
remove extraneous slashes from hashes when parsing
8 years ago
0f8ef2f516
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
6a8153aca3
Fix selection issues in the drive with Chrome
8 years ago
a6c49cd65c
Fix undefined title in slides present mode
8 years ago
299a53ded7
prefer to use functions from common
8 years ago
a338b23f40
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
df47b913e3
fetch array buffers in cryptpad-common
8 years ago
ff16084719
Fix lint errors
8 years ago
50c8a859e6
Move the CodeMirror cursor code to common-codemirror
8 years ago
9eb8e55cf6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
c79a6e3b2b
Move Metadata, CodeMirror and title functions in separate files
8 years ago
56a871cb67
Merge branch 'soon' into staging
8 years ago
521f99a3d6
support drag and drop for file upload
8 years ago
b4973b7610
Merge branch 'master' of github.com:xwiki-labs/cryptpad
8 years ago
ae7d65c3fa
fix drag to select in chrome
8 years ago
63710e1ccc
Move the code related to the title in another file
8 years ago
48898c97e5
Merge branch 'master' of github.com:xwiki-labs/cryptpad
8 years ago
ce5cdce917
Fix an issue where the username was lost on websocket reconnect
8 years ago
1d4d4cffdb
correct some copypasted code
8 years ago
2b4f503aff
Merge branch 'master' of github.com:xwiki-labs/cryptpad
8 years ago
4a104052b4
handle errors in file
8 years ago
b818fd8a37
Fix 'undefined' error with the context menu
8 years ago
c34c1cb07c
Press enter to open a folder
8 years ago
7da01d0862
unlist removed examples
8 years ago
ea3dc8a852
remove file upload test
8 years ago
42dcfb9661
unceremoniously kick web clients when you 'log out everywhere'
8 years ago
1547063b7f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
a20a319a7a
Fix focus issues in the CryptDrive search bar
8 years ago
36ab38f3ac
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
9206d89531
Fix lint errors
8 years ago
bbc08bbcfd
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
5a883d5a57
Use the new toolbar and move the userlist code in a separate file
8 years ago
6847906ac9
Move the userlist code in a separate file
8 years ago
6471b572eb
correct off-by-one
8 years ago
3a338e0890
fix undefined reference
8 years ago
a173e4c7a0
add 'log out everywhere' functionality in settings
8 years ago
5a5b02b82b
Don't store in the drive pads without a hash
8 years ago
c07d3e6162
update version strings for upcoming release
8 years ago
3e118c6a38
allow instance-wide custom salt for login
8 years ago
6a00d11a15
fix undefined reference
8 years ago
c3d1554e8c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
660cda6573
set title when uploading
8 years ago
706120ae5b
Display images uploaded in the File app with the Media app
8 years ago
28cb40d7ee
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
1b6fae4dd2
Update mediatag
8 years ago
a0c420af8e
jshint compliance
8 years ago
1864dac84f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
78b11584f8
remove unused variables
8 years ago
4335b050af
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
a190c99426
Toolbar refactoring
8 years ago
5739c3d973
blow up if you ever run out of nonce-space
8 years ago
2232518c64
set title after uploading
8 years ago
f644dc6c0b
WIP support encrypted file upload via base64 chunks
8 years ago
7573b86946
call back with error if an RPC is made while disconnected
8 years ago
410a9dfb17
temporary solution for testing pin limits
8 years ago
cd98fc6eab
Increase the z-index of the select area in the drive
8 years ago
80115d0071
Fix an 'undefined' variable error in the drive
8 years ago
c9d89debba
Fix lint errors
8 years ago
79365a7a82
Use the shift key to select multiple files in CryptDrive
8 years ago
3262787244
Update the icon mode in CryptDrive
8 years ago
d52e9fba43
Use the arrow keys to change the selection in the drive
8 years ago
ef89451a83
Display the storage limit in the drive
8 years ago
1d3b8188b3
Add mobile support in the slide app
8 years ago
d2e46d1378
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
092b98d235
Fix the offset of the drag&select feature in the drive
8 years ago
f2672d587a
fix variable redefinition
8 years ago
0e7eeb285c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
f414d480a9
Add the history mode to the CryptDrive
8 years ago
cf4dee28f7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
28e4ef1b13
WIP RPC code
8 years ago
afb0061d7b
Fix an issue with anonymous user unable to store new pads
8 years ago
56aaeea003
Fix the drive toolbar not displaying the displayName
8 years ago
538e85c080
Fix the context menu in the drive flowing off the screen if too long
8 years ago
841c9ee9de
don't close popup dialog when hitting enter if textarea has focus
8 years ago
3fa0a73025
prevent using string methods on undefined variable
8 years ago
1b3ce5aa96
fix typo
8 years ago
a51a35da70
Fix an issue with hashes ending with a slash
8 years ago
d9b5eb8a97
Fix an issue with the right click triggering the select area
8 years ago
ef58120819
Prevent multiple concurrent clicks to get the history
8 years ago
38a115d8f8
feedback on anonymous drive
8 years ago
16f6ab813c
Make it clear that the number is the history represents a version
8 years ago
0ee228666b
Replace the IRC link by the Matrix one
8 years ago
c820b3485c
Fix function undefined when loading a template
8 years ago
0ef1c14d7f
Fix lint errors
8 years ago
fc760b4820
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
a165332c15
Don't store a pad in the drive if the limit has been reached
8 years ago
e51c7f9cf0
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
e132ccf94a
prepare for upload
8 years ago
bf7c7c45d0
Add the storage limit warning in the toolbar
8 years ago
197b366712
Ability to drag&select in the drive
8 years ago
e2942f959b
add crypto for decrypting a chunked file
8 years ago
aedc46bdaf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
a97e7223f1
implement getBlobPathFromHex
8 years ago
520dabe094
Remove the unsorted files category
8 years ago
f50aa5c29b
Move the mediatag viewer into a media app
8 years ago
6a8274518b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
9882a3a923
Add support for the file applicaiton in the drive
8 years ago
12898b3358
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
74bcec8b31
programming is hard okay
8 years ago
2a417ddae8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
d985b144cc
Add a new hash version for the file viewer
8 years ago
3309087277
send feedback if isArray is not supported
8 years ago
f196b836db
fix undefined reference
8 years ago
48973bccd6
add tests to assert for hash parsing
8 years ago
5194677443
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
c9c7d61ad1
Media tag viewer
8 years ago
729d1460b9
Merge branch 'master' into staging
8 years ago
a840fb9e85
add example hashes and start working on hash v2
8 years ago
d1fa68e30d
build UCF Media Tag
8 years ago
cc33c4abe9
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
a5ca461a73
update footer for new version
8 years ago
fdd51ec18d
Don't remove a folder moved into unsorted or into itself
8 years ago
4b95a1da48
unbreak assert/translations
8 years ago
4fdc5f897e
only feedback migration if user had legacy store
8 years ago
218f2ff76c
feedback when logging in or registering
8 years ago
4c3e842664
Fix focus issues with the history input in ckeditor
8 years ago
f7e96b4e8c
resolve merge conflicts and jquery errors
8 years ago
5fc2e4cf71
Remove the toolbar in ckeditor history mode + history configurable
8 years ago
18e2e66b06
jshint compliance
8 years ago
92ea03d7d9
View and restore the history of a pad
8 years ago
4c0d7bf8e8
support multiple calls to cryptpad.ready
8 years ago
ec041c88e2
console.log when providing feedback
...
also notify server if a users browser does not support proxies
8 years ago
c51073f211
support batch getFileSize calls
8 years ago
1af621bfe5
Merge remote-tracking branch 'origin/auth' into staging
8 years ago
3afaf029cb
feedback about how often we migrate an old drive
8 years ago
0e8b55edc0
Added an authentication page to allow getting the user pubkey
8 years ago
df9c312b7d
make new text translateable
8 years ago
e8b053e48b
use bootloader in feedback.html
8 years ago
a6dbfcecf3
remove old/unused assertions
8 years ago
b658bda421
use bootloader to fix paths to jquery and json.sortify
8 years ago
347459781c
show the size of your files, if you're logged in
8 years ago
2b8579e8b7
add pretty-printers for byte-counts
8 years ago
2a25afae5f
Merge branch 'soon' into staging
8 years ago
e0ecf651e2
add a note about showing pinned file usage
8 years ago
c341fa8e94
Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter
8 years ago
da69c1822c
ask users to sign back if signing keys are missing
8 years ago
7a05462eb3
Some more poll changes <3
8 years ago
107e75b287
remove invalid semicolon
8 years ago
821c1a3ec6
annotate code which we hope to be able to deprecate in the future
8 years ago
43c045721c
Get the channel history
8 years ago
f6d6f81d55
send feedback when a user registers
8 years ago
deeb47c40b
reportAppUsage for settings
8 years ago
05785e96ea
small color change
8 years ago
5a83759ee2
add usage button to settings page
8 years ago
a27cc76fc0
uppercase LOL
8 years ago
402ce2db93
better validation of inputs
8 years ago
c7eae9675b
keep exporting isArray for backwards compatibility
...
but prevent internal use
8 years ago
fbebbf0dca
minor clean up
8 years ago
525d35c9ec
redefine alert
8 years ago
20c252e5c6
fix placeholder styling in safari
8 years ago
f694a81a5c
move more interface code out of cryptpad-common
8 years ago
a4157b9908
remove more unused functions
8 years ago
e10901edb2
begin to move interface code out of cryptpad-common
8 years ago
95789d3cbe
expose rpc for pinned usage
8 years ago
8f4dbcf4c6
remove getPadTitle
8 years ago
f42da4ecd8
move hashChannelList into common-hash.js
8 years ago
63960bd38c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
520ae822fc
correct undefined reference
8 years ago
50277cb0ae
don't rely on 'info' in onRemote so we can call it anywhere
8 years ago
bf047fcf65
Merge pull request #110 from pbondoer/newpoll
...
Fix flash of autocomplete in poll
8 years ago
96ff487271
fix flash of content
8 years ago
5a7eea08c8
Merge pull request #108 from pbondoer/newpoll
...
Poll fixes
8 years ago
248f88034b
important fixes
8 years ago
633d60ccd0
Remove a TODO
8 years ago
6b57bb2bbb
poll: press enter to validate input
8 years ago
d483e10e77
poll fixes
8 years ago
81d83897ec
Rename hash.js
8 years ago
2ad0a65b71
Remove shortcuts that override browser actions
8 years ago
ea5301be13
poll improved(tm)
8 years ago
7434dbcb0f
what i have
8 years ago
07705cd5c1
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
eb2a3c1bbf
Fix lint errors
8 years ago
607d9652f5
jshint compliance
8 years ago
3ba90332bb
Merge branch 'refactor' into staging
8 years ago
f11cf8e6ac
move poll styles to separate file
8 years ago
daabb0b3ad
Integrate and fix the new fileObject (userObject)
8 years ago
df4a250359
use feedback api instead of app=
8 years ago
86c37bfa37
fix find+replace error
8 years ago
e618483395
extract all code for encoding and decoding hashes
8 years ago
fdd2716ad5
move constants to the top of cryptpad-common.js
8 years ago
c1e0316d43
Refactor fileObject
8 years ago
5212539a16
move standalone functions from common into their own file
8 years ago
7437d6b902
remove unused function
8 years ago
4e590a9dd1
remove even more dead code
8 years ago
85fcaa9bbc
remove more dead code
8 years ago
401936a91e
move singly-used css file out of /common/
8 years ago
9a46b58c85
deprecate this 90 days after f-release
8 years ago
7a59183bb1
pinpad.create should always be async
8 years ago
8de3610532
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
9aa0548b1f
remove dead cursor code
8 years ago
4e61b79f9a
Clean fileObject
8 years ago
cde724399c
Pin the pads
8 years ago
74ea2fce5a
Fix lint error...
8 years ago
aa49c97d6e
Fix lint error
8 years ago
2c8d1b8183
jshint compliance
8 years ago
f0836f745e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
528deb11da
Add missing file for whiteboard
8 years ago
cde9ea9887
update footer version
8 years ago
05a50b1f4c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
a14bb1480a
progress for implicit pinning
8 years ago
f82278a25c
handle return of undefined hash
8 years ago
d5e69653c0
Select opacity in draw mode in the canvas app
8 years ago
1d933be5a6
make reset return the hash, not an array with containing it
8 years ago
f34492be94
Remove duplicates uid in the user list
8 years ago
cfc5d634f4
Merge branch 'templates' into staging
8 years ago
bd16e0f0e7
Templates in polls and canvas, and ability to disable templates
8 years ago
63a130c678
Add a button to delete the selection in canvas
8 years ago
33e19d5918
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
126498585e
Add a context menu on the ROOT folder in the drive
8 years ago
be1db2a1ec
Ability to remove an object when draw mode is off
8 years ago
108ab7e9de
comment out a style assignment that doesn't seem necessary
8 years ago
8c629185e1
cleaner less file
8 years ago
0db141e48d
rename style files 'whiteboard' instead of main
8 years ago
395d8625a8
draw the palette on pad creation
8 years ago
3b99c42e22
no more inline styles
8 years ago
ef821c3e7e
integrate @lukevers improvements and clean up js a bit
8 years ago
84d8615cf1
Save and use templates in pad, code and slides
8 years ago
bd2034c47b
prepare rpc before 'ready' if pinning is enabled
8 years ago
a70388284d
disable unnecessary messages
8 years ago
abd87e1322
jshint compliance
8 years ago
e4b15bc616
implement 'getCanonicalChannelList'
8 years ago
09f8e139fe
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
a2f692b9a3
clean up serverside and clientside pinning logic
8 years ago
a13261abaa
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
dedf2b3c69
Display selected color and button to turn off draw mode in canvas
8 years ago
fdede0d1fd
remove some dead code
8 years ago
e87992c7ec
implement atomic pin reset rpc
8 years ago
166e70f628
test new rpc apis
8 years ago
2a566671f2
remove outdated rpc example
8 years ago
3380cf0348
implement getTotalSize rpc
8 years ago
6e1ffcc18d
define better color palette
8 years ago
84029ac2d7
Fix the color picker in Chromium 53 and improve the cursor
8 years ago
5c292fb1fa
jshint compliance
8 years ago
b14d89360d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
8e29e30a35
Realtime palette + cursor corresponding to the brush
8 years ago
8bbbf8e252
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
64089c5f6b
implement pad pinning
8 years ago
d07acc5364
Don't redraw the drive if filesData changes while in unsorted
8 years ago
13514dff63
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
46a5eee597
Display the spinner in the toolbar for local changes
8 years ago
6c7cdc90a9
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
212baeb3a6
better cookie schema. expire old sessions
8 years ago
54d271c4e7
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
a9777ce560
Fix input losing focus in polls with Chrome 57
8 years ago
3484515283
enable more tests
8 years ago
3e47b8a38d
remove dead code
8 years ago
31b178a306
use pinpad api
8 years ago
182dbfc874
implement pinning logic in pinpad.js
8 years ago
a5e5ddae08
rpc all the things
8 years ago
4f7e25eeb9
show labels for brush width
8 years ago
2a6de5163b
jshint compliance
8 years ago
04069cc7f4
fix font size
8 years ago
1e51f89096
wipe the userdoc when the canvas is cleared
8 years ago
e2981c0223
try to make the color picker show the current color
8 years ago
96dac80bd5
better color picker in whiteboard
8 years ago
bd07b3a80f
less cramped styling on text inputs on /settings/
8 years ago
6e9968f989
add 'lol' code theme
8 years ago
b85324a29e
jshint compliance
8 years ago
73d4fd1700
handle reconnection attempts
8 years ago
b07248ad42
prompt with setName if name is unset
8 years ago
9b4b642d4a
protect against subtly corrupted user objects
8 years ago
18469edf18
extend list item rendering to support gfm task lists
8 years ago
055bc03092
strip carriage return
8 years ago
bca13ad5a5
add notifications to whiteboard
8 years ago
233bb7a14f
reorganize some html tags for smaller diffs
8 years ago
76471f7b90
add forget button to whiteboard and handle disconnection better
8 years ago
d4ce3dc6b9
don't rewrite css rules. FOUC is too long
8 years ago
3cfd0a4326
commit some garbage
8 years ago
364dae2882
update templated html
8 years ago
ed89a13fe6
progress on adding version string to some css
8 years ago
4d5baa717d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
76990ac1b2
version toolbar.css for cache-busting
8 years ago
9d3f859657
add a contextMenu entry for the whiteboard app
8 years ago
7ede430db3
Fix 'search.oldLocation is undefined' error
8 years ago
df7363f416
regenerate templated files for new footer
8 years ago
72fecb9549
Fix lint errors
8 years ago
af68e41fb6
Always set the focus to the search bar in the drive
8 years ago
67f4096396
Fix cursor in the drive search bar
8 years ago
12cc49b575
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
72c60ec676
Add background to the whiteboard app
8 years ago
2732b7aa82
Fix module.onLocal not defined
8 years ago
a0c17d7c9b
latest rpc code
8 years ago
4ddf9b4e04
Improve whiteboard UI
8 years ago
89877baa69
Fix read-only mode in canvas app
8 years ago
c2cb24c072
Add toolbar to the whiteboard app
8 years ago
973aeba0da
remove bundled fabric.js
8 years ago
6eab52c33d
use secure fabric.js
8 years ago
59a80d5fde
remove silly TODO
8 years ago
ce5dbaeafd
use alertify instead of browser prompt
8 years ago
71c59d7ae2
Remove unnecessary TODOs
8 years ago
d92a875ce5
Translate the 'wrong application' error message
8 years ago
a8ffac5dcd
Remove old code
8 years ago
5322eff607
Use the current values for the checkboxes in the print options dialog
8 years ago
53c60a31f6
Set the properties and backup inputs to read-only in the drive
8 years ago
0c5a930cb9
Fix an issue with the 'Properties' entry not always displayed in context menu
8 years ago
3e9eb03e5a
display a user's public signing key in settings if it exists
8 years ago
912215185f
add uid to userdata for better notifications
8 years ago
fa9249ef29
don't notify for userlist changes if a user joins twice
8 years ago
40f5e1706f
add a unique id to user objects, define a getter
8 years ago
e2ee80d4e7
set icon for whiteboard app
8 years ago
dbca94437e
rename canvas app to 'whiteboard'
8 years ago
994d640f8b
Fix an issue causing the lag icon to lose its color
8 years ago
819c7e3bae
Fix style issue with drag&drop in the active folder
8 years ago
6fbd1f0028
Store the dates as number and not strings to avoid ot issues
8 years ago
8556ce9d17
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
8ce8401107
Fix issues with middle click in context menus
8 years ago
5f4990cc80
Display or hide the context menu in a more intuitive way with multiselect
8 years ago
51033ab70a
Remove useless links in the context menu and properties for readonly pads in the drive
8 years ago
2b2e581779
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
2e8484ad4c
notes about what to improve. transform json on OT instead of just validating
8 years ago
7afde2309d
Add properties to the files not in the trash
8 years ago
61d33f2dd6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into prop
8 years ago
66a80ea50c
Add properties for pads in the drive
8 years ago
b542245086
fix lint error
8 years ago
cc43bb8362
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
98027dad27
jshint compliance
8 years ago
eeecb1baab
Make Canvas Work Again
8 years ago
4a173e30dc
set user's cursor to either the beginning or end of the document
8 years ago
29174b2922
Update the lag icon
8 years ago
26edb77cf0
Fix style and usability issues in slides
8 years ago
85105a1382
Active folder in drive is not underlined anymore
8 years ago
cd77f50717
Fix transitions in slides, add swipe event handlers, and fix print in firefox
8 years ago
e139295d7e
Add transitions in present mode
8 years ago
45ac3e40a2
Copy print options to present mode
8 years ago
a5f11d0d0d
Uniform the slides rendering in present and print mode
8 years ago
d422c7e165
support old hashes in getUserChannelList
8 years ago
7d5ff27900
better rpc tests, sum up your channel usage
8 years ago
5ed6223313
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
7f2f1f7191
correctly initialize RPC object
8 years ago
c9c9dd0999
use userChannelList if a list is not supplied to pinpad
8 years ago
e8c3cf6aa5
implement rpc message signing
8 years ago
d85a42c776
include User_hash in user channel list
8 years ago
f98c825dc3
Fix keyboard shortcuts not working in CryptDrive
8 years ago
7b27f1dc2c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
7761aaa89f
Add search UI
8 years ago
b578803136
clean up registration code a little bit
8 years ago
c3c866fa2b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
d19bbcb001
Add support for search in the drive
8 years ago
5eb32b33ee
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
298725b3c2
don't show usage tips on error screens
8 years ago
0a6373852e
add signing keys to user object at login and register time
8 years ago
9a32fb1999
Fix sub-folders changing position in the tree when renaming them
8 years ago
931f7619c0
Keep the scroll position on redraw in drive
8 years ago
0607c3bbf3
Add a title to the 'new' button in drive
8 years ago
b9c64a526a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
15e9af77bb
Remove the langauge selector from toolbar and add it in settings
8 years ago
8129b8cdc1
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
15a67afc75
jshint compliance
8 years ago
13d7b3cadc
Merge branch 'd' into staging
8 years ago
a286599f93
Fix fast reconnect, and add support for reconnecting ws in polls
8 years ago
bd9efd7c04
provide examples of valid and invalid rpc calls
8 years ago
7187d3c550
implement getUserChannelList
8 years ago
306f6ce806
resolve merge-conflict with accounting branch
8 years ago
fe5e33a0ee
Fix loss of presentation position when updating slides
8 years ago
805e26bc07
add a version footer to main pages
8 years ago
f10149db1c
Make sure the tip is always visible when the loading screen is removed
8 years ago
71db08eac2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
09afba80db
add support for logging in from register page
8 years ago
16e5788011
Call the callback if we can't parse the local Drive to import it
8 years ago
413d9a6f0b
add a style-callback to confirm
8 years ago
5d88c3a436
newer registration code
8 years ago
10bb11bff6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
803e57c958
add more parameters to confirm dialogs
8 years ago
ceaf757680
Allow right click on the CryptPad logo/link in the top left corner
8 years ago
f2aa531f27
apply styles to confirm buttons if provided
8 years ago
df6298eeb6
apply styles to confirm buttons if provided
8 years ago
84c16c00ad
Fix click events not working on inputs in the drive tree
8 years ago
07a2d8e189
apply translations on feedback page
8 years ago
ca9faa0056
Fix wrong translation keys
8 years ago
b7986ff6b1
Replace the spinner code with a font awesome spinner
8 years ago
6e733b1329
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
d9996cc874
current work for pinning
8 years ago
a7d61aa562
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into accounting
8 years ago
b3cc8da315
implement basic clientside RPC infrastructure
...
and provide a basic example for testing it
8 years ago
f94db93897
Improve the slides layout in print mode
8 years ago
81027b4200
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into accounting
8 years ago
2392167996
Export slides as PDF
8 years ago
4bac8ea0c7
Draw all the slides at once to allow reference links ( fix #77 )
8 years ago
459b18c97b
Add the loading screen in the HTML so that it is displayed before JS is loaded
8 years ago
404fa378e6
Move the store to the 'common' folder, it is not customizable anymore
8 years ago
a8d200ef2e
Don't redirect until realtime is synced when logging in
8 years ago
0c1efd361b
Make sure the href is updated everywhere when importing a stronger link
8 years ago
b701e3cc85
Fix lint errors
8 years ago
4206382865
Fix the settings app to allow backup for unregistered users
8 years ago
f62267f8a1
Ability to import local pads in the user object
8 years ago
e2418a6be2
sketch of how pinning rpc will look
8 years ago
dc567fa7f3
signing keys are stored in hex so encode and decode them
8 years ago
ce6cd1211e
Fix lint errors
8 years ago
aa762e7d63
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
8a48612de2
add some notes for later
8 years ago
9ad33574e9
Fix the function returning the pads list in the drive
8 years ago
14938089ac
Keep the focus on the iframe window after canceling a deletion
8 years ago
3f7dea8f7e
Context menu support for multi-select options in drive
8 years ago
e1c02fd8a4
Drive rename: save pads and folders name on click, cancel with Esc.
8 years ago
d93a270336
Ability to display tips in the loading screen
8 years ago
77d09f64e1
Display anonymous users in the user list
8 years ago
cb88227e2b
Autocomplete on key press in some dropdown menus
8 years ago
c04819538b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
fcb9848b3a
hide toolbar when in read-only mode
8 years ago
2a1b241592
Display a button to open the editing link while in read-only mode if we know it
8 years ago
27241488a5
Merge pull request #96 from pbondoer/css
...
(CSS) Some improvements to drive
8 years ago
6c9da646e0
(CSS) Some improvements to drive
8 years ago
08c862b271
add FIXME notes to poll
8 years ago
ed9bcca96f
Close the websocket network when CryptGet/CryptPut is done
8 years ago
a68acac13b
Only ask for a display name once in /poll
8 years ago
a978b51656
If display name is empty, use anonymous in the drive
8 years ago
153386a6e0
CSS improvements in the drive tree
8 years ago
6098f28260
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
a852112808
Fix open folder from the tree context menu
8 years ago
2c9deed381
Merge pull request #94 from pbondoer/staging
...
Some CSS fixes
8 years ago
868161a8a8
fix undefined reference in code
8 years ago
0bb10a8a0a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
800db07077
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
8 years ago
e1303a16da
add support for title attributes on dropdowns
8 years ago
52793385ea
Fix lint errors
8 years ago
e39fe1c0b7
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
8 years ago
01c4d7d4a7
Merge branch 'maybe' into staging
8 years ago
c884782d57
here are some changes
8 years ago
2b6e44189d
When trying to reset the drive, tell the user if the input text is invalid
8 years ago
9a7c2dd5e2
Add a 'settings' link to the user menu in static pages
8 years ago
370ae81106
Use the display name in the backup file name if not logged in
8 years ago
e0d972674f
Fix context menu in drive and rename textbox styling
8 years ago
c5f983ecd7
Convert read-only link to editing link in the drive
8 years ago
d26d8f53d9
(CSS) Fixed textarea being too large
8 years ago
a9afa24428
return empty string instead of blowing up when fixing HTML
8 years ago
6b8d0c8bc7
Merge branch 'security2' of git.xwikisas.com:xwiki-labs/cryptpad into security2
8 years ago
b32d698291
Fix issue with present mode in slide (readonly)
8 years ago
8bdc8415ab
Find a pad in the drive
8 years ago
91eda5fa83
Implement stronger content-security-policy except in /pad/ which does not allow it.
...
Implement a "loader" which allows for applying a version number to everything.
Added a cache control for anything which has a version.
8 years ago
7db0e14bc0
add 'force' flag to override removal of html elements
8 years ago
53f4f8826e
Merge branch 'staging' into staging
8 years ago
55210f17eb
Clean the code to be less dependant on 'li'
8 years ago
3e9c4d0901
Add hover to file manager tree
8 years ago
cbdfae09a6
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
8 years ago
c6c3e1bbb5
Don't select subfolders in the tree when drag&drop
8 years ago
d605fc757b
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
8 years ago
a26b9d3240
Don't select subfolders in the tree when right-click on drag&drop
8 years ago
cb5e01815c
validate all alertify strings by default. require 'force' argument to bypass
8 years ago
b0323f6fd9
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
8 years ago
a2b5200381
Add a container for the folders in the tree in the drive
8 years ago
412815b042
Merge branch 'security' of git.xwikisas.com:xwiki-labs/cryptpad into security
8 years ago
11d54256da
Make sure the display name is displayed in the same way everywhere
8 years ago
2c5c6da0d9
Fix XSS in alertify logs
8 years ago
5797aab3f2
Fix XSS with display names in the user list
8 years ago
26e3971482
Fix XSS in the user dropdown menu
8 years ago
639376f1cb
don't use hyperjson.toString
8 years ago
eb9a39eb68
Add hover on elements in drive and make grid slightly prettier
8 years ago
f130fd0598
Fix horizontal scrollbar in edge
8 years ago
345d2faab2
Fix horizontal scrollbar in Edge #3
8 years ago
d683dc499a
Fix horizontal scrollbar in Edge #2
8 years ago
7a0a87bf6c
Fix horizontal scrollbar in Edge
8 years ago
f06196c261
Remove the context menu buttons when removing selection
8 years ago
c0278ba77f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
efb7380a12
Fix default pad not created after registration
8 years ago
5d39125004
Make onSettle Async Again
8 years ago
4f4075ed6e
Make the settings app available to anonymous users
8 years ago
0224d6489b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
12aec60a12
hack around onSettle not doing its job
8 years ago
0ae7f94184
Remove the pointer and text underline on icon:hover in drive
8 years ago
69b6f80e4b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
86adfbf27d
update cache-busting directive in all supported apps
8 years ago
cfc9f2e622
remove code for 'user' app, now that we have login and register
8 years ago
ec7761eeb8
Make sure we don't use a wrong title for a new pad
8 years ago
8e7e1d336e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
96f6b5755d
Add the blog link in the header and footer
8 years ago
d49a7d7ec4
fix undefined reference
8 years ago
9a2ed5741a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
a4913f2f4b
provide UI for disabling the user feedback api
8 years ago
1a259bb3aa
check if user has disallowed feedback api
8 years ago
4f7a05ead2
Fix issue with the path for the trash in the drive's topbar
8 years ago
8741b50f5b
Set the file name as default title if a pad is created from the drive
8 years ago
e8c73f35ce
In the tree, display the rename input only once
8 years ago
e38df7ce47
Fix creation of new pads in /pad
8 years ago
20518a3e88
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
f8d653406a
Add the new content for the default pad and add french translation
8 years ago
d15a08830e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
06f0891d21
add allowUserFeedback toggle to settigs page
8 years ago
498f4065cf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
95853debf9
Update the default pad #1
8 years ago
d4bf7cf9aa
Send the initial state only if it is a new pad in /pad
8 years ago
66dc166936
Make sure the realtime is synced with onSettle when using cryptget
8 years ago
fadddb297c
Readonly mode in /pad had contenteditable set to true
8 years ago
de5a21fe57
add a simple feedback api and text explaining what it is
8 years ago
2ad9debe58
Remove the placeholders in /code and /slide
8 years ago
38893fb8e5
Remove the 'Bootstart tooltips require Tether' error
8 years ago
88b29e8bdd
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
5303e76ece
Make sure the content is correctly applied in onReady
8 years ago
cc829d51f8
jshint compliance
8 years ago
42b6cca18d
Fix new pad not working
8 years ago
3fd5669647
Hide the trash icon for read-only pads if we have the edit link in drive
8 years ago
02cc9c8344
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
e040c00557
Fix blocker issue when creating an account without migrating
8 years ago
e15a6a347f
Fix the forget pad button
8 years ago
89bee8cf6b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
ba3e24b595
media tag experiments
8 years ago
54b0a86c2e
Make sure we redirect to the drive if we access the login page from the homepage
8 years ago
55fb0f03ae
Fix the path in the drive overriding the content area
8 years ago
d7d7165dc4
Login page was using a wrong translation key
8 years ago
ba0b314f5e
Fix the 'new' button in drive which was broken in non root categories
8 years ago
d8cc2903cc
Display context menu actions in the toolbar when an element is selected
8 years ago
a0340f1419
Open link in a new tab in /pad
8 years ago
2d30393243
Add support for updated translation key
8 years ago
cc174f3bee
Fix typo
8 years ago
bdc00a2413
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
0ce17ebbad
CryptDrive usability improvements (new file in drive + context menu)
8 years ago
e73b4a1131
Don't display 'All files' in the menu
8 years ago
89f3577058
remove old poll
8 years ago
7e77c6828a
more correct pluralization
8 years ago
3d0e7cb9a7
pull ckeditor config out of main.js
8 years ago
328e5c6f03
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
c72bbd4c37
Use the file name as initial title
8 years ago
4cbb3b2ed2
Ensure we use English for reference
8 years ago
ffe17a6bc9
Use JSON.stringify instead and fix linter
8 years ago
a84f8e2808
Assert translation now outputs JavaScript which is easier to edit for translators
8 years ago
47b8fefd9e
Load messages.js only once, in cryptpad-common
8 years ago
11d9c9e813
Merge branch 'master' into staging
8 years ago
2103f0afa8
Merge branch 'master' of github.com:xwiki-labs/cryptpad
8 years ago
0bdf59c1dd
Fix broken link in the 'New' button on cryptpad.fr
8 years ago
454d1c2052
Do not load all the translations anymore, only the needed one
8 years ago
434c3a220c
Remove old translation keys #2
8 years ago
d81d17b86c
Remove old translations keys no longer used
8 years ago
9702305abc
Use better translation keys in settings
8 years ago
a6497f7a52
Add a way to show the drive tips again
8 years ago
c17f28e5fe
Fix race condition #2
8 years ago
239e2bcc1f
Fix issue with null entries in Cryptpad_RECENTPADS
8 years ago
1540ae3f6f
Fix issue with null entries in Cryptpad_RECENTPADS
8 years ago
dd014f6ef2
Fix race conditon
8 years ago
94417d9a8b
jshint compliance
8 years ago
8167ed9048
implement cache-busting everywhere
8 years ago
34b6507fa3
implement cache-busting everywhere
8 years ago
c9b8889380
add cache-busting to chainpad-crypto
8 years ago
09fade6127
add cache-busting to chainpad-crypto
8 years ago
2daa9f8658
Link to main page was opened in the inner iframe
8 years ago
deda40375a
Use the new onSettle from chainpad to determine if the realtime is synced
8 years ago
550c65aae0
Add a default pad in CryptDrive after signing up
8 years ago
92d50ded64
Merge branch 'soon' into staging
8 years ago
97762f9f9a
Make sure all the elements in RECENTPADS are non-null objects
8 years ago
e4dbe97d71
Update display name in realtime across tabs and remember 'anonymous' name
8 years ago
7762ffcbff
Ability to use Ctrl+click on the cryptpad logo in apps
8 years ago
7497e0d1c5
Add a dropdown user menu to the top bar in static pages
8 years ago
0e76b18278
Hide the links in the html topbar on small screens
8 years ago
7758d056fa
Ability to import/export a user realtime object
8 years ago
0a43570990
Add the new files for the settings app
8 years ago
cd9cea8fa4
Create a settings app to manage user objects
8 years ago
71b84afdb2
Redirect to the pad when logging in or signing up from a pad
8 years ago
92050eb04f
Fix the trash button in toolbar not always working
8 years ago
aae3fba284
Fix the storage when the hash is invalid
8 years ago
25dd103f6f
Reduce font-size for register explanations
8 years ago
7d0c29513c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
7d21206cae
add registration introductory text
8 years ago
2851ceb95a
Merge branch 'soon' into staging
8 years ago
2807ad9dc3
Add spinner and translate the register page
8 years ago
562e5b8c70
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
5d4d530c89
switch registration text to an explanation of how login works
8 years ago
bff9d05210
Make sure the login_name is in the object
8 years ago
b1b294aade
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
20083264b2
load fontawesome icons on register page
8 years ago
3aa03225c9
Add a spinner when hashing the password and translate homepage
8 years ago
fbcf4ccec4
force usernames to be lowercase
8 years ago
5614bea271
redirect users to login and register from toolbar
8 years ago
f723585758
add api to check whether the realtime has synced with the server
8 years ago
3b1bd2f720
use additional translation keys for registration
8 years ago
b5b2454f0b
use bootstrap for login and register pages
8 years ago
c556f78562
log in directly from home page, sign up at /register/
8 years ago
d0edf75c89
signup link directs users to register page, not user
8 years ago
1232aa8a79
jshint compliance
8 years ago
8eec7ec7c8
Fix typo
8 years ago
88af104ce8
basic registration page to replace user page
8 years ago
a995df25f6
disable new OT in pad and code app
8 years ago
f92ba193c3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
e100110741
implement log in as an api
8 years ago
d54262c8df
Use the same disconnecter error translation key for all the apps
8 years ago
f8366e0cfc
Remove support for legacy store and add a way to import legacy pads
8 years ago
342cb44cf7
Ability to migrate a anon drive directly from the drive
8 years ago
c642bce984
restore disabled listener
8 years ago
67d881b2cf
Remove the drive entry from the user menu if already in drive
8 years ago
e865b89f43
Add the contextmenu button in the drive dynamically
8 years ago
3af7c9cff8
Replace the expand/collapse ckeditor button by our own to save space
8 years ago
914c442615
Do not redirect to home page when logging out from another tab
8 years ago
702798f65a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
1e2cc6bea4
Fix race condition with the iframe store
8 years ago
dae17588c6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
32a5c5ff62
better integration between /user/ and home
8 years ago
fe7ba98338
remove dead code from /user/
8 years ago
9b047bfb53
don't autocorrect usernames. add trailing slash to /drive
8 years ago
6e97082ff9
remove dead code from login function
8 years ago
b3e73b0f0b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
367a02c031
Add mobile support for the code app
8 years ago
628148d001
Display the contextmenu button only if contextmenu exists
8 years ago
8a1acc3c37
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
6f07a3b7b4
erase lingering sessionStorage values when logging out
8 years ago
ac79fbb5a2
Improve mobile support for the toolbar and the drive
8 years ago
9f1789b2d2
Fix creation of pads from non-root category in the drive
8 years ago
7e7d1f7a16
Display the error when opening a document with the wrong app
8 years ago
6f0d33dc1d
Fix missing placeholder in the Slide app
8 years ago
7d6e15e465
Throw an error when trying to open a document with the wrong app
8 years ago
ad82a275bc
Replace the Apps button by a New button again
8 years ago
fd33ffd56f
Fix issue creating a patch everytime the user clicked in an app
8 years ago
fbbf8a2829
Replace initialState by a placeholder in slide and code
8 years ago
87abfac5e0
Fix lint error
8 years ago
02439e0f61
Improve the homepage with new images and translations
8 years ago
f57c8c0e4b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
2c6b4b9c6a
Hide disabled applications from the context menu in drive
8 years ago
85b49d5ec8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
91299f5f30
Ability to access the drive from any pad
8 years ago
b0fb56fa63
Allow logge din users to access the home page
8 years ago
72c4175b6f
remove slide/oldmain.js
8 years ago
e607ba5dad
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
9cea8d82c2
Fix left-click disabled in Edge after renaming a file
8 years ago
2dfe182d8d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
0ca1775657
add page for listing missing translations
8 years ago
6a5769405b
Fix a race condition issue introduced with reconnecting patch
8 years ago
8881334ca8
Fix renaming folders from the tree
8 years ago
65054119cf
Fix a bug preventing reconnection in drive
8 years ago
89da142204
Fix pad creation from the context menu
8 years ago
757ae7a3ad
Fix a cross origin frame issue with dropdowns
8 years ago
3321d01040
add background image
8 years ago
8427b6ae8e
Fix 'sort by type' in drive
8 years ago
39c85ca3f7
Fix race condition causing missing translations in homepage
8 years ago
dc39c4e179
Fix a race condition causing the drive toolbar to be missing
8 years ago
2e247d44c7
Hide the backup icon when logged in
8 years ago
8ed593bfff
Keep the anon drive when signing up
8 years ago
5e69b78334
Remove the domain from the href in store
8 years ago
a9c9d19212
Hide the template from the list in the drive until it's done
8 years ago
487650df78
Remove the remember me checkbox
8 years ago
58d8a30b5b
Redirect to the main page when logging out
8 years ago
29578a7400
Merge branch 'hpbs' into newtoolbar
8 years ago
2d79649949
Fix the 'NoScript' bug with the drive
8 years ago
5ef074370b
Name a place before creating it in the drive
8 years ago
02906b3945
Merge branch 'newtoolbar' of github.com:xwiki-labs/cryptpad into newtoolbar
8 years ago
a4286f1c83
Merge branch 'soon' into newtoolbar
8 years ago
0e9e0e545f
Load the new pad when the hash is changed
8 years ago
e41cbb92d8
Use default FILES_DATA name if not provided
8 years ago
fa1582f307
Replace 'filename' by 'title' in drive when there is no filename
8 years ago
c44f3a1044
Delete multiple elements could also remove unselected ones
8 years ago
b79e1e48c7
Update colors in drive
8 years ago
fb48484d2a
Fix the rename feature in drive not working with tables
8 years ago
3f44444f41
Display the 'New' button in the trash
8 years ago
00efc96919
Move the toolbar and add a breadcrumb
8 years ago
6f5ff07c2b
Display the elements as a table instead of a list
8 years ago
95056315cf
Move the folder icon style to the less file
8 years ago
8c7305bf1b
Use less to write the drive stylesheet
8 years ago
11f0a9ae5f
Revert the changes adding anonymous pads
8 years ago
f42665ba49
Remove the unowned pads category
8 years ago
cb85ad3fdf
Merge branch 'newtoolbar' into ownedpads
8 years ago
75f1eed712
Merge branch 'newtoolbar' into hpbs
8 years ago
373b07ed28
Fix lint errors
8 years ago
097f78d777
Merge branch 'newtoolbar' of github.com:xwiki-labs/cryptpad into newtoolbar
8 years ago
015e6fc262
Make sure we have the same hash in all the tabs when disconnecting
8 years ago
88021f2264
Anonymous pads fo anonymous users
8 years ago
8ccd845d52
Merge branch 'newtoolbar' into hpbs
8 years ago
ce1e792419
Merge branch 'soon' into newtoolbar
8 years ago
9d275daebb
Backport changes for the login page from hpbs branch
8 years ago
a5c03c1540
Make sure data is migrated before leaving registration page
8 years ago
69fb8b4d2f
Merge branch 'master' into soon
8 years ago
f8455875a9
Fix the NoScript (iframe not loaded) bug with inner iframes
8 years ago
c77abfa7f4
Remove a second scrollbar in polls
8 years ago
5e36d9ea29
Fix polls table not updated with local events
8 years ago
39ca2e6dd6
Fix bootstrap conflict with context menus
8 years ago
d1bed5ae4b
Fix polls table not updated with local events
8 years ago
26bea774cb
Merge branch 'newtoolbar' into hpbs
8 years ago
99b8898e54
Apply new title when clicking on the page without pressing enter
8 years ago
ea8667302c
Display only a placeholder when the poll title is default
8 years ago
7d66d391fc
Merge branch 'newtoolbar' into hpbs
8 years ago
1e1bfd275c
Don't show the tab notification when someone has joined the pad
8 years ago
5d5d03163e
Add favicon and notifications in polls
8 years ago
3338000018
Add Esc and Arrow icons in the slide's present mode
8 years ago
efdae19f0c
Update the lists in the code and slide toolbars to use the new dropdown
8 years ago
36c8ade26c
Update the lists in the code and slide toolbars to use the new dropdown
8 years ago
fa8a0d5880
Merge branch 'newtoolbar' into hpbs
8 years ago
69bee7d79a
Add data into the homepage
8 years ago
88d5b4cc9c
Add a 'New pad' button in the toolbar
8 years ago
73d424b506
Improve the login UI (css and translations)
8 years ago
e006ed7076
Ability to log in from the main page
8 years ago
a9063e0459
Reload all tabs when the user logs in or out
8 years ago
efed1f5efe
Add handlers to login and logout buttons
8 years ago
767ba8b549
Select what we want to display in the toolbar
8 years ago
2afdc11327
Replace the username button by a dropdown menu
8 years ago
4adde0f0c0
Use the new dropdown for userlist and share
8 years ago
70b73206b7
Merge branch 'brandones-master' into soon
8 years ago
efffd4974f
Add createDropdown and createLanguageSelector in cryptpad-common
8 years ago
29c8f0bbef
Use a FontAwesome spinner to replace the old unaligned one
8 years ago
b5acdb8cc0
Disable zooming on mobile
8 years ago
40985f1811
Dubious height setting for iOS
8 years ago
52d8d8db1d
Get rid of margins on mobile
8 years ago
cd0931c951
UI improvements for mobile browsers
8 years ago
6352656737
Remove the default context menu in the entire drive
8 years ago
ed79b8870c
Merge branch 'master' into soon
8 years ago
605072cfbf
Fix empty title with new documents
8 years ago
4963c77b61
Fix the title reset bug
8 years ago
35a853ffff
Stop failing tests over missing translations because otherwise they'll almost never be passing.
8 years ago
3f1e287811
Fix an issue causing a user object to be turned into a pad
8 years ago
994f6991c8
Merge branch 'master' into soon
8 years ago
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
8 years ago
569ea21705
Replace the language selector by our custom dropdown menu
8 years ago
33b8de888e
clean up unused files
8 years ago
26dd4ea11f
Fix lint errors
8 years ago
4278ac7637
Merge branch 'soon' into fileManager
8 years ago
2be5db9540
Ability to open files in readonly mode
...
Fix CSS issues
8 years ago
63b9d4e9fd
remove path for backwards compatibility
8 years ago
f74d0a46a4
Remove the alert when pressing del in 'all files'
8 years ago
b39067d2a1
jshint compliance
8 years ago
74a12f50ac
only migrate keys which don't already exist
8 years ago
1c3f1a15cd
make sure that /pad is resized after loading
8 years ago
5b08fed7fa
Ability to add files from the drive toolbar
...
Fix CSS issues with the different toolbars
Translate the backup URL button alert
8 years ago
a3cd100c94
apply yflory's safari patch
8 years ago
0373556475
support old hashes in /poll
8 years ago
d5561910d4
Move the file manager into /drive and add a toolbar
8 years ago
1e70af0c16
Use the same network for the apps and the file store
8 years ago
bf764d26e7
Merge branch 'staging' into workgroups
8 years ago
3836b20b08
enable the file store
8 years ago
b0d4dad417
Fix creation of a new file manager object
8 years ago
5a8f0df19e
Add support for reconnecting websocket
8 years ago
b33661d9d5
don't toggle maximization state after setting
8 years ago
e56cc49f79
catch errors that popped up because of a cross-origin iframe
8 years ago
5080751a90
hide unnecessary scrollbar
8 years ago
95617a11c8
fix broken paths in old poll
8 years ago
7a0442afe0
Drag and drop files into a workgroup
8 years ago
05a956879a
prepare new poll app for release
...
move old poll into poll/old
8 years ago
5cd714b18a
configure filestore usage via customize/application_config.js
8 years ago
2b5085625c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
8 years ago
69b1764c9d
Missing entries in the context menu with users
8 years ago
c6499d6789
make panel styles reusable
8 years ago
34967ac354
encapsulate rendering functions so we can pass in cryptpad-common
8 years ago
66b8c93205
remember time of first visit
8 years ago
ba4df1a22c
create examples directory with old prototypes
8 years ago
0abf45bdc5
better fsStore debugging
8 years ago
e3f79f914a
fix user hash
8 years ago
d232a5a83e
Revert "simplify key generation and remember user's additional keys"
...
This reverts commit 75786ff9ff
8 years ago
91a806ab86
focus on OK button when we pop an alert
8 years ago
850bd42149
don't try to display things that don't exist
8 years ago
75786ff9ff
simplify key generation and remember user's additional keys
8 years ago
621476424d
make strings translatable and refocus on correct input
8 years ago
a97696c712
show user's display name and account name
8 years ago
3560f0580f
commit prototype upload script
8 years ago
2f9f3d921a
trim excess whitespace from usernames
8 years ago
89e5830409
make alertify display time configurable
8 years ago
49d80d91d9
don't load customize/pad.js anymore
8 years ago
f020fd5a75
remove /customize/pad.js from main apps
8 years ago
aae443c8e9
replace old poll app with new
8 years ago
387f4ebf5d
add this important js file I forgot
8 years ago
8f0de589dc
add missing cp class to more html
8 years ago
e9376a66c2
apply 'cp' class for unified styles
8 years ago
8b034a9554
better flow and animations for login page
8 years ago
db12b5e896
move text for login page into translation file
8 years ago
5e1d8292c5
guard against trying to parse special fragments
8 years ago
51067430f9
more restructuring of user app
8 years ago
a4ed2388e2
use 'box' class
8 years ago
eb620bee77
restructure user application
8 years ago
a10eac2773
Fix lint errors
8 years ago
52a593c2c2
fix jshint complaints
8 years ago
53a4d4738a
really make sure you're logged out
8 years ago
63cd5c16ac
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login
8 years ago
81259fc25f
Refresh unsorted and templates when files data changes
8 years ago
5534da8abf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login
8 years ago
9b6c9e3891
Add support for templates in the file manager
8 years ago
acfc27f5c5
fix merge conflicts
8 years ago
3197b62fbb
latest work
8 years ago
29d406b7a9
implement cryptput
8 years ago
84d5e4b35d
better tools for playing with template code
8 years ago
1772cc93c8
Fix the taildoc bug
8 years ago
87abfff66b
Fix Flash Of Unstyled Content (fouc)
8 years ago
86cda4357b
handle more possible cases
8 years ago
1682d23c1c
remove old user prototype
8 years ago
046220f239
Add info boxes for the different categories
8 years ago
403ba53980
Fix typo error
8 years ago
e9418af88b
Add an info box in the file manager
8 years ago
c359c27997
Use user object as default store in file manager
8 years ago
4aed585574
Fix style issues in the toolbar
8 years ago
f9db7e588e
Fix unused backup in localStorage
8 years ago
c7e63f63fd
Use the user object in file manager if it exists
8 years ago
6778a7062d
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into staging
8 years ago
bd6992da0a
create a random hash
8 years ago
2cd50498c2
add log(in|out) functions to common
8 years ago
dfea802c77
better crypto hygeine, start thinking more about ui
8 years ago
e3f484d876
File manager in the home page, lint
8 years ago
7df460c766
implement createChannelId api
8 years ago
3698fe8b0e
Merge branch 'soon' into login
8 years ago
5a14db9f07
Merge branch 'test-filemanager' into login
8 years ago
dd46b9425a
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager
8 years ago
4646d5c866
Add suport for read-only mode in the file manager
8 years ago
2a624a0b60
add example usage for cryptget.js
8 years ago
303953a431
Merge branch 'soon' into login
8 years ago
6b9529b121
implement ajax-like functionality for zk docs
8 years ago
5bc7766f44
Use a consistent toolbar across all apps
8 years ago
8a7fda6341
Merge branch 'soon' into login
8 years ago
a220742f68
fix reversed color settings
8 years ago
308db7fa79
fix uncolored /pad/ content in IE
8 years ago
67baf30d65
basic outline of logins
8 years ago
2968488278
convert uint8 arrays to hex
8 years ago
d95a3ac92e
Fix an issue when deleting a key from the proxy
8 years ago
82f3d5f852
Open the file manager of someone else
8 years ago
c0d96fb10d
Merge branch 'login' into test-filemanager
8 years ago
c3e3aa69c3
Merge branch 'fileManager' into fmIndex
8 years ago
5d335ba796
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager
8 years ago
8e6830d080
Fix file manager with a chosen hash
8 years ago
2b077a8e95
add the file manager in the main page
8 years ago
f36d15d0db
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager
8 years ago
b7f2ef97c7
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into fileManager
8 years ago
fdb5c2ddb5
Fix UI issues with rename and delete actions
8 years ago
319ce5d8c8
Fix the code app
8 years ago
ee56f5608f
Fix the infinite spinner bug with the file manager store
8 years ago
43ccd11adc
Merge branch 'infiniteSpinner' into fileManagerMerge
8 years ago
05fd6c1563
Fix the infinite spinner problem
8 years ago
5cd7d8ec84
Fix undefined userid in new poll
8 years ago
cb43eb9ca1
Merge branch 'newpoll' into fileManagerMerge
8 years ago
9b3719e0ae
Merge branch 'soon' into fileManagerMerge
8 years ago
b7b4a034a3
Merge branch 'soon' into newpoll
8 years ago
ddc99cecb1
Fix lint errors
8 years ago
f26cdb1a21
Fix UI issues, unclickable user column, add confirm dialog
8 years ago
6feb8548b3
Prevent the proxy handlers from being called on the parents
8 years ago
740b6e955e
Improve UI, fix issues with the table
8 years ago
94fbc2dca4
prototype cryptographic login
8 years ago
a23b3d3517
use new ot in code too
8 years ago
de0863e232
use new ot
8 years ago
4cd9bd5534
strip listeners
8 years ago
b79618c94a
don't allow listeners in /slide/
8 years ago
ebff304602
turn off some unwanted behaviour
8 years ago
6dff82ede2
Improve UI, scrollbar in the table, publish/admin buttons
8 years ago
90804ed9e0
Add usernames/userlist in the toolbar and fix publish button
8 years ago
3632834500
Lock inputs when the user is not editing them
8 years ago
eaeaf4df40
Improve UI, add title input and forget button
8 years ago
bca746bbb5
Fix uncommitted column, add toolbar
8 years ago
ffedcb63f7
Display own column at the beginning, add uncommitted column
8 years ago
4a4d4a0474
most recent work
8 years ago
e5ff7020fb
move buttons out of form
8 years ago
c88fa34558
Improve UI, fix issues with new file manager channels
8 years ago
5a5451d94c
Sort elements in the trash, add properties in the context menu, fix issue with Edge
8 years ago
19e4a2d044
Create new files, sort displayed elements
8 years ago
a957b72598
Create a new pad from the file manager
8 years ago
4fcdece4af
Test create new pad from the file manager
8 years ago
d6e1215166
Refresh the directory if needed when the object has changed
8 years ago
118829617f
Use the FS store as default store
8 years ago
aa14ea7ac4
Use the old store format
8 years ago
da19608269
Translate the context menus, Shift+Del shortcut and realtime object
8 years ago
7a035fa4a0
Fix drag and drop with multiple elements selected
8 years ago
d77970975c
Add translations, ability to select multiple elements, clean the code
8 years ago
eb50177201
do a bit of work to preserve cursors
8 years ago
ac43f4cb1f
new prototype poll
8 years ago
f05efbb113
Clean the code
8 years ago
851d3df656
Ability to see, move and delete unsorted files
8 years ago
43d93938c3
Fix the list, find the unsorted files, ability to add a folder
8 years ago
cfe3d38197
Add expend/collapse to the tree, fix CSS, add list/grid view modes
8 years ago
c9cd06514c
Add "restore" from trash, improve drag and drop and update css
8 years ago
4c5cb79c20
Merge pull request #58 from xwiki-labs/replaceState
...
use replaceState if available
8 years ago
c2770a7a74
set correct hash even if browser does not implement replaceState
8 years ago
d009b7400c
fall back to default title if one is not suggested
8 years ago
e77ad4e909
better fixes for export
8 years ago
75dd4a5926
slightly better test for variable
8 years ago
b7d9998b9b
fix reference to undefined variable
8 years ago
303c65f2c3
use replaceState if available, instead of setting the hash
8 years ago
8e1bff706b
Add drag and drop, rename and delete actions
8 years ago
67bf41627d
comment out dead code so CI doesn't complain
8 years ago
002e22ee9a
turn off unwanted behaviour until we can do it correctly
8 years ago
5fc44a6e4b
Merge branch 'soon' into fixpolls
8 years ago
ce9eb47351
Initial state of the file manager app
8 years ago
2d5448458b
export messages
8 years ago
b1370c05b7
add translation completeness test to assertion page
8 years ago
5f6ebb5cc1
fix incorrect regex for c-like title detection
8 years ago
d512b113cd
address failure to parse url when hash is not present
8 years ago
6ae851ffdd
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging-soon
8 years ago
636b0fcadc
do our best to keep the console quiet
8 years ago
3de4e5709b
Clean the code
8 years ago
ab1d3958ce
Add a pencil icon when hovering the title
8 years ago
6d1e06cca3
Add notifications when a user joins or leaves the channel
8 years ago
54a63267cd
Add a share button and merge the viewers and editors buttons
8 years ago
87d86384ac
Fix broken elements in the new toolbar
8 years ago
6351d1856f
Remove the top bar and move its content in the applications' toolbars
8 years ago
3d74290c7d
Merge branch 'usability5' into staging
8 years ago
9e92a597b3
Ability to edit the title in the toolbar by clicking it
8 years ago
0a9d34a6c9
hide appended color pickers
8 years ago
c858b247c1
filter absent users from the userlist
8 years ago
ac3ddbab70
expose userList for later usage
8 years ago
a8612ed1c7
Merge branch 'usability5' of github.com:xwiki-labs/cryptpad into staging
8 years ago
10bb5e1607
Add the title in the toolbar
8 years ago
1e003b13a8
ask anonymous, first-time users to set their name when they first join a pad
8 years ago
5d9b81ab2f
Merge pull request #53 from xwiki-labs/update
...
minor fixes to html and userlist
8 years ago
46c5f64369
remove absent users from the userlist
8 years ago
51a79c5218
Remove unused dependency
8 years ago
9a733bb360
Fix dropdown menus with Edge
8 years ago
39bbf8a6c1
Fix the new userlist button and make the toolbar responsive
8 years ago
24fbe22c9d
Improve the toolbar style and the way the userlist is displayed
8 years ago
d2389a5729
Change the userlist in the toolbar
8 years ago
e739c49e7f
Remove the 'about' button in ckeditor
8 years ago
b23fe783e3
Fix the color picker in Chrome and hide the buttons when not supported
8 years ago
91b4446c0b
Merge branch 'fix-chrome-style-bug' into soon
8 years ago
53fe002d3b
Merge branch 'slide' into soon
8 years ago
6c04b7967d
Remove unused library
8 years ago
d63c912af0
Use the HTML5 color picker to change the colors in slides
8 years ago
bb2317d8e6
fix chrome style bug by forcing reload of style sheet
8 years ago
765498e88e
Remove the support for old.cryptpad.fr
8 years ago
d7e170c797
Test colorpicker
8 years ago
81fce1237f
Colorpicker to choose the background color in present mode
8 years ago
5300bc363c
Fix a race condition in the slide application
8 years ago
c322aa440e
Fix the username icon hcih was not working anymore
8 years ago
8575f3f79f
Fix the "rename" feature which was not working anymore in some cases
8 years ago
a989b51d74
Fix race conditions with Alertify
8 years ago
74df38f94f
Fix race conditions that could prevent applications from being loaded
8 years ago
a28daf2715
use websocket url configuration api
8 years ago
dbc8f01b8b
fix merge errors and reach full jshint compliance
8 years ago
a30e17121d
Merge branch 'readonlyButton' into soon
8 years ago
e84a54556c
Move the toolbar buttons' events handlers in cryptpad-common
8 years ago
2ac1b02572
Merge branch 'config-sockets' into soon
8 years ago
11f63c861c
Merge branch 'titles' of github.com:xwiki-labs/cryptpad into title
8 years ago
5e76194262
use new config api
8 years ago
3dfa19b786
more flexible websocket configuration (WIP)
8 years ago
76fdadee7f
Store only the strongest hash in the localstorage
8 years ago
1c808b3da8
Add comment for the 'important' css rule
8 years ago
17b4f91810
Do not share the title in the doc if it is the default title
8 years ago
391728ee6d
Use CodeMirror in /slide #2
...
Fix title errors in the slide app caused by the present mode
8 years ago
8c33218ceb
Move the codemirror themes in /common
8 years ago
2609af2105
Use the CodeMirror editor in the slide application
8 years ago
b5b0eacebc
Remove the old (non-bower) codemirror
8 years ago
261d2fecbc
Get codemirror from bower and use that version in the code app
8 years ago
bc73fa2074
Merge branch 'fontawesome' into soon
8 years ago
f03018f3bc
Improve the top bar and use the font awesome icons in /code
8 years ago
0be8c333e0
Merge branch 'fontawesome' of github.com:xwiki-labs/cryptpad into fontawesome
8 years ago
3d54413343
Improve the UI with FontAwesome icons
8 years ago
a266f0bee1
query parameter for messages
8 years ago
c16e8d603b
Enable reconnecting websocket in code pad
8 years ago
d6525087c7
jshint compliancy
8 years ago
ed9acf1c00
Merge branch 'rememberName' of github.com:xwiki-labs/cryptpad into rememberName
8 years ago
a4843cb5d7
Merge branch 'newhashNoConflict' of github.com:xwiki-labs/cryptpad into newhashNoConflict
8 years ago
a82b7aaf8b
allow empty names
8 years ago
2267ec8c43
Slides in read-only were not updated with the latest content
8 years ago
eac0cdd6dd
Enable read-only mode in slides
8 years ago
d46bd1af5c
Improve the toolbar UI with the username displayed
8 years ago
79884e2400
Use the same username for all pads
8 years ago
73d5ea967b
Fix an error created by the merge
8 years ago
dde519795d
Merge branch 'newhash' into newhashNoConflict
8 years ago
99004428d5
Enable the read-only mode in Cryptpoll
8 years ago
47e8be1681
Remove the IMPORT button and editor toolbars in read-only mode
8 years ago
f29e3d7b0d
don't let notifications interfere with document titles
8 years ago
a9e2ca8d72
make tests green again
8 years ago
83705ae058
Improve the UI in read-only mode
8 years ago
e6785b4dad
push /pad/ state once ready to avoid OT collision
8 years ago
723df4880e
Merge branch 'slides' into merge-slides
8 years ago
b96f050555
Merge branch 'board' into merge-boards
8 years ago
fa8199bc75
don't try to use experimental user code
8 years ago
2d42cadb23
push /code/ state once ready to avoid OT collision
8 years ago
bf5dac58dd
Merge branch 'titleUserDoc' of github.com:xwiki-labs/cryptpad into titleUserDoc
8 years ago
bf8c9a2c4b
Add a button to get the read only URL
8 years ago
99b50465c7
Add the read-only mode for /pad and /code
8 years ago
42f14873cd
Merge branch 'translations' into newhashmerge
8 years ago
391b7690e6
Set the pad to readonly mode when using a 'view' url
8 years ago
368e253c9f
Ability to send a read-only URL
8 years ago
6363d3fb90
Pad titles are now shared with the userdoc
8 years ago
5c63585952
Complete the French translation
8 years ago
0d9f63b977
Merge branch 'translations' - part one
8 years ago
f086492e50
Improve the localization system
...
Improve and enable the French translation
8 years ago
cc4bca8004
execute callbacks on presentation events
8 years ago
8bf79ef915
serialize slide pads as a sorted object
8 years ago
997b46a3f7
limit the size of rendered images
8 years ago
25c8d16bf5
Use a new version-prefixed hash parser
8 years ago
c35c7cda20
hide wizard after computing results
8 years ago
0dae949c4f
fix scrolljank bug
8 years ago
c736caceba
Use a better default pad title
8 years ago
97415d8158
Merge branch 'users'
8 years ago
122a9fe068
realtime kanban board
8 years ago
4561ddcdf3
add missing semicolon
8 years ago
8031770f90
rename "module" to "APP" in /slide/ for jshint
8 years ago
8e86be81b2
Merge branch 'better-slides'
8 years ago
fb21b4e46b
fix up /render/
8 years ago
4941c1493e
better user integration. a few more common utils
8 years ago
2f2aeef0e5
add missing semicolon
8 years ago
8a659cf887
maintain aspect ratio for slides
...
display index and slide count in title
8 years ago
30ea1b59b7
integrate users into common utilities
8 years ago
6d775f61c6
add missing functions
8 years ago
168338b898
add missing functions
8 years ago
7c5ee53e81
resolve conflict and merge
8 years ago
f47a6f1cbb
Merge branch 'master' of github.com:xwiki-labs/cryptpad
8 years ago
f40b798d88
Merge pull request #30 from xwiki-labs/reconnect
...
Ability to reconnect after a connection failure
8 years ago
c168ce2d1c
Ability to reconnect after a connection failure
8 years ago
e386749e89
unlock the editor after your name has been set (or not)
8 years ago
aa91ebd24e
don't initialize until the store is ready
8 years ago
93f5a3d3e9
use more bits from the users' seed and parse into various subkeys
8 years ago
1bec02239c
coerce dates into strings
8 years ago
0add01a940
remove dead code
8 years ago
dcebb9597f
prototype of password based key derivation
8 years ago
848f16e8f5
unused function which computes values for the table
8 years ago
18ea61dc9a
use diffdom for sanitation and better redraws
8 years ago
c62d064ee9
add a 'share' button which copies the url to the clipboard
8 years ago
b229a18ccf
notify users of changes if the visibility api is supported
8 years ago
d64e06c12e
don't make empty options
8 years ago
a3f6fe8843
lock options by default
...
add edit button for modifying options
fix bug where committing didn't clear the active column
minor style fixes
8 years ago
8c914dfe1f
better filenames
8 years ago
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
8 years ago
269eba3c47
remove commit button if a user is removed
8 years ago
f8f66800d1
display a 'commit' button which locks your column
8 years ago
85540bad12
leave all columns locked unless you've visited before
8 years ago
d679cac666
fewer log statements for the console
8 years ago
55b1a17b0d
off by one error
8 years ago
235c0482f9
increase clickable area around editable columns' checkboxes
8 years ago
c76aaac542
don't make columns with empty names
8 years ago
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
8 years ago
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
8 years ago
e2b162bf6d
snapshot some dead code
8 years ago
55666e9f70
remember presentations, and label them correctly on the home page
8 years ago
5a3da11c40
very simple presentation with markdown
8 years ago
7eaa4ce733
recognize pads with the same type and hash as identical no matter their domain
9 years ago
da6e5d73d0
fix undefined reference
9 years ago
043041523f
on import, fall back to setting language from file extension
9 years ago
deb63d2447
share syntax highlighting selection with peers
9 years ago
2d5caf38d9
show a spinner until the document has loaded
9 years ago
fd0a7337a3
wait a full minute until requirejs times out
9 years ago
975bff5794
show a spinner until the document has loaded
9 years ago
a58f58535b
better regex for pulling titles out of c-like comments
9 years ago
5131f47cca
jshint compliance
9 years ago
306d524416
fix broken removal call
9 years ago
dd3a5d47be
migrate localStorage so people go to cryptpad.fr
9 years ago
a094e3c02e
use correct store api calls in frame.js
...
also don't log unnecessarily
9 years ago
dcc9810a42
avoid extra call to store if there are no keys to remove
9 years ago
9a5294016d
fix incorrect usage of store api
9 years ago
4e5f381325
add spinner to API. update bower deps
9 years ago
01d9923e15
export Cryptpad at window level
9 years ago
fa654a7646
slightly better regex
9 years ago
254d800a3b
add a /p/ route so that we don't break old urls
9 years ago
cd18075ac7
add some redirection logic to support old hash types
9 years ago
600f3151e9
don't use the store until it's ready to be used
9 years ago
fffa9acf15
remove unused files from fs and jshintignore
9 years ago
551d38c930
let the abstraction take care of stringification
9 years ago
9b16d529ca
add one more missing script that caused handlebar highlighting to break
9 years ago
0ada6a3d0a
jshint compliance. gotta keep those tests green
9 years ago
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
9 years ago
7f02c899ea
add snippet for copying text to the clipboard
9 years ago
93142b364f
tests for pretty printed html
9 years ago
4833cf0d7b
add a fontpicker
9 years ago
6cb2f72aa6
pretty print html during export if possible
9 years ago
c09166efe2
scroll down when adding a new option to the table
9 years ago
42eafe9e29
don't create duplicate stylesheets in the document head
9 years ago
fe3f02f5e0
enable text foreground and background colors
9 years ago
68f8d0101d
fix flash of unstyled content
9 years ago
8ea6c03094
notify user on disconnect
...
also disable inputs
9 years ago
efd190beca
export file with correct file extension, if possible
9 years ago
5e71a5473c
add another missing script
9 years ago
992bc4f449
add missing script
9 years ago
2351d8a23e
make tests green again
9 years ago
068a3f5944
remove rows from the poll
9 years ago
c6bdb7506d
forget everything about a pad when you forget it
9 years ago
b8a3a4d188
persist usernames across sessions via localStorage
9 years ago
846d1135b9
set mode in the editor, not just the dropdown
9 years ago
446266a79b
remember the last language used on a particular pad
9 years ago
e84fbf0bc3
more helpers in common
9 years ago
70f8837681
maintain scroll position on remote changes
9 years ago
c267dd6a88
ensure that 'text' is a string
9 years ago
2f2ab4392c
clear the table on user clicks
9 years ago
64f030c344
add a clear table button
9 years ago
d2c5cfe646
add col/row ids to arrays
9 years ago
1a63faf188
infer names from the first comment on code pad
9 years ago
f77e2cec34
set text values of new options
9 years ago
52ab5147c9
add a missing semicolon so tests don't fail
9 years ago
e3f4df7e0a
push my latest changes because I'm agile
9 years ago
cde239c97a
implement row/column removal
9 years ago
9860b7427a
addition signs are slightly informative
9 years ago
ac50bf7286
height and width of the table are unreliable because of multiple users. remove them
9 years ago
a3254a2619
consistent ordering of columns and rows
9 years ago
d30eddf2f2
ui hint for 'adduser' and 'addoption'
9 years ago
a995f2306d
fix undefined variable reference
9 years ago
44fe95c76b
add titles to buttons on pad and code
9 years ago
ebf5c27453
add rename and forget buttons to poll app
9 years ago
f7a1332317
add a 'back' button
9 years ago
7dd1624206
commit polls to localStorage
9 years ago
0cf5f3cc87
realtime polls!
9 years ago
ff74a67a09
translate alertify button messages
9 years ago
d39ab5c250
point to the actual translation file
9 years ago
dea8e225db
fix double scrollbar issue
9 years ago
6f598682f8
templates for custom themes
9 years ago
02cd2fbee0
style fixes for the ansuz theme
9 years ago
c9edf69ed1
one less prototype using messages.js while we figure out internationalization
9 years ago
3eccec7054
better effort for translation
9 years ago
3bdfee71e1
move padrtc to .git
9 years ago
18ce69b756
use constants from toolbar.js, address linter warnings
9 years ago
2a7a84b774
use constants exported from toolbar for selections
...
make things a little less brittle
address linter warnings
9 years ago
cbeaa8d609
major refactoring for toolbar. CAN HAZ LESS
9 years ago
7504f79e05
add log and warn methods to cryptpad common
9 years ago
750731d3db
workaround for favicon magic
9 years ago
3ad5d71ab1
make sure the regular favicon is set
9 years ago
fd3cd73d0b
try to fix favicon bug
9 years ago
589b0087a1
listen for keyup events while alertify prompts are active
9 years ago
a2a8570453
use alertify UI in /pad/
9 years ago
e32c0aaac8
use alertify UI in /code/
9 years ago
deae7ac78f
don't hide the notification until it has been seen
9 years ago
3d3c6e4800
add wrappers for alertifyjs
9 years ago
85702f2706
inform users of changes in /pad/ too
9 years ago
1ae212af44
let users know when changes have occurred while tabs lack focus
9 years ago
6075849ed7
add favicons to /pad/ and /code/
9 years ago
73d2b6561a
add small modules for page visibility api and notification apis
9 years ago
7e8d66a141
filter unwanted elements when receiving patches
9 years ago
d8b467422a
fix default title in localStorage migration
9 years ago
7a5877d12a
don't filter pads after 30 days
9 years ago
d844551fba
add a forget button. clean up toolbar a bit
9 years ago
8a82e11306
make sure title is defined for home page usage
9 years ago
71b1f71ba0
fix migration to include ctime
9 years ago
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
9 years ago
ec0dba3f7c
correct undefined reference
9 years ago
a3da10766a
add rename button to /code/ and /pad/
9 years ago
93dcf29c15
more functions for working with localstorage
9 years ago
93fed83a08
remove annoying border around editor
9 years ago
23788bca67
add 'ansuz' theme because I'm horribly vain
9 years ago
22929fd3f5
add title attributes for dropdown menus
9 years ago
8b1a2b7b8b
commit theme choices to localStorage
9 years ago
fb2ca04c34
add a theme selector
9 years ago
dc8e36bf20
move themes directly into ./code/
9 years ago
908e79c0b9
add autolink plugin
9 years ago
d025d13295
address some jshint complaints
9 years ago
12bbf3e8f6
don't drop values onto the window
9 years ago
ca45e3533d
pass loaded file to callback when importing
9 years ago
5b79775810
infer modes from MIME types
9 years ago
df99395b4d
fix a few more paths that I missed
9 years ago
b3deb9531d
fix paths that I broke when updating codemirror
9 years ago
82a9b05d5f
upgrade to newest codemirror
9 years ago
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
9 years ago
a89511985f
add _really_ basic multilanguage support. I'll come back for css later
9 years ago
31aa09d6f6
work a bit more on import/export and code highlighting
9 years ago
242c9a99e3
implement import and export in /pad/
9 years ago
1526c26f8e
remember code and wysiwyg pads
9 years ago
0a8137e7eb
move rememberPad to cryptpad common and simplify it a bit
9 years ago
849683d586
update to use new style crypto module
9 years ago
f94c06abc0
drop a bunch of stuff and use diff dom and hyperjson
9 years ago
69f3f4c9a8
drop hyperscript dependency
9 years ago
f607fcc0ad
test using newest hyperjson. forget hyperscript
9 years ago
c3d2568d3c
add file export for codepad
...
addresses #24
9 years ago
920dbeabd1
add a save button
9 years ago
4cc5388c76
trial run of canvas export via filesaver.js
9 years ago
f818d873bb
remove usernames, refactor a wee bit
9 years ago
2b8c21d292
set styles with setAttribute. fixes style fights
9 years ago
36baf498ce
fix magicline filter and strange interaction with cursor
9 years ago
303e8d6c3e
remove debugging line
9 years ago
8af49698da
add a class to the magicline markup so it's easier to remove
9 years ago
48d222e565
depend on listmap api from bower
9 years ago
1746a4e732
use crypto from bower
9 years ago
2a3ff256b9
remove libraries which are now in bower
9 years ago
f72cb24fc5
rm LORIA
9 years ago
2c3de49922
remove realtime-input, since it's in bower now
9 years ago
beba78d7f8
update prototype dependencies
9 years ago
2798d1b1f9
all of the list/map api's dependencies are now on bower
9 years ago
58c968b319
minor cleanup in realtime-input
9 years ago
288b4d5b66
depend on main passing in the crypto module for now
9 years ago
f76dc615c0
use chainpad-crypto from bower and pass it into the listmap api
9 years ago
85dbd5cb6e
pass in websocketURL from main
9 years ago
d9a4f2f22c
missed one
9 years ago
cf2866baa7
use json-ot from bower for tests
9 years ago
5bb77bd50c
add UI.add and UI.remove methods.
...
also use json-ot from bower
9 years ago
ff0f7d15dc
use json-ot from bower
9 years ago
dccf5e8dcf
use listmap api from common/
9 years ago
58633af943
listmap can be reused. put it in common/
9 years ago
f80e9772a8
merge api.js and deep-proxy.js into one file
9 years ago
dbf1e2b870
support reusing the netflux network
...
export more internals from realtime input
9 years ago
6f7543e9cc
demonstrate chaining of 'on' directives
9 years ago
e44446f71e
proper recursive proxy initialization
9 years ago
68cec2348a
don't prompt the user with a crypto hash for their name
9 years ago
83696495a8
use chainpad from bower, not local
9 years ago
2b9ac14cb1
restructure main to take advantage of new callback infrastructure
9 years ago
fea74782a2
remove a little more dead code that I missed
9 years ago
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
9 years ago
4222c0b516
simplify api
...
* refactor conditional with DeepProxy helpers
* don't call 'onRemote' until fully initialized
* use disconnect, ready, and create handlers on proxy object
9 years ago
954ee26f4d
fix undefined disconnect reason
9 years ago
a0ec5eada8
better fix for magicline filter
9 years ago
9336c4de5c
import latest chainpad
9 years ago
d0b553d198
port Yann's multiple-select implementation to cryptpad
9 years ago
e3b8a10959
fix magicline filter
9 years ago
058548b95a
revert my reversion
...
Revert "Revert "Added checkpoints with the new code from ChainPad""
This reverts commit 6e2e8bf21f
9 years ago
6e2e8bf21f
Revert "Added checkpoints with the new code from ChainPad"
...
This reverts commit da2bfe2de9
9 years ago
599f5aeec8
add sample listeners for debugging
9 years ago
3afd144562
don't make noise when adding a listener
9 years ago
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)
9 years ago
ce99bd9ba3
Merge branch 'two' of github.com:xwiki-labs/cryptpad into two
9 years ago
7c63219add
fix some minor bugs
9 years ago
a0c73c95d8
do away with a bit of boilerplate
9 years ago
e189092ba8
document/spec the listmap api in its current/intended form
9 years ago
55846044e1
rewrite underlying API. implement listeners
9 years ago
da2bfe2de9
Added checkpoints with the new code from ChainPad
9 years ago
014dce272b
working on better abstractions. still held together with duct tape
9 years ago
c1bca09cce
move list/map functionality into wrapper file
9 years ago
f61d06fa18
first commit for listmap prototype
9 years ago
774d349ec3
ignore hidden elements and submit buttons
9 years ago
cf85de6113
remove old bencoding code
9 years ago
d99bb8ff84
WIP : fallback to old parsing doesn't work
9 years ago
f04be53d11
fall back to old parsing if the message is bencoded?
9 years ago
976a08cc7a
move to chainpad version 2
9 years ago
297d8c2d44
reformat code for jshint compliance
9 years ago
baf523e9a5
add new functionality from xwiki development
9 years ago
0c89443c1b
fix typo
9 years ago
39fcd7dc4c
more specific filtering for magicline plugin
...
to avoid false positives for other things which are non-contenteditable spans
9 years ago
cae750cd75
update padrtc for to use bower libraries
9 years ago
ad3c53c344
use textpatcher from bower for all pads
9 years ago
0cd4f85ff0
remove migration notes
9 years ago
a7cbd8c470
we're pushing json over the wire, so let's use json-ot.validate
9 years ago
3ea270acb9
fix cursors in form prototype
9 years ago
d2c8fbf1f8
use hyperjson.amd.js, not hyperjson.js
9 years ago
663c157e2a
expose text patcher to the window via APP
9 years ago
1769ca16dc
add example for configuring the logLevel in /pad/
9 years ago
7faf57602b
implement log level settings from application layer
9 years ago
523aff3067
use upstream chainpad.js
9 years ago
dcd130cd9d
use hyperjson from bower in padrtc
9 years ago
c752e4a6e5
remove sharejs
9 years ago
6b2e986789
remove deprecated textsocket library
9 years ago
d2fa5e8f70
start using hyperjson from bower.io
9 years ago
150ebaba7b
add ability to force text diffing
9 years ago
aef6f3a85b
lock codemirror editor until chain has synced
9 years ago
6736335db2
add 'made with <3' toolbar to code
9 years ago
506a703b7d
turn off TextPatcher logging on /pad/
9 years ago
ba17b78f7a
restyle name change button
9 years ago
d79b3616c9
remove unused files
9 years ago
4c84758265
disable textpatcher logging
9 years ago
46b009d20f
remove last non-netflux pad
9 years ago
18e0131d6e
Merge branch 'migrate' of github.com:xwiki-labs/cryptpad into beta
9 years ago
32d1807350
import unused functions from /p/, to be integrated later
9 years ago
492054a938
Fix the cursor position when a remote patch is applied
9 years ago
626ecaffcd
log browser fights in /pad/
9 years ago
5bb2e12db2
Merge branch 'beta' into migrate
9 years ago
afe78dad56
Merge branch 'netflux' into beta
9 years ago
cc51e6d6ed
Update CodeMirror pad to work with Netflux
9 years ago
a735d63306
migrate markdown rendering 'pad' to netflux
9 years ago
f5f8f6e1eb
Remove the delay between a change and its propagation to chainpad
9 years ago
fa6914037c
start rewriting codepad to use realtime-input
9 years ago
2852c8f594
Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into beta
9 years ago
fe3bb4da27
Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into netflux
9 years ago
53b2644b64
Fix a issue with fights over usernames
9 years ago
3b6fe44378
Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta
9 years ago
255dc17a5d
Merge branch 'beta' into netflux
9 years ago
f9de1c9e1f
Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta
9 years ago
c14b86d84a
add missing semicolon
9 years ago
b3ef2abb84
fix jshint complain
9 years ago
85d5f5c47f
Convert netflux to es5
9 years ago
c0b8aac792
Fix an issue where metadata could be duplicated in the realtime userdoc
9 years ago
22cf18f78c
Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta
9 years ago
c509c28c18
realtime form prototype, almost in good condition
9 years ago
1a9e7299fc
working state
9 years ago
69e8f54e8f
pass in Crypto to realtime-input
9 years ago
5f16ad4a58
Update to most recent chainpad
9 years ago
aa07dd31ee
have json-ot initialize its own debug module, instead of relying on a window variable's existence
9 years ago
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
9 years ago
8ac69ca262
Add a missing "time" property in the netflux client causing incorrect
...
timeout errors
9 years ago
be1ef7abe3
migrate canvas to netflux
9 years ago
d4943511fe
move text/ and hack/ to Netflux
9 years ago
4c95602347
remove a little bit more dead code
9 years ago
b140b6429d
remove a little bit of dead code
9 years ago
2c6cf9883b
stop using deleted file
9 years ago
bbdc9da853
delete duplicated file
9 years ago
cce50390a0
don't depend on library to set hash
9 years ago
5f4825f3a0
don't change the hash from realtime input
...
let applications handle that logic
9 years ago
80fb5e1e21
don't rely on RealtimeSocket exporting textPatcher
9 years ago
4f426651ad
remove TextPatcher from RealtimeTextSocket
9 years ago
a527024a8c
start on realtime form prototype
9 years ago
02ff1a63a4
Merge branch 'netflux' into beta
...
Conflicts:
www/assert/main.js
9 years ago
04f6299938
reconcile differences with netflux
9 years ago
565fb1d186
include small snippets for preventing browser fights
9 years ago
ffbd428b87
better logging of browser fights
9 years ago
4d44661f3b
more correct tests
9 years ago
a18c793f98
use latest hyperjson
9 years ago
980ff8a0ca
Fix a test that was failing on chrome
...
it failed for reasons which are irrelevant to our application
9 years ago
9efcc443cd
add 'format' to TextPatcher's API
9 years ago
0769e50414
move TextPatcher to highest application layer
9 years ago
1d70335228
provide all callbacks before starting
9 years ago
9498937b43
add a FIXME to the assert page
...
tests were failing (unnecessarily) on Chrome
9 years ago
a3787ee4dc
Merge branch 'netflux' into beta
9 years ago
06b464c524
move sheet/ to .git
9 years ago
cdf02ac725
remove input pad
9 years ago
11961b4f1d
export stringifyDOM to REALTIME_MODULE
9 years ago
5db487db3f
remove old pad entirely
...
hyperjson version is considered a strict improvement
9 years ago
010566d3c3
pushDelta was mistakenly deprecated. restored.
9 years ago
1639c5b099
use hyperscript and hyperjson from common
9 years ago
3598c93098
move new hyperjson into common
9 years ago
103bb69daa
move custom hyperscript into common
9 years ago
e357549eda
push browser fights into an array for inspection
9 years ago
b83fb7b823
improve brFix logic
...
stop exporting functions which we wish to deprecate
9 years ago
1c7954ed51
Grab Fabric off of the window
9 years ago
06786b6e02
Remove redundant declaration
9 years ago
df22c246c4
serialize text nodes correctly
9 years ago
7ca5f47d02
remove multitest pad since it offers no significant benefit
9 years ago
bafdd588dd
fix /hack/ to not require sharejs textarea
9 years ago
f2db6b83eb
better sizing for palette options
9 years ago
5ce158d2e2
add more colors
9 years ago
7c4b334ad3
here's a canvas app!
9 years ago
41276fffb5
repair /text/ application, conform to new API
9 years ago
cb979844f6
implement text patching at application layer
9 years ago
4a41575e6d
accept onLocal in config
9 years ago
d3c2c901b6
implement cursor transformation in a common library
9 years ago
92d89f6cac
start to factor sharejs into two modules
9 years ago
13dc77b7f6
remove commented line
9 years ago
41e635b2e5
realtime-input.js : turn on logging
9 years ago
69e8e18283
Remove the pipe character in the hash
9 years ago
d62e9fc1c9
add a missing semicolon
9 years ago
4095201d15
Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into integrate
9 years ago
c32045d7d0
Fix an issue with missing characters when several users were typing at the same time
9 years ago
822b2bd2b9
Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into integrate
9 years ago
be09a1808d
Remove old code from realtime-input
9 years ago
5a5b9ad718
Merge branch 'netflux' into beta
9 years ago
4af987a2a2
point to correct toolbar.js
9 years ago
3ade46adc7
Merge branch 'newtests' into beta
9 years ago
6884b0890a
Fix the typong tests not working properly
9 years ago
b12a01e08f
report test results on the page, not in the console
9 years ago
feaae609ad
fix broken path for padrtc
9 years ago
ecc41d14af
Use canonical serializer for json serialization
9 years ago
fc77ef66b3
Merge remote-tracking branch 'origin/sortify' into HEAD
...
utilize canonical stringify function
Conflicts:
www/_socket/main.js
9 years ago
319f5b95f7
Use canonical serializer for json serialization
9 years ago
9683fd9aec
Always serialize the DOM in one way.
9 years ago
698338b49a
Use canonical serializer for json serialization
9 years ago
e207d8b579
Merge branch 'diffdom' into netflux
9 years ago
468827dadd
newest tests
9 years ago
c867ab04ab
rename /_socket/ app to /p/
9 years ago
a1fe941f69
Always serialize the DOM in one way.
9 years ago
f4c5b2a996
Add sane defaults to TextPatcher diffs
9 years ago
259772dd62
Turn on TextPatcher logging for _socket
9 years ago
0537c28919
Add switchable logging to TextPatcher.js
9 years ago
8a36963582
Enable ChainPad PARANOIA mode but remove the part which causes most slowness
9 years ago
284da6a4e9
minor improvements I made to the /hack/ pad last night
9 years ago
9f0cc4ed64
update hack with a slightly better UI
9 years ago
71c0a06c3b
Merge branch 'hack' into diffdom
9 years ago
19cd991dba
trim dead code, comment, very minor optimizations
9 years ago
f75c246029
remove dead code from pad/main.js
9 years ago
9f45ccb2d9
use console.error for stack traces
9 years ago
d705b947ab
Merge branch 'diffdom' into netflux
...
basic cleanup while performing a larger merge between two prototypes
9 years ago
2ffa69dc15
remove checks for a non-existent race condition
9 years ago
368d72b337
add missing semicolons to TextPatcher.js
9 years ago
851ccfbdb6
detect falsey operations in OT and ignore them
9 years ago
400f6efde1
json-ot.js : jshint compliance
9 years ago
a0999d1d2b
add a comment about why hashes are being stubbed
9 years ago
ca94d30386
detect falsey operations in OT and ignore them
9 years ago
9f9cd8d8cd
realtime-input.js : fixes for jshint compliance
9 years ago
793149a608
json-ot.js : jshint compliance
9 years ago
06a3b63923
jshint compliance for toolbar.js
9 years ago
3b8238ef3b
add missing semicolons to pad/main.js
...
jshint compliance
9 years ago
5cead3fad3
add missing semicolons to TextPatcher.js
9 years ago
e6ab03164c
import TypingTests.js and expose at the console
...
RTWYSIWYG-54
> implement tests for components of the WYSIWYG editor
9 years ago
94e57e4a26
update location of text-patcher.js
9 years ago
b37dab1f49
Merge branch 'diffdom' into netflux
...
Simple cleanup and unit tests
9 years ago
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
9 years ago
6bb37aed44
main.js : support tab insertion in /hack/ pad
9 years ago
6b9d982d40
stabilize _socket/realtime-input.js
...
...as common/RealtimeTextSocket.js
9 years ago
1a22592afa
remove unused modules from realtime-input.js
9 years ago
39071021eb
stabilize typingTest.js as /common/TypingTests.js
9 years ago
9805958ad7
stabilize text-patcher.js into /common/TextPatcher.js
9 years ago
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.
9 years ago
7782069dbd
Merge pull request #15 from xwiki-labs/diffdom
...
merge diffdom into netflux
9 years ago
a1f9b10175
remove offending line from chainpad entirely
...
RTCHAINPAD-3
9 years ago
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.
9 years ago
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
9 years ago
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/
9 years ago
360fee9feb
Fix a new cursor error with Codepad
9 years ago
c2e0dded3a
Fix an issue with the cursor sometimes disappearing when a patch was received
...
Update CodeMirror to the latest version (5.13.2)
9 years ago
713c90242b
Hide the usernames when they have not been changed
9 years ago
c53baab99d
Update Codepad with the latest improvements
9 years ago
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
9 years ago
cd357a9136
turn an alert into a console.error
9 years ago
ec64e0d381
use getAttribute to inspect document elements
...
el.getAttribute('attr') is more reliable than el[attr].
9 years ago
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
9 years ago
842b9d4243
Generalize _socket/realtime-input.js a little more
...
Anything JSON related should be at the application layer
9 years ago
cf9f60bd57
The server don't send back anymore messages to their sender
9 years ago
eb4ea7a6b0
Remove the content from the ACK messages sent by the server
9 years ago
ba4faea939
Update the pads to run with the latest improvements to the websocket server
9 years ago
5ef7e29a9b
Add the latest changes from _socket into the netflux pad
9 years ago
b59a14c5ac
merge hyperjson changes from realtime xwiki
...
more resilient class serialization.
comments
9 years ago
2691d85582
use forked chainpad with assertions for _socket
9 years ago
b41f0e8c50
Merge branch 'cjd-fixed-it-with-hax' into netflux2
9 years ago
c50690349b
comments describing the role of each argument
9 years ago
df78d284c4
initial state should be valid JSON so JSON parse doesn't fail
9 years ago
96e03fcfa4
Use latest chainpad without mutations
9 years ago
d5772c6315
when json-ot produces json that fails to parse...
...
export the relevant data to a window variable so we can inspect it better
9 years ago
aaf7c777cc
add debugging info to the textPatcher
...
* kill dead code
* add assertions
* better logging for insertions and removals
9 years ago
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.
9 years ago
e446a3645c
don't send funny BR attributes over the wire. Properly initialize the typing test
9 years ago
22290590cb
don't rely on window scope in typingTest.js
9 years ago
772ca5d30e
comment out debugging line
9 years ago
6c340a6527
chainpad testing = true, reject non-compliant messages
9 years ago
afa1104d85
Pull the cursor out of bogus BR tarpits when it gets stuck
9 years ago
bac0e0ff88
implement hyperjson filtering
9 years ago
e51635c4bb
fix index error
9 years ago
3aebf7d2c2
minor changes to pass linting
9 years ago
29e24f556c
kill another window variable
9 years ago
e699073d45
attempt to preserve the magic line plugin while someone else is typing
9 years ago
941f5361ea
forgot to add 'typingTest', which main depends on
9 years ago
d852c578d8
removed dead code
9 years ago
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
9 years ago
478ccbf984
revert changes to chainpad
9 years ago
e3b78e20de
Merge branch 'cjd-fixed-it-with-hax' of github.com:xwiki-labs/cryptpad into cjd-fixed-it-with-hax
9 years ago
e26246178f
start to clean up and give things more sensible names.
...
get rid of the textarea entirely
9 years ago
b372b0b77c
small change to chainpad in order to make it more likely to fail if the authDoc goes into the wrong state
9 years ago
f3fb674504
Merge branch 'cjd-fixed-it-with-hax' of github.com:xwiki-labs/cryptpad into cjd-fixed-it-with-hax
9 years ago
98c85cef8b
xxx
9 years ago
12dcbc9121
fix quick red fox and make test.cancel work again
9 years ago
62eabbc7ae
If a message does not match parent hash, don't delete it from storage
9 years ago
dbf31798d5
json-ot triggering PARANOIA errors in ChainPad
9 years ago
03932d0169
small changes to chainpad for testing
9 years ago
669bcc1935
If there is a difference in the hjson then send a message back
9 years ago
f62ec85a4c
Shuffled around some assertions and logs
9 years ago
420a7098a6
more testing and crap
9 years ago
4b35a145e3
Push WIP
9 years ago
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.
9 years ago
e066730b68
add notes about how hyperjson is to be used
9 years ago
cd462ed872
Merge legacy websocket version
9 years ago
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
9 years ago
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.
9 years ago
475ca9bea8
hyperjson.js : used split instead of filter... oops
9 years ago
1bd5cb9e27
hyperjson.js : used split instead of filter... oops
9 years ago
b2753ef7b7
fix string manipulation off-by-one
9 years ago
f98fda7604
fix string manipulation off-by-one
9 years ago
4f3fcb08a4
better error reporting when the operational transform fails to parse JSON
9 years ago
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.
9 years ago
fbe6225681
Don't attempt to use the cursor selection when it has length 0
...
RTWYSIWYG-20
RTWYSIWYG-24
9 years ago
0c6222b5f9
better error reporting when the operational transform fails to parse JSON
9 years ago
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.
9 years ago
bd24821c6c
Don't attempt to use the cursor selection when it has length 0
...
RTWYSIWYG-20
RTWYSIWYG-24
9 years ago
de6db0285c
Limit the size of the usernames to 32 chars
9 years ago
38d797a4f1
Fix issue with Chrome and WebRTC
9 years ago
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
9 years ago
e77d85bc82
Trigger an onReady() method when the user's pad is fully synced (the history is loaded)
9 years ago
eca4ec699c
Ability to change the username (the user ID is displayed by default)
9 years ago
6e50ae94dd
Remove unused code
9 years ago
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
9 years ago
3a188625e0
Improve the detection of a disconnected peer to update the user list with the WebRTC service
9 years ago
77e7fb5724
Fix an issue with the WebRTC service where it was impossible to join a channel once someone had left this channel
9 years ago
06e5c84702
Clean some code
9 years ago
29033f344c
Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into netflux
9 years ago
b1e8bcddef
Fix the user list not working with the WebRTC service and causing major issues
9 years ago
c576241104
Add a Chainpad adapter to make Chainpad know the userList
9 years ago
fb0e82931d
correct malformed json
9 years ago
ae8f6f7f2c
Ability to choose which protocol to use (Websocket or WebRTC) with Netflux
9 years ago
3a7af63c54
correct malformed json
9 years ago
b7885eb539
Fix channel history
9 years ago
136e2d8cf2
pass in missing textarea argument so textpad starts working again
9 years ago
8258018c1d
Revert "fix undefined reference"
...
This reverts commit 7d65540123
9 years ago
c67451bc1a
Revert "remove broken functions from convert module"
...
Because I forgot that the /render/ page was still using vdom
This reverts commit 93fb944e1f
9 years ago
c536ecbc1c
Temp commit
9 years ago
870b2dbb7e
Add the WebRTC server in Cryptpad
9 years ago
c4f62fb812
First try with WebRTC
9 years ago
09a06a8bc5
Replace the chainpad server by the netflux server
9 years ago
60c3aceb0d
Add chatflux server
9 years ago
deb2084fc5
Add the socket connection checker
9 years ago
d3e2a2f52e
make verbose logging switchable via a conditional
9 years ago
1c54af69a1
update minor editors to use new realtime-input api
9 years ago
9b228eea6b
modify vdom main.js to adhere to new realtime-input api
9 years ago
fefb904261
realtime input changes
9 years ago
fd99dba4a3
modify realtime-input api to take a single object as configuration. merge netflux API
9 years ago
62ba579d4a
Add Netflux API with WebSocket service V1
9 years ago
53d3e475f7
ui hints for hackpad
9 years ago
d2f4fbcee9
fail the toolbar from the application layer
9 years ago
d7b34cf6be
don't call toolbar from within realtime-input.js
9 years ago
e8469ae1bb
test out extended realtime-input api
9 years ago
5e1566eaec
fix incomplete 'onAbort' block
9 years ago
52fe892bae
invert logical relationship with flag
...
otherwise updates don't actually propogate
9 years ago
938df2b92f
lock the editor until the chain has synced
...
add 'onAbort' hook. lock the editor if the connection fails.
9 years ago
1d6ccc99a1
add 'onAbort' hook to realtime-input.js
9 years ago
e5bef52850
reintroduce the toolbar
9 years ago
6ff5b10486
remove local diffDOM version
9 years ago
93fb944e1f
remove broken functions from convert module
9 years ago
7d65540123
fix undefined reference
9 years ago
c246adc57b
Lock contenteditable until chain is done syncing.
...
Don't bother patching the dom until the chain has synced
9 years ago
1c0074258c
go back to using diffDOM from bower
...
The latest version is required. You'll need to update.
9 years ago
79bd82a62e
main.js : integrate with patched diffDOM
9 years ago
6884fabda9
Use local diffDOM instead of bower_components
...
At least until the PR gets accepted
9 years ago
f5a8727254
remove some unused functions from cursor.js
9 years ago
db1515c445
cursor.js : commit before cleaning up
9 years ago
7e367e770e
resize vdom debug panel to 30% width
9 years ago
91ada5ce7a
export Operation from chainpad. for use with OT
9 years ago
5425699f43
check if possible parent exists before checking if it contains another element
9 years ago
67bdb8a65a
fix a bad regex that occasionally threw an error
...
'nothing to repeat'
9 years ago
e87a4599a4
main.js : tiny patch until things are working correctly.
9 years ago
9ce59c985f
only do stuff with the cursor when a remote edit takes place
9 years ago
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
9 years ago
de46be85ba
add better helpers for finding and resetting the cursor
9 years ago
7e7f1fee76
include abstracted json-ot, add comments, start to use cursor stuff
9 years ago
c09036bd29
snapshot cursor.js, as some things are working quite well now
9 years ago
4eee1f5210
add orderOfNodes function to tree library
9 years ago
7689151fc0
pull json validation for OT into its own module for reuse
9 years ago
fbb9163e42
main.js : clean up and commit before making big-ish changes for cursor fixing
9 years ago
2c8a2406c6
cursor.js : snapshot before code deletion
9 years ago
1beb3f5355
snapshot of treesome.js before deletion
9 years ago
8ead5ca129
realtime-input.js : add notes regarding integration of the netflux api
9 years ago
3cb94b8d80
jshint compliance
9 years ago
d1885fbab6
better jshint compliance for common files
9 years ago
539cc3a2fa
remove unused files from common directory
9 years ago
afa2811472
remove local version of marked.js, prefer bower version
9 years ago
587f95b6d7
don't overflow
9 years ago
a01331cb9a
hide styling textarea no matter what
9 years ago
a600ece5c5
fix jshint complaints in common directory
9 years ago
4a05a859e6
fix initialization routines
9 years ago
f1915d3b7c
fix jshint complaints in pad directory
9 years ago
fe3917c0f1
fix jshint complaints in codemirror directory
9 years ago
2c5a2b6023
remove unused code, add todos, fix minor errors
9 years ago
c5ab5dfe26
realtime style editor with lorum ipsum
9 years ago
967d636df9
address more jshint complaints
9 years ago
f6c848385f
hyperjson.js : jshint complains about var index in for loop
9 years ago
0fbbb51f7f
drop this useless line
9 years ago
d1dd497457
html-patcher.js : add missing semicolon
9 years ago
62ea172ff4
errorbox.js : add missing semicolon so jshint doesn't complain
9 years ago
3b5c932252
jshint ignore eval line
9 years ago
7f92abc7bf
Merge branch 'diffdom' of github.com:xwiki-labs/cryptpad into demoEffect
9 years ago
a7da21ccba
Remove the cursor treatment
9 years ago
86c4a69a97
Switch to patching with DiffDOM for testing :D
9 years ago
653ba33b65
Merge branch 'vdom' of github.com:xwiki-labs/cryptpad into demoEffect
9 years ago
2031191261
testing=false
9 years ago
37db31b09e
Attempt an operational transformation and if the result is not valid JSON then fail
9 years ago
e16299b5c4
Revert "restub OT until it's verified"
...
This reverts commit 350c9e6c76
9 years ago
c22269e36e
cursor.js : make the console a little less noisy
9 years ago
350c9e6c76
restub OT until it's verified
9 years ago
99a23154b7
files for unstubbing OT
9 years ago
c740c0ec92
add stuff for walking the tree
9 years ago
ad184b1114
add stuff to recover the cursor
9 years ago
1aea11bb30
describe all the prototypes which are available
9 years ago
9b13fd8f34
pull cursor correction code out of main.js
...
put it in cursor.js
9 years ago
3b0ac3af4c
More sensible styles
...
respond to viewport size
don't use gigantic font
9 years ago
b43674eb53
switch back to two-panel layout
9 years ago
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
9 years ago
019750bea8
realtime-input.js : callback onInit if exists
9 years ago
61fbf81dcd
factor out rainbow stuff into rainbow.js
9 years ago
7102a0a164
make rainbows
9 years ago
aa3880f442
up to date
9 years ago
d2f6c63d8a
realtime-input.js : changed the api and left an undefined reference. fixed
9 years ago
150c9a300d
scale viewport so mobile is readable
9 years ago
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.
9 years ago
e43b9715e8
remove /md/ prototype
...
use /text/ and /render/ instead.
9 years ago
64cc177a60
remove vmd directory
...
it was only a prototype, and only contained code which was no longer useful
9 years ago
e220113e98
fix the 'crapstorm' bug
9 years ago
ed03a48092
minor patches that make things a bit more reliable, still some bugs
9 years ago
ac0f7852fc
committing latest changes for review
9 years ago
2016550e01
virtual-dom.js : identify problem area?
9 years ago
08fb010627
give 'onChange' a name
9 years ago
b52327be49
restyle /text/ page
9 years ago
266e5eccce
change styles for rendered page
9 years ago
2adfeaaaaa
test having multiple textareas in one page
9 years ago
3cffdc982f
remove unused functions from render/main.js
...
better comments
9 years ago
317abf36f3
make rendered images sort of responsive
9 years ago
388c6de64a
minor style tweaks for /render/
9 years ago
ec172b6d21
rendered html should be scrollable
9 years ago
a484b920e3
disallow resizing of textarea
9 years ago
d9d4abb9a5
don't let the textarea overflow the body
9 years ago
dcbbeea734
solarized dark color scheme in /text/
9 years ago
c2eb29b75e
fix typo
9 years ago
fd1e5d5735
better styling on render page
...
now solarized dark
9 years ago
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.
9 years ago
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.
9 years ago
13f5371199
remove duplicated files
9 years ago
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.
9 years ago
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
9 years ago
1f7f90165f
Slap marked.js onto a textarea
...
Multiple people can now edit markdown and see the results in realtime.
9 years ago
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.
9 years ago
50121c8ab6
a really basic collaborative input
...
type="text" is typically slower than the same code
when used to sync a textarea.
WATCH OUT!
9 years ago
b18dfef656
sharejs textarea is used by realtime-input.js
9 years ago
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
9 years ago
40b8c0efe8
drop in chjj's marked.js for a cool demo
9 years ago
2d8ffdf31c
Merge branch 'master' of github.com:ansuz/cryptpad
9 years ago
0c2e057f9d
export component APIs from convert
9 years ago
b958caebdd
dom, vdom, hyperjson, and an api which provides a matrix of conversions
9 years ago
4cf2a8a0bd
rtwiki.js : catch some typeErrors
9 years ago
84c0ea6d26
refactor: pass in ifrw.CodeMirror into andThen()
9 years ago
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.
9 years ago
2ed9f0867a
Merge branch 'master' of github.com:xwiki-labs/cryptpad into codepad
9 years ago
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.
9 years ago
ff52f050e5
chainpad.js : pull in upstream changes to chainpad.js. new APIs
9 years ago
9fc44cdf0c
add notes to clientside js files
9 years ago
af80bed07b
XWR-190: Make CryptPad version with rtwiki/CodeMirror
9 years ago
9626dfc365
XWR-190: Make CryptPad version with rtwiki/CodeMirror
9 years ago
9a932a3f56
Patch Realtime into CodeMirror in CryptPad
9 years ago
32f44161a7
Patch Realtime into CodeMirror in CryptPad
9 years ago
88fb6772e8
Cleaned up the front page and added a little piece of code to show recent pads
10 years ago
51544db9a2
Completed adding of customization system and bottom infobar
10 years ago
84164123b6
not quite finished
10 years ago
0e44b10aeb
Seperated common crypto operations to common file and made common toolbar used for both pad and spreadsheet
10 years ago
e039e90a24
upgrade to most recent chainpad
10 years ago
c13bfe978a
Switched cryptpad to use common/toolbar.js which is shared with cryptsheet
10 years ago
50c10f818e
Added cryptsheet to cryptpad suite!
10 years ago
4a63ba7df3
Give cryptpad a proper main page
10 years ago
652a1da7a4
oops changed some work in the js file
...
Revert "change logo"
This reverts commit 9325100a02
10 years ago
9325100a02
change logo
10 years ago
3330fae47e
typo
10 years ago
8fc732d879
remove the 'magic line' because it causes problems with the realtime
10 years ago
0d3ded68a0
use a websocket which automatically reconnects if the connection is lost
10 years ago
e3a54c11ee
remove some code which may be over-engineering
10 years ago
2a1f3f9027
show a little spinner which spins when loading and when people type
10 years ago
87aa1aaf91
don't start measuring lag until after syncing and update readme
10 years ago
6d68bb0bde
error when opening error message window D:
10 years ago
6cbdcdec65
Show users editing and lag, properly send message to indicate that all users have left channel and show basic error box if disconnected.
10 years ago
5ae599fa07
support different ports for websocket and http
10 years ago
a6b88e276c
use the slower version of applyHTMLOp
10 years ago
b6523adb1f
rand fixed
10 years ago
1508c7ba71
and so it begins
10 years ago
ansuz