yflory
|
0d008aaa2e
|
Add indent settings to code2
|
2017-08-30 17:57:10 +02:00 |
|
yflory
|
f54dc7505c
|
Migrate indentation settings to a settings subobject
|
2017-08-30 17:19:50 +02:00 |
|
yflory
|
0893bcc0e5
|
Merge branch 'staging' into code2
|
2017-08-30 14:57:19 +02:00 |
|
yflory
|
f06683e949
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-30 12:26:23 +02:00 |
|
yflory
|
0ce32464fd
|
Fix flickering avatar in firefox
|
2017-08-30 12:26:11 +02:00 |
|
ansuz
|
9a23b77b46
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-30 11:31:59 +02:00 |
|
ansuz
|
ba0e935add
|
stub localStorage, and handle errors that might come from touching localStorage
|
2017-08-30 11:31:49 +02:00 |
|
ansuz
|
be8ea4102e
|
keep trying to parse the hash until it works
|
2017-08-30 11:26:51 +02:00 |
|
yflory
|
4db4f66786
|
Remove an unnecessary fix for Safari
|
2017-08-30 11:14:58 +02:00 |
|
yflory
|
a2ed266048
|
Move the code app in a secure iframe
|
2017-08-30 11:10:57 +02:00 |
|
Caleb James DeLisle
|
1044531806
|
Fix Safari iframe size issue
|
2017-08-30 11:04:52 +02:00 |
|
ansuz
|
a34d1793e0
|
drop 'loading' text from loading screen
|
2017-08-29 18:15:40 +02:00 |
|
ansuz
|
595fa4c2e4
|
Merge branch 'soon'
|
2017-08-29 12:00:16 +02:00 |
|
ansuz
|
181a19a9a0
|
polyfill for array.fill
|
2017-08-29 11:49:10 +02:00 |
|
yflory
|
51fa6287c1
|
Enable notifications in secure pads
|
2017-08-29 11:20:02 +02:00 |
|
yflory
|
642dc17910
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-29 11:03:05 +02:00 |
|
yflory
|
901917983b
|
Fix an issue preventing pads to be stored in the drive
|
2017-08-29 11:02:56 +02:00 |
|
ansuz
|
40f062abda
|
restore app usage report in new pad
|
2017-08-29 10:50:02 +02:00 |
|
ansuz
|
8fb7fef3f5
|
regular expressions are never falsey
|
2017-08-29 10:37:19 +02:00 |
|
ansuz
|
24eac9b4a6
|
test for flakey tests
|
2017-08-28 18:42:04 +02:00 |
|
ansuz
|
7d2a76f4d6
|
delete dead code. fix off-by-one for messages. turn off history button when history is exhausted
|
2017-08-28 18:32:43 +02:00 |
|
ansuz
|
288c03bb41
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-28 17:52:01 +02:00 |
|
Caleb James DeLisle
|
fe03e6ae83
|
bad code, lint
|
2017-08-28 17:53:23 +02:00 |
|
ansuz
|
430a6f7b77
|
lint compliance
|
2017-08-28 17:51:50 +02:00 |
|
Caleb James DeLisle
|
190dff1c9b
|
Use the bounce app for opening a link with the right click
|
2017-08-28 17:50:55 +02:00 |
|
yflory
|
dec870d2bd
|
Fix selection in the drive search results
|
2017-08-28 17:43:26 +02:00 |
|
yflory
|
4bceef8952
|
Fix the upload status table missing in the drive
|
2017-08-28 17:35:24 +02:00 |
|
yflory
|
0b4e044540
|
Fix the plugin to open a link in a new tab in pad
|
2017-08-28 17:26:51 +02:00 |
|
yflory
|
d9a4a32bf9
|
Fix avatar for anonymous users in secure pads
|
2017-08-28 16:57:10 +02:00 |
|
yflory
|
00fda0d7d7
|
Fix avatar in read-only mode (secure pads)
|
2017-08-28 16:49:28 +02:00 |
|
yflory
|
88cb4fd83c
|
Enable friend requests from secure pads
|
2017-08-28 16:21:05 +02:00 |
|
yflory
|
147d88d845
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-28 15:13:30 +02:00 |
|
yflory
|
e43c68aa48
|
Fix viewers number in secure iframe
|
2017-08-28 15:13:16 +02:00 |
|
yflory
|
f89015d9ed
|
Update the tab title to match the pad title in pad2
|
2017-08-28 14:49:33 +02:00 |
|
ansuz
|
1280cd1659
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-28 14:49:01 +02:00 |
|
yflory
|
51c065d13c
|
Fix link to main in the new toolbar
|
2017-08-28 14:18:33 +02:00 |
|
yflory
|
d9bf2abcd8
|
Fix old hashes not working anymore in pad
|
2017-08-28 13:53:24 +02:00 |
|
ansuz
|
536fe04790
|
emit notification when alert, confirm, or prompt are called
|
2017-08-28 13:46:28 +02:00 |
|
Caleb James DeLisle
|
e4a356d873
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-28 12:25:12 +02:00 |
|
Caleb James DeLisle
|
056285a7b6
|
Move pad2 to pad and create bounce app
|
2017-08-28 12:25:05 +02:00 |
|
yflory
|
d4589c4699
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-28 12:22:38 +02:00 |
|
yflory
|
6c65e5ff72
|
Fix the ghost icon in the drive and add missing text
|
2017-08-28 12:22:31 +02:00 |
|
ansuz
|
5fbbaee2f5
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-28 11:48:02 +02:00 |
|
ansuz
|
6314487d98
|
handle unfriends in ui
|
2017-08-28 11:47:54 +02:00 |
|
ansuz
|
5c2b58e703
|
log error synchronously so we get a trace when pinPads has no callback
|
2017-08-28 11:47:01 +02:00 |
|
ansuz
|
841e3af8da
|
handle unfriends. clean up. better input validation
|
2017-08-28 11:46:05 +02:00 |
|
ansuz
|
c66a0c55e0
|
ensure that function signatures are correct
|
2017-08-28 11:40:31 +02:00 |
|
ansuz
|
91f6e3e543
|
remove a lot of dead code
|
2017-08-28 11:28:45 +02:00 |
|
Caleb James DeLisle
|
e62faf7c7b
|
Edge fix, always use async iframe onLoad rather than invoking it manually
|
2017-08-28 11:22:57 +02:00 |
|
ansuz
|
54eefd3d94
|
replace contacts with contacts2
|
2017-08-25 16:07:53 +02:00 |
|
ansuz
|
57d0c6c973
|
Merge branch 'new-messaging' into staging
|
2017-08-25 14:42:34 +02:00 |
|
ansuz
|
9e04d039d7
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-25 14:42:23 +02:00 |
|
ansuz
|
22d754d514
|
handle user renames
|
2017-08-25 14:42:05 +02:00 |
|
Caleb James DeLisle
|
0a6f81850f
|
Handle infinite-spinner errors and properly inform the user
|
2017-08-25 14:24:43 +02:00 |
|
ansuz
|
a99eb9365e
|
correctly set indentation preferences when changing languages
|
2017-08-24 17:31:04 +02:00 |
|
ansuz
|
f58d4c941f
|
clean up a bit
|
2017-08-24 17:19:57 +02:00 |
|
ansuz
|
ea5f47f0f9
|
remove some TODOs and solve some wee bugs
|
2017-08-24 17:18:59 +02:00 |
|
ansuz
|
b75a951a98
|
encode messages with 'author' field instead of 'channel'
|
2017-08-24 17:14:03 +02:00 |
|
Caleb James DeLisle
|
7bbea28831
|
minor anti-xss changes...
|
2017-08-24 13:53:42 +02:00 |
|
ansuz
|
013b75ae67
|
implement history range requests
|
2017-08-24 11:34:05 +02:00 |
|
ansuz
|
b71f1860db
|
make uid function reusable
|
2017-08-24 11:31:20 +02:00 |
|
ansuz
|
443d8a8941
|
remove unnecessary files
|
2017-08-24 11:29:42 +02:00 |
|
Caleb James DeLisle
|
75fde58846
|
Well that was stupid... (fix bug introduced in acfaaa7d56 when trying to make jshint compliance)
|
2017-08-23 16:18:47 +02:00 |
|
Caleb James DeLisle
|
dc283c2d74
|
Load 1, load 2... not load 1, load 3.
|
2017-08-23 15:49:51 +02:00 |
|
Caleb James DeLisle
|
5d9599c9b7
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-23 12:15:01 +02:00 |
|
Caleb James DeLisle
|
cbac5e417c
|
Make loading screen come much earlier on pad2
|
2017-08-23 12:14:51 +02:00 |
|
yflory
|
b6881349be
|
Fix an issue with the notifications in secure pads
|
2017-08-23 11:39:53 +02:00 |
|
yflory
|
ec64ac485d
|
Fix 'not a function' error
|
2017-08-23 11:06:55 +02:00 |
|
Caleb James DeLisle
|
acfaaa7d56
|
jshint compliance
|
2017-08-23 11:04:44 +02:00 |
|
Caleb James DeLisle
|
2ad9fcee17
|
Manual merge of notify.js
|
2017-08-23 10:45:55 +02:00 |
|
Caleb James DeLisle
|
8a9755611a
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-23 10:21:53 +02:00 |
|
Caleb James DeLisle
|
2dacd57e76
|
fix caching on favicon
|
2017-08-23 10:21:41 +02:00 |
|
yflory
|
33025a9df9
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-22 18:19:06 +02:00 |
|
yflory
|
c33b128bf4
|
Enable feedback in pad2
|
2017-08-22 18:18:58 +02:00 |
|
yflory
|
e81bb3fe08
|
Fix profile link in the userlist
|
2017-08-22 18:18:48 +02:00 |
|
yflory
|
d6c33fdf4f
|
Ghost icon to add a pad
|
2017-08-22 17:33:48 +02:00 |
|
ansuz
|
89a13d4b21
|
work on contacts2 until feature parity is reached
|
2017-08-22 15:55:49 +02:00 |
|
ansuz
|
002eed0d6f
|
make most of the messenger api async
|
2017-08-22 15:55:00 +02:00 |
|
Caleb James DeLisle
|
d9f5e3638e
|
Big caching improvements :D
|
2017-08-22 15:50:10 +02:00 |
|
yflory
|
98daf10ed1
|
Ability to collapse the root directory in the drive
|
2017-08-22 14:54:41 +02:00 |
|
yflory
|
b4864b96ac
|
Add a recent pads category in the drive
|
2017-08-22 14:28:17 +02:00 |
|
Caleb James DeLisle
|
4f3b4a30ee
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-21 18:38:16 +02:00 |
|
Caleb James DeLisle
|
4b70fc9f49
|
Use resources from the original origin in pad2
|
2017-08-21 18:38:07 +02:00 |
|
yflory
|
20a68ad71c
|
Hide the template button if the pad2 is a template
|
2017-08-21 18:31:15 +02:00 |
|
yflory
|
aa9e0d3cd3
|
Enable AppConfig in pad2
|
2017-08-21 18:30:51 +02:00 |
|
yflory
|
4089803785
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-21 18:22:08 +02:00 |
|
yflory
|
f40d2c0b20
|
Add templates to pad2
|
2017-08-21 18:21:53 +02:00 |
|
yflory
|
8d020833af
|
Add missing file
|
2017-08-21 18:21:25 +02:00 |
|
Caleb James DeLisle
|
bffa4d01a8
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-21 18:08:46 +02:00 |
|
Caleb James DeLisle
|
b081603455
|
Update requirejs
|
2017-08-21 18:08:37 +02:00 |
|
yflory
|
8d837d22ea
|
Add history to pad2
|
2017-08-21 17:40:21 +02:00 |
|
yflory
|
b2e6df1f9d
|
Add import & export in pad2
|
2017-08-21 15:34:21 +02:00 |
|
yflory
|
1da11a1883
|
Disable edition in readonly mode in pad2
|
2017-08-21 15:30:48 +02:00 |
|
yflory
|
e2d39de143
|
Forget button in pad2
|
2017-08-21 15:20:38 +02:00 |
|
yflory
|
e4020ba8d4
|
Fix pad creation in pad2
|
2017-08-21 14:41:56 +02:00 |
|
yflory
|
140c6f3776
|
Add limit warning in pad2
|
2017-08-21 12:24:33 +02:00 |
|
yflory
|
30aef71603
|
Enable avatars in pad2
|
2017-08-21 12:01:38 +02:00 |
|
yflory
|
f88a6f63fe
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-21 11:08:38 +02:00 |
|
yflory
|
fb4808e1e1
|
Fix queries callback arguments
|
2017-08-21 11:08:27 +02:00 |
|
Caleb James DeLisle
|
6dd1643738
|
Manual merge work done on loading page to pad2
|
2017-08-21 10:53:40 +02:00 |
|
Caleb James DeLisle
|
8b702e0150
|
wip
|
2017-08-21 10:34:49 +02:00 |
|
yflory
|
e65b2f4e9f
|
Add shareButton to pad2
|
2017-08-18 18:43:04 +02:00 |
|
yflory
|
beb45740d0
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-18 16:34:50 +02:00 |
|
yflory
|
90f892de9c
|
Useradmin menu, notifications and share button in pad2
|
2017-08-18 16:34:41 +02:00 |
|
ansuz
|
253ab68d8d
|
Merge branch 'staging' into new-messaging
|
2017-08-18 15:31:06 +02:00 |
|
Caleb James DeLisle
|
498c8229e9
|
Make following a link inside of the iframe only fail rather than carrying the iframe away from the pad.
|
2017-08-18 14:12:30 +02:00 |
|
ansuz
|
0693a98890
|
create a thumbnail when uploading images from whiteboard
|
2017-08-18 12:53:02 +02:00 |
|
ansuz
|
b17044ad98
|
add support for thumbnails in metadata
|
2017-08-18 12:47:04 +02:00 |
|
yflory
|
dd9b38066e
|
Change display name in useradmin menu
|
2017-08-18 11:07:42 +02:00 |
|
yflory
|
a96d447e8b
|
Add notifications in pad2
|
2017-08-18 10:47:30 +02:00 |
|
Pierre Bondoerffer
|
5e22e1dc59
|
use CryptPad instead of Cryptpad in titles
|
2017-08-17 20:47:39 +02:00 |
|
Caleb James DeLisle
|
cf6d8c83b2
|
Fix title setter logic and separate it from UI
|
2017-08-17 19:58:48 +02:00 |
|
Caleb James DeLisle
|
ec87f3f897
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-17 19:01:40 +02:00 |
|
Caleb James DeLisle
|
415399ef64
|
Changes to support title change in metadata
|
2017-08-17 19:01:33 +02:00 |
|
yflory
|
d1affebd14
|
Title in pad2
|
2017-08-17 19:01:03 +02:00 |
|
yflory
|
604415b32c
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-17 18:29:24 +02:00 |
|
yflory
|
fab3d67b75
|
Enable title in pad2
|
2017-08-17 18:28:05 +02:00 |
|
Caleb James DeLisle
|
909bda4302
|
This should fix laxy metadata
|
2017-08-17 18:26:58 +02:00 |
|
ansuz
|
a4dbf39c4a
|
fix pdf display problems in chrome
|
2017-08-17 18:11:46 +02:00 |
|
Caleb James DeLisle
|
2490ee253f
|
Added setDisplayName RPC
|
2017-08-17 18:09:17 +02:00 |
|
yflory
|
887a26b1a6
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-17 17:34:47 +02:00 |
|
Caleb James DeLisle
|
0b34ceb0eb
|
Added RPC setPadTitleInDrive()
|
2017-08-17 17:34:08 +02:00 |
|
ansuz
|
bed7d95bf3
|
use latest compiled cryptpad media-tag
|
2017-08-17 17:31:52 +02:00 |
|
ansuz
|
4e62f79594
|
stop referring to deleted file as background image
|
2017-08-17 17:31:18 +02:00 |
|
ansuz
|
3a5526e247
|
infer pdfjs document title from iframe url
|
2017-08-17 17:30:28 +02:00 |
|
yflory
|
25466aa2f9
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-17 17:26:27 +02:00 |
|
yflory
|
1d237735ef
|
Useradmin menu in pad2
|
2017-08-17 17:26:20 +02:00 |
|
Caleb James DeLisle
|
3b5af3ea74
|
sframe common changes
|
2017-08-17 16:56:18 +02:00 |
|
yflory
|
d1157c4d72
|
Add missing file
|
2017-08-17 16:28:54 +02:00 |
|
yflory
|
d237c76f6c
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-17 16:25:31 +02:00 |
|
yflory
|
f5855a2870
|
Add account name in metadata manager
|
2017-08-17 16:25:25 +02:00 |
|
Caleb James DeLisle
|
3c0197cbf4
|
Firefox fails to boot the iframe if there is no number on setInterval
|
2017-08-17 16:17:57 +02:00 |
|
yflory
|
d88704fb50
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-17 15:44:41 +02:00 |
|
Caleb James DeLisle
|
a4850a7fcc
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-17 15:42:28 +02:00 |
|
yflory
|
fc5bdd3bed
|
Add lazy metadata to fix parse errors in pad2
|
2017-08-17 15:42:26 +02:00 |
|
Caleb James DeLisle
|
ad9f2ff223
|
Made pad2 server more generic and easy to implement
|
2017-08-17 15:41:04 +02:00 |
|
ansuz
|
a125253cde
|
lint compliance
|
2017-08-17 15:13:05 +02:00 |
|
ansuz
|
290763d6c5
|
don't complain about bad realtime state just because you disconnected
|
2017-08-17 15:07:34 +02:00 |
|
yflory
|
226ef1fd00
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-17 14:55:53 +02:00 |
|
yflory
|
fb512c8923
|
Toolbar in pad2
|
2017-08-17 14:55:44 +02:00 |
|
ansuz
|
3b20dcd435
|
add optional cache-busting to favicon
|
2017-08-17 14:34:22 +02:00 |
|
ansuz
|
52d344c3d1
|
Merge branch 'soon'
|
2017-08-17 12:53:04 +02:00 |
|
ansuz
|
ee874878dd
|
clear tooltips when the userlist is redrawn
|
2017-08-17 12:50:40 +02:00 |
|
ansuz
|
f207edfd28
|
handle errors when deriving keys. fix incorrect reference
|
2017-08-17 12:50:12 +02:00 |
|
Caleb James DeLisle
|
e04c0b89a1
|
manual merge of staging
|
2017-08-17 12:14:19 +02:00 |
|
ansuz
|
5b7d1cccd7
|
fix display and logic for tab setting checkbox
|
2017-08-16 15:32:42 +02:00 |
|
Caleb James DeLisle
|
3315449114
|
Lets try this...
|
2017-08-16 14:30:17 +02:00 |
|
Caleb James DeLisle
|
4c949a61e7
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-16 12:40:34 +02:00 |
|
Caleb James DeLisle
|
6b174934c8
|
Try waiting for iframe document.onload instead of looping and waiting for document.body to exist.
|
2017-08-16 12:40:15 +02:00 |
|
yflory
|
e7ef1e1c2b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-16 12:35:13 +02:00 |
|
yflory
|
7c49ca6e3f
|
Fix initial text size in code
|
2017-08-16 12:34:56 +02:00 |
|
ansuz
|
2874ccb5dc
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-16 12:15:20 +02:00 |
|
ansuz
|
2a8abc2699
|
comment out splitter code
|
2017-08-16 12:15:08 +02:00 |
|
Caleb James DeLisle
|
725e19925c
|
Yeah, that was silly...
|
2017-08-16 12:11:25 +02:00 |
|
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.
|
2017-08-16 10:19:24 +02:00 |
|
ansuz
|
130b330ede
|
refactor messaging
|
2017-08-16 10:04:50 +02:00 |
|
Caleb James DeLisle
|
638a94785f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-14 16:24:17 +02:00 |
|
Caleb James DeLisle
|
7ca60e55a7
|
Lock the pad's inner-iframe down with CSP
|
2017-08-14 16:23:38 +02:00 |
|
ansuz
|
5e6e76dfc1
|
make regex case insensitive
|
2017-08-14 14:41:23 +02:00 |
|
ansuz
|
736288a85b
|
lint compliance
|
2017-08-14 14:02:57 +02:00 |
|
ansuz
|
5037f444e9
|
update markdown sanitization strategy
|
2017-08-14 13:12:43 +02:00 |
|
Caleb James DeLisle
|
878a565f89
|
tiny little performance improvement in something that really doesn't need it
|
2017-08-11 17:34:51 +02:00 |
|
Caleb James DeLisle
|
007db0b080
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-11 17:28:42 +02:00 |
|
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.
|
2017-08-11 17:28:23 +02:00 |
|
ansuz
|
66cacf08da
|
allow users to write with tabs instead of spaces
|
2017-08-11 15:21:26 +02:00 |
|
ansuz
|
64849507b3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-11 14:26:34 +02:00 |
|
Pierre Bondoerffer
|
a5f9b49bfb
|
make poll box bigger so it show text in smaller windows
|
2017-08-11 13:09:34 +02:00 |
|
Pierre Bondoerffer
|
82fadde249
|
restyle info-box in drive
|
2017-08-11 13:04:03 +02:00 |
|
ansuz
|
958294f109
|
put code settings in their own tab
|
2017-08-11 13:00:50 +02:00 |
|
Pierre Bondoerffer
|
c8d7675ede
|
remove z-index on splitter in code
|
2017-08-11 12:56:42 +02:00 |
|
Pierre Bondoerffer
|
17b986a6ca
|
fix toolbar drive link (oops)
|
2017-08-11 12:56:06 +02:00 |
|
ansuz
|
ae0b2ca1a8
|
add label for code indentation
|
2017-08-11 12:55:10 +02:00 |
|
ansuz
|
284124a32d
|
WIP
|
2017-08-11 10:59:54 +02:00 |
|
Caleb James DeLisle
|
4acd9957a9
|
Set the url if there is none
|
2017-08-11 10:40:57 +02:00 |
|
Caleb James DeLisle
|
33e73dd5e5
|
fixed one last fight
|
2017-08-10 21:40:34 +02:00 |
|
Caleb James DeLisle
|
9c0b0cc6a8
|
Merge branch 'staging' into pad2
|
2017-08-10 18:39:16 +02:00 |
|
Caleb James DeLisle
|
1e56fa31c0
|
yay, they talk and they don't fight
|
2017-08-10 18:31:44 +02:00 |
|
ansuz
|
1c526feffb
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-10 18:06:58 +02:00 |
|
ansuz
|
fbb880f277
|
implement customizable indentation widths
|
2017-08-10 18:06:47 +02:00 |
|
Caleb James DeLisle
|
b3d349bf80
|
Merge branch 'staging' into pad2
|
2017-08-10 14:53:12 +02:00 |
|
Caleb James DeLisle
|
8efac4e661
|
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
|
2017-08-10 14:49:41 +02:00 |
|
Caleb James DeLisle
|
0dde1d7507
|
wip
|
2017-08-10 14:49:21 +02:00 |
|
Pierre Bondoerffer
|
baf64114a6
|
point to homepage in drive
|
2017-08-10 14:45:56 +02:00 |
|
Pierre Bondoerffer
|
9dce40f3af
|
only add the splitter once
|
2017-08-10 14:34:48 +02:00 |
|
Pierre Bondoerffer
|
4026994310
|
make splitter work when scrolling
|
2017-08-10 14:25:31 +02:00 |
|
Caleb James DeLisle
|
c304071492
|
wip
|
2017-08-09 17:37:55 +02:00 |
|
Caleb James DeLisle
|
e49a42db18
|
Merge branch 'staging' into pad2
|
2017-08-09 16:28:51 +02:00 |
|
Caleb James DeLisle
|
1f9bd866c3
|
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
|
2017-08-09 16:06:46 +02:00 |
|
Pierre Bondoerffer
|
edad5deeac
|
fix logo not showing sometimes in chrome
|
2017-08-09 16:06:29 +02:00 |
|
Pierre Bondoerffer
|
c036bb26be
|
use proper bootstrap class
|
2017-08-09 15:46:17 +02:00 |
|
Caleb James DeLisle
|
52565076b9
|
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
|
2017-08-09 14:48:06 +02:00 |
|
Caleb James DeLisle
|
4b25ab80d6
|
wip
|
2017-08-09 14:45:39 +02:00 |
|
Pierre Bondoerffer
|
b34e252eda
|
improve whiteboard styles
|
2017-08-09 14:43:32 +02:00 |
|
ansuz
|
844967a880
|
continued refactoring
|
2017-08-09 14:20:37 +02:00 |
|
Pierre Bondoerffer
|
8b2cb37c2f
|
improve poll looks
|
2017-08-09 12:33:40 +02:00 |
|
Pierre Bondoerffer
|
5821d3e72f
|
remove useless title
|
2017-08-09 11:25:58 +02:00 |
|
Pierre Bondoerffer
|
a4aeada585
|
make the file dialog placeholder visible, center file list
|
2017-08-09 11:20:46 +02:00 |
|
Pierre Bondoerffer
|
d47e26efd5
|
add margin in code
|
2017-08-09 11:17:14 +02:00 |
|
Pierre Bondoerffer
|
e08ed72653
|
generate the tooltip after the button
|
2017-08-09 11:11:53 +02:00 |
|
Pierre Bondoerffer
|
665e81912e
|
put the tooltip on the actual button to prevent tippy from popping when not intended
|
2017-08-09 11:06:06 +02:00 |