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 |
|
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 |
|
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 |
|
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 |
|
ansuz
|
844967a880
|
continued refactoring
|
2017-08-09 14:20:37 +02:00 |
|
Pierre Bondoerffer
|
a4aeada585
|
make the file dialog placeholder visible, center file list
|
2017-08-09 11:20:46 +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 |
|
Pierre Bondoerffer
|
34ba673cd3
|
improve file upload UI
|
2017-08-09 10:54:20 +02:00 |
|
ansuz
|
34a5a32c44
|
lint compliance
|
2017-08-08 20:29:02 +02:00 |
|
ansuz
|
cdf3cee9c8
|
split out message rendering into ui
|
2017-08-08 18:21:03 +02:00 |
|
ansuz
|
fcdfa52aa9
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-08 17:13:38 +02:00 |
|
ansuz
|
58b3b32cc3
|
big messaging refactor. split UI from logic
|
2017-08-08 17:13:10 +02:00 |
|
Pierre Bondoerffer
|
6ca6755d02
|
more missing titles in toolbar
|
2017-08-08 16:51:23 +02:00 |
|
Pierre Bondoerffer
|
d3f2398865
|
bump tippy to 1.2.0, add dynamicTitle option
|
2017-08-08 16:19:44 +02:00 |
|
ansuz
|
8301bd44be
|
Merge pull request #164 from pbondoer/staging
UI improvements
|
2017-08-08 14:46:25 +02:00 |
|
Pierre Bondoerffer
|
f585ddccdf
|
fix image sizes in /slide/
|
2017-08-08 11:44:01 +02:00 |
|
ansuz
|
fc95f1b6a8
|
lint compliance
|
2017-08-08 10:32:25 +02:00 |
|
ansuz
|
ba9696ba33
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-08 10:03:54 +02:00 |
|
Caleb James DeLisle
|
a612f02be2
|
Merge branch 'staging' into pad2
|
2017-08-07 17:49:03 +02:00 |
|
ansuz
|
c63807fd2b
|
implement channel.send
|
2017-08-07 17:24:16 +02:00 |
|
Caleb James DeLisle
|
35a55a15ed
|
wip
|
2017-08-07 17:23:28 +02:00 |
|
ansuz
|
d835005905
|
simplify in-memory message format
|
2017-08-07 17:22:56 +02:00 |
|
Pierre Bondoerffer
|
8f285eba9f
|
make file picker ui even prettier
|
2017-08-07 17:22:54 +02:00 |
|
ansuz
|
797cc2b105
|
handle messages which fail to decrypt
|
2017-08-07 17:21:23 +02:00 |
|
Caleb James DeLisle
|
65dfd99171
|
major wip
|
2017-08-07 16:27:57 +02:00 |
|
Pierre Bondoerffer
|
c53e738054
|
improve file picker ui
|
2017-08-07 16:27:29 +02:00 |
|
ansuz
|
bad5160885
|
fix bad reference
|
2017-08-05 09:14:36 +02:00 |
|
ansuz
|
05aa5ed347
|
hide new feature until it is finished
|
2017-08-04 18:07:47 +02:00 |
|
ansuz
|
395f6e1b27
|
reset confirm text for alertify
|
2017-08-04 15:54:15 +02:00 |
|
ansuz
|
9865359bb0
|
don't tell users about new versions
|
2017-08-04 14:05:00 +02:00 |
|
ansuz
|
c8c44d3bfc
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-04 11:22:22 +02:00 |
|
Caleb James DeLisle
|
0d1f19f5d4
|
Big manual merge
|
2017-08-04 11:20:17 +02:00 |
|
Pierre Bondoerffer
|
f6d45d05f6
|
use logo in toolbar
|
2017-08-04 11:01:26 +02:00 |
|
ansuz
|
11c72499a0
|
don't add duplicate messages to the history
|
2017-08-03 17:06:28 +02:00 |
|
ansuz
|
52854c5a8e
|
ignore history range responses
|
2017-08-03 15:05:04 +02:00 |
|
ansuz
|
e786117110
|
get new messages when reconnecting and WIP get more history
|
2017-08-03 15:04:29 +02:00 |
|
ansuz
|
2ce341fed6
|
disable input field when disconnected
|
2017-08-03 14:12:07 +02:00 |
|
ansuz
|
66d81429bd
|
integrate file embed into code editor
|
2017-08-03 11:47:54 +02:00 |
|
ansuz
|
8b0831ac5d
|
save images drawn with whiteboard to your CryptDrive
|
2017-08-02 16:51:41 +02:00 |
|
ansuz
|
fe826133b3
|
make some markdown styles reusable
|
2017-08-02 11:03:06 +02:00 |
|