Caleb James DeLisle
|
4881f8d030
|
Remove X-Frame-Options because it cannot work with a cross-domain iframe.
|
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
|
aa1563a731
|
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
|
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
|
e786a66ff3
|
manual merge
|
7 years ago |
Pierre Bondoerffer
|
ef256e3849
|
go to homepage when on infopages
|
7 years ago |
Pierre Bondoerffer
|
04b84538e1
|
add Open Sans font (with bower)
|
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
|
2caaaffc5d
|
Merge branch 'staging' into pad2
|
7 years ago |
Caleb James DeLisle
|
1043e076a4
|
Merge branch 'ui-integration' into staging
|
7 years ago |
Caleb James DeLisle
|
c304071492
|
wip
|
7 years ago |
CatalinScr
|
41c2f9bd83
|
Changed the footer, a modified the about page
|
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
|
280c10c57d
|
alertify: use the right box-shadow
|
7 years ago |
Pierre Bondoerffer
|
5821d3e72f
|
remove useless title
|
7 years ago |
Pierre Bondoerffer
|
82352b422f
|
unhide show help button
|
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
|
ec011b15d5
|
remove duplicate css property
|
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 |
Pierre Bondoerffer
|
ca686f9c92
|
(hopefully) fix newline in lists when pasting links
|
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
|
355b7f1839
|
change recent to local pads
|
7 years ago |