MTRNord
|
7e686a065e
|
Merge remote-tracking branch 'origin/fix-#254' into fix-#254
|
6 years ago |
|
MTRNord
|
57ed2636ac
|
jkanban.js fix whitespace changes
|
6 years ago |
|
yflory
|
1b2f47c0c0
|
Try a new status indicator in messaging
|
6 years ago |
|
yflory
|
1cd1542d19
|
Update messaging info displayed before entering a room
|
6 years ago |
|
yflory
|
10823fc124
|
Add toolbar notification when the messenger is closed
|
6 years ago |
|
yflory
|
5276dc0bf6
|
lint compliance
|
6 years ago |
|
yflory
|
621fc9a897
|
Ability to disable messenger at a global level
|
6 years ago |
|
yflory
|
c38eb6588e
|
Fix small issues with the messenger
|
6 years ago |
|
yflory
|
8b05b1acaf
|
Fix scrolling issue in pad when the userlist or the messenger was too big
|
6 years ago |
|
yflory
|
42ffe0ee30
|
Fix initial history rules
|
6 years ago |
|
yflory
|
6c6ce7b7a8
|
Fix messenger bugs
|
6 years ago |
|
yflory
|
19da04664a
|
other typo
|
6 years ago |
|
yflory
|
b62aa9224e
|
Fix typo
|
6 years ago |
|
yflory
|
ac989a1e73
|
lint compliance
|
6 years ago |
|
yflory
|
f3c36bfd57
|
Improve messenger initial history
|
6 years ago |
|
yflory
|
26055e5e55
|
Messenger messages UI
|
6 years ago |
|
yflory
|
40c7cdd7c8
|
Fix an issue with messenger while opening the same tab twice
|
6 years ago |
|
yflory
|
216c94b1f0
|
Fix messenger notifications
|
6 years ago |
|
yflory
|
382690e5c8
|
Don't open other pads' chat in the current pad's messenger
|
6 years ago |
|
yflory
|
3acf202830
|
Test UI
|
6 years ago |
|
yflory
|
56c30fc02e
|
lint compliance
|
6 years ago |
|
yflory
|
8f6d0b1c3a
|
Merge branch 'staging' into chat
|
6 years ago |
|
yflory
|
9eb4e2e0dc
|
Reorder the chat rooms in the list based on the time of the last message
|
6 years ago |
|
yflory
|
cdce69e677
|
Improve messenger UI in apps
|
6 years ago |
|
yflory
|
d4dd58e7df
|
Add a pad room when the messenger is active in a pad
|
6 years ago |
|
yflory
|
9e27f111cb
|
lint compliance
|
6 years ago |
|
yflory
|
e6743887fc
|
Refactor contacts/messenger so that it is usable directly in the apps
|
6 years ago |
|
ansuz
|
0e70961074
|
password-protected shared folders aren't urgent. dropping the XXX
|
6 years ago |
|
yflory
|
5b6aa4ba0a
|
Reorder autostore options in Settings
|
6 years ago |
|
yflory
|
2f3576f90e
|
Fix image preview not resized correctly in the mediatag dialog
|
6 years ago |
|
yflory
|
ab07554d0b
|
Fix initial size of the image preview in the mediatag dialog
|
6 years ago |
|
yflory
|
525703e7d8
|
Fix autostore popup displayed for dropped files
|
6 years ago |
|
yflory
|
ee1027ceb9
|
Ability to import mediatags to the drive
|
6 years ago |
|
yflory
|
2bb7e68792
|
Remember previous values in the file upload modal
|
6 years ago |
|
yflory
|
475301477f
|
Progress bar for loading a pad (framework only)
|
6 years ago |
|
yflory
|
264f7dc6a1
|
Move base64 migration prompt to corner and only when the pad is stored
|
6 years ago |
|
yflory
|
7b06626581
|
Merge branch 'autostore' into staging
|
6 years ago |
|
yflory
|
90c96bfb70
|
Prompt users to migrate base64 images to mediatags in the pad app
|
6 years ago |
|
yflory
|
b1f2d287b4
|
Add warning for chrome 68 users on Mac
|
6 years ago |
|
Marcel
|
886451393e
|
Merge branch 'master' into fix-#254
|
6 years ago |
|
yflory
|
256b7b5bb4
|
Phantom viewers potential fix
|
6 years ago |
|
yflory
|
0e1c525c30
|
Fix an issue with new shared folder added to drive from another session
|
6 years ago |
|
yflory
|
d201e9a0cd
|
Disable some toolbar features not available if the pad is not stored
|
6 years ago |
|
yflory
|
9ebb598467
|
Make automatic pad storage configurable
|
6 years ago |
|
yflory
|
e8a5244362
|
Autostore base
|
6 years ago |
|
yflory
|
5cd3cdc208
|
Don't handle drop events in the blockbase64 plugin
|
6 years ago |
|
yflory
|
3f89dd9908
|
Disable pasting base64 images in ckeditor
|
6 years ago |
|
yflory
|
aa2a01174f
|
lint compliance
|
6 years ago |
|
yflory
|
a117e329dc
|
Add a Share entry in the drive's context menu
|
6 years ago |
|
yflory
|
e0b7f3f965
|
When importing a shared folder to the drive, open this folder directly
|
6 years ago |
|
yflory
|
630a2dab78
|
Fix context menu issues with shared folders in the tree
|
6 years ago |
|
yflory
|
fddff11fae
|
Rename shared drive to shared folder
|
6 years ago |
|
yflory
|
61659c1252
|
Fix template icon not overriden by a thumbnail in the PCS
|
6 years ago |
|
yflory
|
ce08d7b650
|
Merge branch 'master' into soon
|
6 years ago |
|
yflory
|
b084b892bd
|
Fix cache issues with workers in firefox
|
6 years ago |
|
ansuz
|
af40e140f9
|
safety net for call of undefined function in mergeDrive
|
6 years ago |
|
ansuz
|
2259d1b6ac
|
Merge branch 'soon' into staging
|
6 years ago |
|
ansuz
|
8a113d742e
|
Merge pull request #245 from xwiki-labs/issue-169-anchors-should-output-anchors
#169: First anchor test and restore of the CKEditor anchor function.
|
6 years ago |
|
ansuz
|
fb9cf2c81e
|
lint compliance
|
6 years ago |
|
Paul Libbrecht
|
0dc1500784
|
This should solve issue #169: The test now completes with the insertion of a random anchor (menu-driven) and some text, the export is then checked to contain <a name="..." id="..."> as expected, then cleans up.
paul
|
6 years ago |
|
ansuz
|
88c43cfc5c
|
address a linter error
|
6 years ago |
|
ansuz
|
f5172fd05f
|
Merge branch 'soon' into staging
|
6 years ago |
|
ansuz
|
24c7ce57e1
|
apply the fix for password change recommended by @sairim
|
6 years ago |
|
MTRNord
|
343e63f41b
|
Fix drag bug
|
7 years ago |
|
MTRNord
|
1bf1253963
|
Add color picker to items
|
7 years ago |
|
MTRNord
|
8df1dc19f2
|
Add Color picker for board title and let it have less space between boards. (Default colors are still working)
|
7 years ago |
|
yflory
|
a65e083fca
|
Change PCS template icons
|
7 years ago |
|
yflory
|
33fb48d59a
|
Update shared folder icon in the drive
|
7 years ago |
|
yflory
|
9a6fa4cbe2
|
Create a copy when uploading an owned file in a shared folder
|
7 years ago |
|
yflory
|
55715748cc
|
Fix typo in contacts app preventing new lines
|
7 years ago |
|
yflory
|
20a9eee719
|
Disable shared folders creation by default
|
7 years ago |
|
yflory
|
f2baaf5b5b
|
Fix shared folders issues including disappearing folders
|
7 years ago |
|
yflory
|
4325ed4dde
|
Fix small UI issues in drive
|
7 years ago |
|
yflory
|
bad1d7311a
|
Fix drive tests
|
7 years ago |
|
yflory
|
8ab786e7df
|
Drive restore loading screen text
|
7 years ago |
|
yflory
|
d816a2ed9f
|
Prevent timeout when restoring drive
|
7 years ago |
|
yflory
|
2be78deb93
|
Fix Drive history
|
7 years ago |
|
yflory
|
8b20b14184
|
Fix current path in toolbar reversing some names
|
7 years ago |
|
yflory
|
c08951dd91
|
Press enter to create a shared folder when typing its name
|
7 years ago |
|
yflory
|
8c20c7823e
|
Empty trash callback was missing
|
7 years ago |
|
yflory
|
1e092f36ba
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
a95cf85f20
|
Fix shared folder creation using the wrong icon
|
7 years ago |
|
Caleb James DeLisle
|
5527949c70
|
Make LessLoader flow properly, sorry about that
|
7 years ago |
|
ansuz
|
a181c09a68
|
Merge branch 'soon' into staging
|
7 years ago |
|
ansuz
|
c1eb6d6a01
|
Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon
|
7 years ago |
|
ansuz
|
e2600e4b36
|
display a loading screen while users are changing their passwords
|
7 years ago |
|
yflory
|
f97685cc15
|
lint compliance
|
7 years ago |
|
yflory
|
ef73cf89cd
|
Merge branch 'soon' into staging
|
7 years ago |
|
yflory
|
8eccffd8e4
|
Don't remove migrated read-only pads
|
7 years ago |
|
yflory
|
64b51f3a80
|
jshint compliance
|
7 years ago |
|
yflory
|
ebfa2c2dc3
|
Merge branch 'less-less' into staging
|
7 years ago |
|
yflory
|
aafcb1bc02
|
Merge branch 'sharedfolder' into staging
|
7 years ago |
|
Caleb James DeLisle
|
8d95efa144
|
Reference the relevant line in alertify.js
|
7 years ago |
|
Caleb James DeLisle
|
a57a8e51a1
|
Prevent alertify.js from overriding styles
|
7 years ago |
|
ansuz
|
e110f20397
|
support blocks on remote domains
|
7 years ago |
|
yflory
|
e59aec0a45
|
Try...catch on testworker.js
|
7 years ago |
|
yflory
|
3a7d1e5beb
|
Fix 'save to drive' icon displayed for anonymous users in whiteboard
|
7 years ago |
|
yflory
|
08005a709e
|
Add a share icon in the drive when displaying a shared folder
|
7 years ago |
|
ansuz
|
1629d7bb1d
|
provide a SANE default in case httpUnsafeOrigin is not provided
|
7 years ago |
|
ansuz
|
bcbec0144c
|
provide a default in case httpUnsafeOrigin is not provided
|
7 years ago |
|
yflory
|
6143bceabb
|
Fix XXX
|
7 years ago |
|
ansuz
|
a2fd32d6a3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
e6d4bced18
|
clean up extraneous variables and log statements
|
7 years ago |
|
yflory
|
b4c294565e
|
Hide shared folder creation links when inside a shared folder
|
7 years ago |
|
yflory
|
ecb9f039b1
|
Fix pad password change not reloading with the correct URL
|
7 years ago |
|
yflory
|
c9ac3c7c2b
|
Fix search in shared folders
|
7 years ago |
|
yflory
|
fc91cf606b
|
Disable moveToTrash button for pads in shared folders
|
7 years ago |
|
ansuz
|
ed881840cd
|
remove XXX label from non-blocking feature
|
7 years ago |
|
yflory
|
9c58dc216f
|
Remove option to move a shared folder to the trash
|
7 years ago |
|
ansuz
|
2c22232a47
|
check if a user is logged in strictly by User_hash
|
7 years ago |
|
ansuz
|
848a918eda
|
remove out of date comments
|
7 years ago |
|
yflory
|
668b7425a8
|
Make sure we won't move pads from a shared folder to the trash
|
7 years ago |
|
yflory
|
5b48eff78c
|
Remove owned pads deleted from the server in shared folders
|
7 years ago |
|
ansuz
|
b9c4aa43b5
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
3d95e6088a
|
leave a FIXME note
|
7 years ago |
|
Caleb James DeLisle
|
792f7bcc64
|
show how long less takes to compile
|
7 years ago |
|
Caleb James DeLisle
|
6c49318ac7
|
Show how long it takes to parse less
|
7 years ago |
|
Caleb James DeLisle
|
0d5ac05866
|
refactoring of the less infrastructure
|
7 years ago |
|
yflory
|
b5c2eb8a9c
|
Automatically refresh the drive when a change occurs in a shared folder
|
7 years ago |
|
yflory
|
4706b8a9de
|
Store newly created pads in the correct (shared) folder
|
7 years ago |
|
yflory
|
6a80f49fe0
|
Don't load expired or deleted shared folders
|
7 years ago |
|
Caleb James DeLisle
|
507e5b18e9
|
Remove all less includes where no mixin or variable is used after
|
7 years ago |
|
Caleb James DeLisle
|
a6d3dbf94f
|
Wrapped modal.less into a mixin which gets rid of the last file which emitted CSS
|
7 years ago |
|
Caleb James DeLisle
|
4a352f2ed8
|
Use import (reference) whenever the less file supposedly emits no CSS
|
7 years ago |
|
yflory
|
7d89026d83
|
Fix more issues with shared folders
|
7 years ago |
|
Caleb James DeLisle
|
c5105d7b84
|
Merge branch 'check-for-css-variables' into staging
|
7 years ago |
|
Caleb James DeLisle
|
a440359bc7
|
Commit patches provided to me by someone who Seemed Trustworthy At The Time
(should fix false negatives in shared-worker detection)
|
7 years ago |
|
Caleb James DeLisle
|
cb8888ea1a
|
Yes, so it turns out that making a small asthetic change after testing on every browser does actually break it :|
|
7 years ago |
|
Caleb James DeLisle
|
fabdbc3b61
|
Add a feedback test for checking for CSS variables, so we won't use a feature which is not implemented by the vast majority of the people using CryptPad...
|
7 years ago |
|
yflory
|
8516587ece
|
lint compliance
|
7 years ago |
|
yflory
|
9787f5304a
|
Don't unpin channels that are still in another proxy
|
7 years ago |
|
ansuz
|
3fb6cb3d00
|
lint compliance
|
7 years ago |
|
ansuz
|
ca409e5eaa
|
support import/export in kanban
|
7 years ago |
|
yflory
|
321c7d5512
|
Move pin/unpin outside of userObject
|
7 years ago |
|
ansuz
|
8574128efd
|
unstub password change function
|
7 years ago |
|
ansuz
|
25b0d764ed
|
pass initialState variable when copying your drive in the changeUserPassword function
because the hardest problems to debug are always fixed with one line changes
|
7 years ago |
|
ansuz
|
54bc29f28c
|
WIP maybe I missed something
|
7 years ago |
|
yflory
|
66a494cbd2
|
temp
|
7 years ago |
|
yflory
|
4b86ed2dec
|
Shared folders UI
|
7 years ago |
|
ansuz
|
0a9ea95796
|
always set userHash in localStorage even with modern users
|
7 years ago |
|
yflory
|
bc7524c134
|
Fix tippy
|
7 years ago |
|
yflory
|
6312dadb60
|
Fix shared folders names in the drive
|
7 years ago |
|
ansuz
|
ce7ebf0326
|
don't stop users from registering if they cancel out of a prompt
|
7 years ago |
|
yflory
|
e0cc1a6eb6
|
Display a shared folder in the drive
|
7 years ago |
|
ansuz
|
a15e232469
|
complete modern user registration/login. general cleanup
|
7 years ago |
|
ansuz
|
d79064a4c5
|
Merge branch 'staging' into modern-users2
|
7 years ago |
|
ansuz
|
4ef2cfa88d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
57a39258c3
|
WIP big commit
|
7 years ago |
|
ansuz
|
0c3b898000
|
simple one line fixes
|
7 years ago |
|
yflory
|
0c9dfc1fb5
|
Add proxy manager inner
|
7 years ago |