yflory
|
226ef1fd00
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
7 years ago |
|
yflory
|
fb512c8923
|
Toolbar in pad2
|
7 years ago |
|
ansuz
|
3b20dcd435
|
add optional cache-busting to favicon
|
7 years ago |
|
ansuz
|
ee874878dd
|
clear tooltips when the userlist is redrawn
|
7 years ago |
|
ansuz
|
f207edfd28
|
handle errors when deriving keys. fix incorrect reference
|
7 years ago |
|
Caleb James DeLisle
|
e04c0b89a1
|
manual merge of staging
|
7 years ago |
|
Caleb James DeLisle
|
3315449114
|
Lets try this...
|
7 years ago |
|
Caleb James DeLisle
|
4c949a61e7
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
Caleb James DeLisle
|
6b174934c8
|
Try waiting for iframe document.onload instead of looping and waiting for document.body to exist.
|
7 years ago |
|
yflory
|
e7ef1e1c2b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
yflory
|
7c49ca6e3f
|
Fix initial text size in code
|
7 years ago |
|
ansuz
|
2874ccb5dc
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
2a8abc2699
|
comment out splitter code
|
7 years ago |
|
Caleb James DeLisle
|
725e19925c
|
Yeah, that was silly...
|
7 years ago |
|
Caleb James DeLisle
|
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 |
|
ansuz
|
130b330ede
|
refactor messaging
|
7 years ago |
|
Caleb James DeLisle
|
638a94785f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
Caleb James DeLisle
|
7ca60e55a7
|
Lock the pad's inner-iframe down with CSP
|
7 years ago |
|
ansuz
|
5e6e76dfc1
|
make regex case insensitive
|
7 years ago |
|
ansuz
|
736288a85b
|
lint compliance
|
7 years ago |
|
ansuz
|
5037f444e9
|
update markdown sanitization strategy
|
7 years ago |
|
Caleb James DeLisle
|
878a565f89
|
tiny little performance improvement in something that really doesn't need it
|
7 years ago |
|
Caleb James DeLisle
|
007db0b080
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
Caleb James DeLisle
|
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 |
|
ansuz
|
66cacf08da
|
allow users to write with tabs instead of spaces
|
7 years ago |
|
ansuz
|
64849507b3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
Pierre Bondoerffer
|
a5f9b49bfb
|
make poll box bigger so it show text in smaller windows
|
7 years ago |
|
Pierre Bondoerffer
|
82fadde249
|
restyle info-box in drive
|
7 years ago |
|
ansuz
|
958294f109
|
put code settings in their own tab
|
7 years ago |
|
Pierre Bondoerffer
|
c8d7675ede
|
remove z-index on splitter in code
|
7 years ago |
|
Pierre Bondoerffer
|
17b986a6ca
|
fix toolbar drive link (oops)
|
7 years ago |
|
ansuz
|
ae0b2ca1a8
|
add label for code indentation
|
7 years ago |
|
ansuz
|
284124a32d
|
WIP
|
7 years ago |
|
Caleb James DeLisle
|
4acd9957a9
|
Set the url if there is none
|
7 years ago |
|
Caleb James DeLisle
|
33e73dd5e5
|
fixed one last fight
|
7 years ago |
|
Caleb James DeLisle
|
9c0b0cc6a8
|
Merge branch 'staging' into pad2
|
7 years ago |
|
Caleb James DeLisle
|
1e56fa31c0
|
yay, they talk and they don't fight
|
7 years ago |
|
ansuz
|
1c526feffb
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
fbb880f277
|
implement customizable indentation widths
|
7 years ago |
|
Caleb James DeLisle
|
b3d349bf80
|
Merge branch 'staging' into pad2
|
7 years ago |
|
Caleb James DeLisle
|
8efac4e661
|
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
|
7 years ago |
|
Caleb James DeLisle
|
0dde1d7507
|
wip
|
7 years ago |
|
Pierre Bondoerffer
|
baf64114a6
|
point to homepage in drive
|
7 years ago |
|
Pierre Bondoerffer
|
9dce40f3af
|
only add the splitter once
|
7 years ago |
|
Pierre Bondoerffer
|
4026994310
|
make splitter work when scrolling
|
7 years ago |
|
Caleb James DeLisle
|
c304071492
|
wip
|
7 years ago |
|
Caleb James DeLisle
|
e49a42db18
|
Merge branch 'staging' into pad2
|
7 years ago |
|
Caleb James DeLisle
|
1f9bd866c3
|
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
|
7 years ago |
|
Pierre Bondoerffer
|
edad5deeac
|
fix logo not showing sometimes in chrome
|
7 years ago |
|
Pierre Bondoerffer
|
c036bb26be
|
use proper bootstrap class
|
7 years ago |
|
Caleb James DeLisle
|
52565076b9
|
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
|
7 years ago |
|
Caleb James DeLisle
|
4b25ab80d6
|
wip
|
7 years ago |
|
Pierre Bondoerffer
|
b34e252eda
|
improve whiteboard styles
|
7 years ago |
|
ansuz
|
844967a880
|
continued refactoring
|
7 years ago |
|
Pierre Bondoerffer
|
8b2cb37c2f
|
improve poll looks
|
7 years ago |
|
Pierre Bondoerffer
|
5821d3e72f
|
remove useless title
|
7 years ago |
|
Pierre Bondoerffer
|
a4aeada585
|
make the file dialog placeholder visible, center file list
|
7 years ago |
|
Pierre Bondoerffer
|
d47e26efd5
|
add margin in code
|
7 years ago |
|
Pierre Bondoerffer
|
e08ed72653
|
generate the tooltip after the button
|
7 years ago |
|
Pierre Bondoerffer
|
665e81912e
|
put the tooltip on the actual button to prevent tippy from popping when not intended
|
7 years ago |
|
Pierre Bondoerffer
|
34ba673cd3
|
improve file upload UI
|
7 years ago |
|
ansuz
|
34a5a32c44
|
lint compliance
|
7 years ago |
|
ansuz
|
cdf3cee9c8
|
split out message rendering into ui
|
7 years ago |
|
ansuz
|
fcdfa52aa9
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
58b3b32cc3
|
big messaging refactor. split UI from logic
|
7 years ago |
|
Pierre Bondoerffer
|
6ca6755d02
|
more missing titles in toolbar
|
7 years ago |
|
Pierre Bondoerffer
|
2cc6c636db
|
Add some missing titles
|
7 years ago |
|
Pierre Bondoerffer
|
d3f2398865
|
bump tippy to 1.2.0, add dynamicTitle option
|
7 years ago |
|
ansuz
|
8301bd44be
|
Merge pull request #164 from pbondoer/staging
UI improvements
|
7 years ago |
|
Pierre Bondoerffer
|
85e383d5c5
|
add invisible splitter
|
7 years ago |
|
Pierre Bondoerffer
|
90075cd48e
|
media-tag to less file
|
7 years ago |
|
Pierre Bondoerffer
|
d15280c6ce
|
prevent pdfs from being huge
|
7 years ago |
|
Pierre Bondoerffer
|
c427f375dd
|
add bootstrap css to /code for image uploader
|
7 years ago |
|
Pierre Bondoerffer
|
f585ddccdf
|
fix image sizes in /slide/
|
7 years ago |
|
ansuz
|
fc95f1b6a8
|
lint compliance
|
7 years ago |
|
ansuz
|
ba9696ba33
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
Caleb James DeLisle
|
a612f02be2
|
Merge branch 'staging' into pad2
|
7 years ago |
|
ansuz
|
c63807fd2b
|
implement channel.send
|
7 years ago |
|
Caleb James DeLisle
|
35a55a15ed
|
wip
|
7 years ago |
|
ansuz
|
d835005905
|
simplify in-memory message format
|
7 years ago |
|
Pierre Bondoerffer
|
8f285eba9f
|
make file picker ui even prettier
|
7 years ago |
|
ansuz
|
797cc2b105
|
handle messages which fail to decrypt
|
7 years ago |
|
Caleb James DeLisle
|
65dfd99171
|
major wip
|
7 years ago |
|
Pierre Bondoerffer
|
c53e738054
|
improve file picker ui
|
7 years ago |
|
Pierre Bondoerffer
|
798a3dc520
|
automatically fill in display name in poll
|
7 years ago |
|
Pierre Bondoerffer
|
0588564bc9
|
overflow on poll div
|
7 years ago |
|
Pierre Bondoerffer
|
be29236af1
|
fix pdfjs styles
|
7 years ago |
|
ansuz
|
bad5160885
|
fix bad reference
|
7 years ago |
|
ansuz
|
05aa5ed347
|
hide new feature until it is finished
|
7 years ago |
|
ansuz
|
395f6e1b27
|
reset confirm text for alertify
|
7 years ago |
|
ansuz
|
dd6a057962
|
add 'msg' class for pierre
|
7 years ago |
|
ansuz
|
9865359bb0
|
don't tell users about new versions
|
7 years ago |
|
ansuz
|
c8c44d3bfc
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
Caleb James DeLisle
|
0d1f19f5d4
|
Big manual merge
|
7 years ago |
|
Pierre Bondoerffer
|
f6d45d05f6
|
use logo in toolbar
|
7 years ago |
|
ansuz
|
11c72499a0
|
don't add duplicate messages to the history
|
7 years ago |
|
ansuz
|
fb13e656b7
|
get new messages when reconnecting
|
7 years ago |
|
ansuz
|
52854c5a8e
|
ignore history range responses
|
7 years ago |
|
ansuz
|
e786117110
|
get new messages when reconnecting and WIP get more history
|
7 years ago |
|
ansuz
|
2ce341fed6
|
disable input field when disconnected
|
7 years ago |
|
ansuz
|
aba4e34e7f
|
reuse inline styles as a mixin
|
7 years ago |
|
ansuz
|
195cb01d72
|
better styles for messaging input
|
7 years ago |
|
ansuz
|
1fac0b9bc4
|
make todo text bold
|
7 years ago |
|
ansuz
|
66d81429bd
|
integrate file embed into code editor
|
7 years ago |
|
ansuz
|
dc7db074e8
|
open pad links when clicking in readOnly mode
|
7 years ago |
|
ansuz
|
71d88b156d
|
make empty profiles for users on first visit
|
7 years ago |
|
ansuz
|
8b0831ac5d
|
save images drawn with whiteboard to your CryptDrive
|
7 years ago |
|
ansuz
|
fe826133b3
|
make some markdown styles reusable
|
7 years ago |
|
ansuz
|
35cf23ce2c
|
clear tooltips when redrawing the userlist
|
7 years ago |
|
ansuz
|
4c6f8d71e1
|
don't invoke spinner if it does not exist
|
7 years ago |
|
ansuz
|
311f709dc4
|
lint compliance
|
7 years ago |
|
ansuz
|
c147d342a3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
7 years ago |
|
ansuz
|
542d0cd17f
|
drop support for legacy pad list
|
7 years ago |
|
Pierre Bondoerffer
|
93e007b52a
|
reduce png sizes
|
7 years ago |
|
ansuz
|
1c238100c8
|
don't throw alerts in the middle of someone's presentation
|
7 years ago |
|
ansuz
|
7cd42d5ff1
|
use provided clearTooltips function
|
7 years ago |
|
ansuz
|
3fa010027c
|
implement clearTooltips
|
7 years ago |
|
ansuz
|
a68a225d79
|
fix read-only synchronization bug
|
7 years ago |
|
ansuz
|
9734a4db80
|
append new items to the top of the todo
|
8 years ago |
|
ansuz
|
69eaccbdef
|
don't create empty todo entries
|
8 years ago |
|
ansuz
|
e84edb2c2b
|
disable problematic tooltips
|
8 years ago |
|
ansuz
|
9c07793d0d
|
remove tips on checkbox state change
|
8 years ago |
|
ansuz
|
ba9cab762c
|
Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo
|
8 years ago |
|
yflory
|
8e83501c72
|
Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo
|
8 years ago |
|
yflory
|
459e0b3b16
|
CSS and bug fixes for todo
|
8 years ago |
|
ansuz
|
d4ffa7903f
|
better popup logic
|
8 years ago |
|
ansuz
|
0b81781f35
|
make the input bold
|
8 years ago |
|
ansuz
|
2af96d74fc
|
automatically focus on the create todo form
|
8 years ago |
|
yflory
|
77d6da841f
|
Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo
|
8 years ago |
|
yflory
|
3da76e3ae8
|
Update style for the todo app
|
8 years ago |
|
ansuz
|
85366f2368
|
use new translations
|
8 years ago |
|
ansuz
|
d99d071716
|
WIP checkbox titles
|
8 years ago |
|
ansuz
|
e6031c2209
|
slightly better styles
|
8 years ago |
|
ansuz
|
8cfd8d3270
|
add translations for todo
|
8 years ago |
|
ansuz
|
c390bdd518
|
resolve merge conflicts
|
8 years ago |
|
yflory
|
0612a50ab4
|
Add fadein/fadeout when adding or removing a task
|
8 years ago |
|
ansuz
|
082632048b
|
fix styles for very wide todos
|
8 years ago |
|
ansuz
|
a15ff9ba2a
|
hide dates in todo
|
8 years ago |
|
ansuz
|
f0581f2cf4
|
also style the whole box
|
8 years ago |
|
ansuz
|
d7d7f212bb
|
add classes to style fake checkboxes based on checkstate
|
8 years ago |
|
ansuz
|
304d37a334
|
use styled checkboxes
|
8 years ago |
|
ansuz
|
b5603c89f0
|
add checkboxes to todos
|
8 years ago |
|
CatalinScr
|
796bf89491
|
Update of the front-page
|
8 years ago |
|
ansuz
|
4f63921fc9
|
better width styling on list. lint compliance
|
8 years ago |
|
yflory
|
35635c3e2f
|
CSS fix for the todo app
|
8 years ago |
|
ansuz
|
3efb9d21f5
|
pull in bootstrap. submit form on enter
|
8 years ago |
|
ansuz
|
83f79a3883
|
slightly better styles
|
8 years ago |
|
Nicolas Lemoine
|
180e643af9
|
Style of Todo App
|
8 years ago |
|
Nicolas Lemoine
|
5083299e8a
|
Merge branch 'todo' of https://github.com/xwiki-labs/cryptpad into todo
|
8 years ago |
|
Nicolas Lemoine
|
f67fb32bf1
|
Add, delete, display a task in Todo
|
8 years ago |