ansuz
|
07c942de9d
|
drop unnecessary keys from french translation
|
6 years ago |
|
ansuz
|
a089ed8e9d
|
Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon
|
6 years ago |
|
ansuz
|
b319fefa86
|
migrate .de translation to json
|
6 years ago |
|
ansuz
|
f1d1818200
|
resolve merge conflicts
|
6 years ago |
|
yflory
|
d0f70d413a
|
Update french translation
|
6 years ago |
|
yflory
|
c0d33040b6
|
Fix an issue with empty hash in the href validator
|
6 years ago |
|
ansuz
|
905e6b0fa1
|
add new translation keys to English text
|
6 years ago |
|
ansuz
|
18b5e1a405
|
Merge remote-tracking branch 'origin/weblate' into soon
|
6 years ago |
|
JanRei
|
2b33d9ecee
|
Update German translation plus some minor message fixes
|
6 years ago |
|
yflory
|
6c1da07c60
|
Display an error when an invalid hash in used
|
6 years ago |
|
yflory
|
46c3f1f3df
|
Add the properties box to the OO apps toolbar
|
6 years ago |
|
yflory
|
084aa09a2c
|
lint compliance
|
6 years ago |
|
yflory
|
6855c3e9fd
|
Fix incorrect total size displayed for spreadsheets (#318)
|
6 years ago |
|
yflory
|
c9450de799
|
Fix 'lock is null' error in onlyoffice apps
|
6 years ago |
|
yflory
|
f04ba4a3d8
|
Too many false positive with the timeout detection
|
6 years ago |
|
yflory
|
412670c8a6
|
PCS with owners and password for spreadsheets
|
6 years ago |
|
yflory
|
aa5484ff21
|
lint compliance
|
6 years ago |
|
yflory
|
fe0961b24b
|
Enable import feature in spreadsheets
|
6 years ago |
|
yflory
|
ea54dd7392
|
Fix spreadsheets issues when using multiple sheets
|
6 years ago |
|
yflory
|
4abed38bb1
|
Add a dev mode to facilitate debugging
|
6 years ago |
|
yflory
|
07cd0b21b6
|
Fix last known hash sent to onlyoffice (it is already known...)
|
6 years ago |
|
yflory
|
0c4c9dd283
|
Merge branch 'master' into staging
|
6 years ago |
|
yflory
|
3b8d6213e0
|
lint compliance
|
6 years ago |
|
yflory
|
9367dc8b4d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
6 years ago |
|
Adrian Nöthlich
|
13970d5c73
|
Started to rework the German translation
|
6 years ago |
|
yflory
|
cb89a5fdfe
|
Test timeout to kill phantom viewers
|
6 years ago |
|
yflory
|
d989b6d6e4
|
Fix one case of phantom viewers
|
6 years ago |
|
yflory
|
6018f57ec1
|
Change translation format to JSON
|
6 years ago |
|
yflory
|
d97ada3e26
|
Test new translations
|
6 years ago |
|
yflory
|
7e00d444c0
|
Update markdown rendering in code and slide
|
6 years ago |
|
yflory
|
e5abaa34b2
|
Fix cursor channel not updated to ephemeral
|
6 years ago |
|
ansuz
|
38803195a3
|
Merge branch 'soon' into staging
|
6 years ago |
|
ansuz
|
c811a1a5a1
|
Merge branch 'master' into soon
|
6 years ago |
|
yflory
|
50e814f4d0
|
Fix access to undefined object in sheet
|
6 years ago |
|
yflory
|
0e61c46dcf
|
Move fonts to the onlyoffice build
|
6 years ago |
|
yflory
|
4e6df3d1c0
|
lint compliance
|
6 years ago |
|
Ludovic Dubost
|
32af7f5871
|
Support import/export to internal format for office pads
|
6 years ago |
|
yflory
|
aec9e1be72
|
Text for the help menu in oo apps
|
6 years ago |
|
yflory
|
739f1674d1
|
Hide upload table in onlyoffice
|
6 years ago |
|
yflory
|
af55e07107
|
Remove console log in oo apps
|
6 years ago |
|
yflory
|
9ca7d504d2
|
Display help box in oo apps
|
6 years ago |
|
yflory
|
e78fc2abcb
|
Add the spreadsheet app to the home page
|
6 years ago |
|
yflory
|
6e153dc858
|
Handle server connection loss
|
6 years ago |
|
yflory
|
e93c9c3faa
|
Rename the spreadsheet app
|
6 years ago |
|
yflory
|
3d1d79e379
|
Disable strict mode
|
6 years ago |
|
yflory
|
56ff47af48
|
Enable chat in OO apps
|
6 years ago |
|
yflory
|
ed4f8016a1
|
Merge branch 'staging' into locks
|
6 years ago |
|
yflory
|
024eafaf32
|
Hide oodoc and ooslide in the apps list
|
6 years ago |
|
yflory
|
4946a44e33
|
Pin the realtime channel in the OO apps
|
6 years ago |
|
yflory
|
139b4608c0
|
lint compliance
|
6 years ago |
|
yflory
|
88d23039b6
|
Remove old code and add comments
|
6 years ago |
|
yflory
|
ec2f21ec64
|
Implement lock mechanisms for spreadsheets
|
6 years ago |
|
ansuz
|
21d035393d
|
disable english translations
|
6 years ago |
|
ansuz
|
5410728bff
|
lint compliance
|
6 years ago |
|
Paul Libbrecht
|
73a75c11c9
|
Actualizing German translations. PL
|
6 years ago |
|
yflory
|
01f93f6f7b
|
FIx unrecoverable errors when using IE11
|
6 years ago |
|
yflory
|
2ac176eeec
|
Share the correct index in onlyoffice messages
|
6 years ago |
|
yflory
|
7d0f34a684
|
Debugging tools
|
6 years ago |
|
yflory
|
a66d8c1384
|
Use lastKnownHash to handle checkpoints in the realtime channel
|
6 years ago |
|
yflory
|
ef452d1221
|
Fix language detection in codemirror when importing a markdown file
|
6 years ago |
|
yflory
|
8dbeee1af9
|
Realtime spreadsheets
|
6 years ago |
|
yflory
|
a41a31a574
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
6 years ago |
|
yflory
|
6fa7b147e9
|
Add C, C++, Objective-C and Java to the list of languages in the code app
|
6 years ago |
|
yflory
|
c5f554fe7b
|
Test with onlyoffice 5.2.6
|
6 years ago |
|
yflory
|
b79ba61984
|
Improve realtime channel for onlyoffice
|
6 years ago |
|
ansuz
|
5a61453492
|
Merge branch 'soon' into staging
|
6 years ago |
|
ansuz
|
6cf8720458
|
update how the async store chooses to prune history to avoid the diverged checkpoint bug
|
6 years ago |
|
ansuz
|
9105a89eab
|
intantiate ephemeral channels with 34 hex characters
|
6 years ago |
|
yflory
|
efdecd4059
|
First step for realtime in onlyoffice apps
|
6 years ago |
|
ansuz
|
6f89156415
|
guard against calling an undefined function
|
6 years ago |
|
yflory
|
41a1148c17
|
Use the same code for the different frontend channels
|
6 years ago |
|
ansuz
|
20959f84ae
|
return Boolean from our test for WebRTC support
|
6 years ago |
|
yflory
|
b4aae68c0c
|
Fix access rights in the file app
|
6 years ago |
|
ansuz
|
0783944e1c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
6 years ago |
|
ansuz
|
424a14625d
|
add feedback keys for password change and drive migration
|
6 years ago |
|
yflory
|
573a3557f1
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
6 years ago |
|
yflory
|
5b80fafe5e
|
Add feedback
|
6 years ago |
|
ansuz
|
bcd6a4b6c6
|
add feedback keys
|
6 years ago |
|
yflory
|
107c352922
|
Update translations
|
6 years ago |
|
yflory
|
f760253137
|
Fix typo
|
6 years ago |
|
yflory
|
d87a87410d
|
Preserve hidden owned pads from a deleted folder
|
6 years ago |
|
yflory
|
a9e030a6a8
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
6 years ago |
|
ansuz
|
611fb4895c
|
Merge branch 'soon' into staging
|
6 years ago |
|
Paul Libbrecht
|
1cd79e12f2
|
Latest update of the German translation (cursors, shared folders, ...).
|
6 years ago |
|
yflory
|
1e672c4a6b
|
Use onlyoffice spreadsheets without ooserver
|
6 years ago |
|
yflory
|
047a4a3ab4
|
Copy files to a shared folder instead of moving them
|
6 years ago |
|
rhoio
|
5294604b90
|
Style, grammar and typo fixes in german translation
|
6 years ago |
|
yflory
|
0a7adb3e88
|
Hide duplicated owned pads
|
6 years ago |
|
yflory
|
7658fb90a2
|
Translations for spellcheck
|
6 years ago |
|
yflory
|
cef9733262
|
Enable spellcheck in pad
|
6 years ago |
|
yflory
|
c6acd191b9
|
Own drive translations
|
6 years ago |
|
yflory
|
f2f9b57505
|
Own drive migration
|
6 years ago |
|
yflory
|
b2b23446e8
|
Add missing translations
|
6 years ago |
|
yflory
|
bbc06f668f
|
Fix undefined hash for deleted shared folders
|
6 years ago |
|
yflory
|
a11a883cff
|
Cursor improvements in pad, code and slide
|
6 years ago |
|
yflory
|
760f58b74c
|
Merge branch 'staging' into oo2
|
6 years ago |
|
yflory
|
ae7d97b3dd
|
Ability to disable apps using appconfig
|
6 years ago |
|
yflory
|
f883fb7e04
|
Preserve chat and cursor channel when importing a template
|
6 years ago |
|
yflory
|
1a0344547b
|
Improve cursor in pad
|
6 years ago |
|
yflory
|
bfd94c7f2b
|
Merge branch 'cursor' into staging
|
6 years ago |
|
yflory
|
95a0bc9fc1
|
Merge branch 'rochat' into staging
|
6 years ago |
|
yflory
|
489a99c5c4
|
Don't delete the old chat for now
|
6 years ago |
|
yflory
|
0197f583f2
|
Translations for the cursor position settings
|
6 years ago |
|
yflory
|
13da052325
|
Update translation key
|
6 years ago |
|
yflory
|
fb5ad34299
|
Fix typo...
|
6 years ago |
|
yflory
|
a121df2600
|
Delete validateKey in the messenger memory when we leave the channel
|
6 years ago |
|
ansuz
|
8affe4053c
|
Merge branch 'staging' of github.com:joldie/cryptpad into print-code
|
6 years ago |
|
yflory
|
d88dee9a83
|
Restrict sending messages in a pad chat to editors only
|
6 years ago |
|
yflory
|
32fc941141
|
Merge branch 'staging' into cursor
|
6 years ago |
|
yflory
|
a2e28e6e25
|
Fix missing avatar in cursor tooltip
|
6 years ago |
|
yflory
|
c6f63d4d54
|
Cursor position in pad
|
6 years ago |
|
joldie
|
35c39fae5d
|
Added print button to code pad page.
|
6 years ago |
|
yflory
|
600c984576
|
Only show the user colors in the userlist if the app supports it
|
6 years ago |
|
yflory
|
081fc01694
|
Add a settings category about the cursor
|
6 years ago |
|
yflory
|
c81b4d77e8
|
lint compliance
|
6 years ago |
|
yflory
|
f157f852b1
|
Fix and improve cursor
|
6 years ago |
|
yflory
|
1ba80a344b
|
See other users' cursor position
|
6 years ago |
|
yflory
|
008b5a3e9f
|
Fix an ownership issue in friend channels
|
6 years ago |
|
yflory
|
ca45ff31d1
|
Refactor messenger to use commands from UI to store
|
6 years ago |
|
yflory
|
f5965716b6
|
Minor update because of flow...
|
6 years ago |
|
yflory
|
2a46b8f855
|
Fix an issue with last known hash in the messenger
|
6 years ago |
|
yflory
|
dbad925e5e
|
New cursor recovery system (beta)
|
6 years ago |
|
yflory
|
13d6579861
|
Add typing test in the code app
|
6 years ago |
|
ansuz
|
1b83431382
|
Merge branch 'master' of https://git.xwikisas.com/xwiki-labs/cryptpad
|
6 years ago |
|
ansuz
|
d407f9af74
|
downgrade an XXX to a FIXME
|
6 years ago |
|
ansuz
|
fcce48f2dd
|
Merge branch 'soon' into staging
|
6 years ago |
|
yflory
|
8522c3723d
|
Translations for the NGI logo
|
6 years ago |
|
yflory
|
3a4cfbb7e8
|
Disable HTML in chat
|
6 years ago |
|
yflory
|
22f1ac9e1e
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
6 years ago |
|
yflory
|
fc915e3337
|
Use DiffMarked in messenger to avoid duplicate code
|
6 years ago |
|
yflory
|
b166c70a5f
|
Fix conflict when a user was reverting the latest patch from someone else
|
6 years ago |
|
yflory
|
8f849d8d4a
|
Merge branch 'staging' into cursor
|
6 years ago |
|
yflory
|
4daa2266c0
|
Fix new network open for each shared folder
|
6 years ago |
|
yflory
|
fe0d579d56
|
Cursor improvements in pad (Beta)
|
6 years ago |
|
yflory
|
82c3c7f50b
|
Improve the Typing Test in pad
|
6 years ago |
|
yflory
|
a5b04bd62a
|
Download a file from the drive using the context menu
|
6 years ago |
|
Paul Libbrecht
|
3f2e6b0611
|
completion
|
6 years ago |
|
yflory
|
4e26a8fbc5
|
Merge branch 'soon' into staging
|
6 years ago |
|
Paul Libbrecht
|
12b2224dad
|
Bad syntax error left. Sorry. Now fixed.
paul
|
6 years ago |
|
yflory
|
b74e086602
|
Shortcuts are now added from sframe-common
|
6 years ago |
|
yflory
|
05e7d5eb9b
|
Add missing translation
|
6 years ago |
|
yflory
|
997692efb4
|
Use the font-size codemirror setting in the slide app too
|
6 years ago |
|
yflory
|
1c5847dd01
|
Prevent Ctrl+S from saving useless content. Add support for custom shortcuts in CkEditor
|
6 years ago |
|
yflory
|
1d31aab990
|
Display more warning messages about the full drive export
|
6 years ago |
|
yflory
|
7509ce1cc7
|
Use new application icons
|
6 years ago |
|
Paul Libbrecht
|
31a6fac4e0
|
Update German translation with latest phrases. Paul
|
6 years ago |
|
ansuz
|
ef08771ffa
|
Fix typo in German translation, closes #290
s/Unbenennen/Umbenennen
|
6 years ago |
|
yflory
|
db25d914ab
|
Improve default UI for small or zoomed screens
|
6 years ago |
|
yflory
|
8b554dec63
|
Set font size in code editor from the settings page (#140)
|
6 years ago |
|
yflory
|
e4daa5adbe
|
Fix random character insertion
|
6 years ago |
|
yflory
|
98db6057c8
|
Allow shared workers by default
|
6 years ago |
|
yflory
|
3c99302c32
|
Update French translation
|
6 years ago |
|
yflory
|
4e3c09f640
|
Merge branch 'master' into staging
|
6 years ago |
|
yflory
|
6924541080
|
Merge branch 'move' into staging
|
6 years ago |
|
yflory
|
85cb56df1d
|
Import changes from pull requests in master (translation files were moved)
|
6 years ago |
|
yflory
|
fc86e5daf8
|
French translation
|
6 years ago |
|
yflory
|
ef37bac2e7
|
Add UI for the CryptDrive export
|
6 years ago |
|
yflory
|
3e9e92dcac
|
Implement full CryptDrive export
|
6 years ago |
|
yflory
|
92ce311694
|
Basic CryptDrive export with pads
|
6 years ago |
|
yflory
|
f4d5a7567f
|
Return an error when the pad has been deleted from the server
|
6 years ago |
|
yflory
|
9f0398826d
|
Make customized translations more maintainable
|
6 years ago |
|
yflory
|
caa72ba949
|
Remove dropdown menus scrollbar when space is available
|
6 years ago |
|
yflory
|
3257914b17
|
Add support for PowerShell mode in codemirror
|
6 years ago |
|
yflory
|
bf55657993
|
Password-protected shared folders
|
6 years ago |
|
yflory
|
c127f0a5f6
|
Add a comment
|
6 years ago |
|
yflory
|
7d3d3cf5ac
|
Distinguish between two anonymous users in the chat
|
6 years ago |
|
ansuz
|
90c905827d
|
Merge pull request #281 from ryanpcmcquen/patch-2
Typo fix: additionnal => additional
|
6 years ago |
|
yflory
|
2a313a90e0
|
Don't rejoin a dropped channel on reconnect and leave chat channel
|
6 years ago |
|
yflory
|
498703384f
|
Don't rejoin a dropped channel on reconnect and leave chat channel
|
6 years ago |
|
yflory
|
2a86db2001
|
New Features page
|
6 years ago |
|
yflory
|
5cbe2f7c0f
|
Fix tag autocomplete and Tags category in the drive
|
6 years ago |
|
yflory
|
5d3d591228
|
Keep trying until the first tab is loaded
|
6 years ago |
|
yflory
|
c59d744d78
|
Fix loading a tab while another one is initializing the worker
|
6 years ago |
|
ansuz
|
1d63419df8
|
update error handling, but leave the note to come back
|
6 years ago |
|
yflory
|
c5c6dc8223
|
Enable browser notifications for messaging tools
|
6 years ago |
|
yflory
|
1201f2dcc4
|
Fix small UI issue
|
6 years ago |
|
yflory
|
9a6e6f6e15
|
Fix User menu and link to drive in anonymous shared folders
|
6 years ago |
|
yflory
|
d78a00b5e1
|
Ese the correct document type in the text for the store corner popup
|
6 years ago |
|
yflory
|
930677750c
|
Merge branch 'anonsf' into staging
|
6 years ago |
|
yflory
|
0a83840c9c
|
View a shared folder with an unregistered user
|
6 years ago |
|
Ryan P. C. McQuen
|
df442f9b1e
|
Typo fix: additionnal => additional
|
6 years ago |
|
yflory
|
17bc1ee703
|
Load shared folder when not logged in
|
6 years ago |
|
ansuz
|
e77f833652
|
come back to this error
|
6 years ago |
|
ansuz
|
ad4e36015b
|
Merge branch 'soon' into staging
|
6 years ago |
|
ansuz
|
91cff453f1
|
enable shared folders by default
|
6 years ago |
|
yflory
|
0e9b30744b
|
Add support for less highlighting
|
6 years ago |
|
yflory
|
6b4643a916
|
Add syntax highlighting in code blocks rendered from markdown
|
6 years ago |
|
ansuz
|
7deb346552
|
update to new marked lib without breaking custom renderers
|
6 years ago |
|
yflory
|
bd1b120ab1
|
Add feedback about crowdfunding
|
6 years ago |
|
yflory
|
f662036817
|
Change the hash in the address bar when browsing a shared folder
|
6 years ago |
|
yflory
|
7a93927068
|
Fix UI issues with the new pad modals
|
6 years ago |
|
yflory
|
179df27e3c
|
Fix autostore not displaying the error message when over pin limit
|
6 years ago |
|
yflory
|
c1ef8243a1
|
Ability to select multiple files to upload (#275)
|
6 years ago |
|
yflory
|
6c27d2964c
|
Disable friends chat in pad messenger
|
6 years ago |
|
yflory
|
1895d6cbd8
|
Disable crowdfunding message for premium users
|
6 years ago |
|
yflory
|
6257b23f16
|
Crowdfunding config
|
6 years ago |
|
yflory
|
716159d300
|
Add OpenCollective links
|
6 years ago |
|
yflory
|
d2c1ed5eff
|
Implement reconnect function in the messenger
|
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
|
6c6ce7b7a8
|
Fix messenger bugs
|
6 years ago |
|
yflory
|
ac989a1e73
|
lint compliance
|
6 years ago |
|
yflory
|
f3c36bfd57
|
Improve messenger initial history
|
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
|
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 |
|
yflory
|
525703e7d8
|
Fix autostore popup displayed for dropped files
|
6 years ago |
|
yflory
|
855612e98b
|
Make oo work with hashes v2
|
6 years ago |
|
yflory
|
bf9cf95292
|
Merge branch 'staging' into oo2
|
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 |
|
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
|
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
|
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 |
|
yflory
|
a65e083fca
|
Change PCS template icons
|
7 years ago |
|
yflory
|
9a6fa4cbe2
|
Create a copy when uploading an owned file in a shared folder
|
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
|
d816a2ed9f
|
Prevent timeout when restoring drive
|
7 years ago |
|
yflory
|
2be78deb93
|
Fix Drive history
|
7 years ago |
|
yflory
|
8c20c7823e
|
Empty trash callback was missing
|
7 years ago |
|
Caleb James DeLisle
|
5527949c70
|
Make LessLoader flow properly, sorry about that
|
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
|
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
|
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
|
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
|
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
|
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 |
|
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 |
|
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 |
|
yflory
|
bd6a199dca
|
Add missing functions to the proxy manager
|
7 years ago |
|
yflory
|
a25a72b5db
|
Add a proxy manager to handle operations between shared folders
|
7 years ago |
|
yflory
|
66591a3654
|
Merge branch 'rohref' into sharedfolder
|
7 years ago |