 ansuz
|
c3741f847d
|
resolve conflicts from merge with staging
|
2018-06-20 14:29:13 +02:00 |
|
|
ansuz
|
d03339f20b
|
check for the presence of a blockHash in localStorage when logging in
|
2018-06-20 14:27:44 +02:00 |
|
|
ansuz
|
3ba0ad3cf1
|
get, set, and clear blocks from localStorage
|
2018-06-19 18:08:14 +02:00 |
|
|
ansuz
|
cb5fa72dba
|
implement removeLoginBlock rpc
|
2018-06-19 17:17:56 +02:00 |
|
|
ansuz
|
577dea4c75
|
clientside implementation of block signing and encryption
|
2018-06-19 16:38:49 +02:00 |
|
|
ansuz
|
0365092aaf
|
Merge branch 'staging' into modern-users
|
2018-06-19 11:32:41 +02:00 |
|
|
ansuz
|
9d3d8c3ba2
|
initial implementation of serverside password change RPCs
|
2018-06-19 11:31:15 +02:00 |
|
|
ansuz
|
2463dd0c9e
|
Merge branch 'soon' into staging
|
2018-06-13 13:52:58 +02:00 |
|
|
ansuz
|
42ed9d2b79
|
update changelog
|
2018-06-12 17:08:14 +02:00 |
|
|
ansuz
|
ff25929c18
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-06-12 15:50:53 +02:00 |
|
|
ansuz
|
54b52d681c
|
fix broken share menu resulting from adblock plus triggered by 'share'
|
2018-06-12 15:50:41 +02:00 |
|
|
ansuz
|
06582e06dc
|
update markup in de translation
|
2018-06-12 12:03:25 +02:00 |
|
|
ansuz
|
aa51463a9a
|
Merge branch 'soon' into staging
|
2018-06-12 12:00:51 +02:00 |
|
|
ansuz
|
4701a7f415
|
Merge branch 'features-page' into staging
|
2018-06-12 11:48:43 +02:00 |
|
|
ansuz
|
6e6020ef0d
|
rename and optimize images: thanks @MacLemon
|
2018-06-12 11:42:25 +02:00 |
|
|
ansuz
|
eb49f53884
|
standardize indentation
|
2018-06-12 11:32:09 +02:00 |
|
|
ansuz
|
8def11bea3
|
define style by class instead of structure
|
2018-06-12 11:21:12 +02:00 |
|
|
ansuz
|
9e4fdb7e83
|
prefix classes with cp
|
2018-06-11 16:35:19 +02:00 |
|
|
ansuz
|
a109deadc3
|
remove package-lock.json
|
2018-06-11 16:28:12 +02:00 |
|
|
ansuz
|
5a549f75a6
|
increment version
|
2018-06-11 15:15:03 +02:00 |
|
|
ansuz
|
756681211b
|
update home page icons, allow for customization
|
2018-06-08 17:06:50 +02:00 |
|
|
ansuz
|
5ae7cdb1e6
|
add missing key for french translation
|
2018-06-08 14:56:11 +02:00 |
|
|
ansuz
|
b0039e35d0
|
add missing translation key for kanban
|
2018-06-08 14:38:44 +02:00 |
|
|
ansuz
|
eac7d38655
|
test media-tag, and fix the bug the tests exposed
|
2018-06-07 14:29:09 +02:00 |
|
|
ansuz
|
56836b2e28
|
update changelog
|
2018-06-01 11:54:24 +02:00 |
|
|
ansuz
|
bd66c8fee8
|
hacks to handle weird entries in drive
|
2018-05-18 10:28:31 +02:00 |
|
|
ansuz
|
2170fcb9ad
|
Merge branch 'kanban' into staging
|
2018-05-18 10:19:55 +02:00 |
|
|
ansuz
|
a55391d771
|
bump version
|
2018-05-17 18:26:52 +02:00 |
|
|
ansuz
|
818aa45a3a
|
update changelog for v2.1.0
|
2018-05-17 18:16:06 +02:00 |
|
|
ansuz
|
f218a9c119
|
correct a copy-pasted comment
|
2018-05-17 16:10:53 +02:00 |
|
|
ansuz
|
ad39d53d70
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
2018-05-17 12:26:37 +02:00 |
|
|
ansuz
|
65a53b150c
|
Merge branch 'soon'
|
2018-05-17 12:26:26 +02:00 |
|
|
ansuz
|
4ad0ba5c4a
|
Merge branch 'soon'
|
2018-05-17 11:00:57 +02:00 |
|
|
ansuz
|
57f2e26d8a
|
Merge branch 'staging' into soon
|
2018-05-17 11:00:37 +02:00 |
|
|
ansuz
|
534d5ae006
|
bump version
|
2018-05-17 10:41:17 +02:00 |
|
|
ansuz
|
d950b34bdf
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-05-17 10:35:59 +02:00 |
|
|
ansuz
|
fb91f5df76
|
compare flat-dom output against hyperjson
|
2018-05-17 10:35:48 +02:00 |
|
|
ansuz
|
c9fe0b993e
|
update changelog for v2.0.0
|
2018-05-04 10:37:22 +02:00 |
|
|
ansuz
|
4c747e013f
|
on second thought that was a bad idea
|
2018-05-03 18:46:45 +02:00 |
|
|
ansuz
|
8ec9021f89
|
clear stuck tooltips in an interval
|
2018-05-03 18:45:19 +02:00 |
|
|
ansuz
|
67fd70b4c7
|
use mtime instead of atime for expiration
|
2018-05-03 14:03:56 +02:00 |
|
|
ansuz
|
8d3545d217
|
comments :D
|
2018-05-03 11:56:03 +02:00 |
|
|
ansuz
|
381d4ac191
|
make resets explicit
|
2018-05-03 11:08:56 +02:00 |
|
|
ansuz
|
89fb718572
|
Merge branch 'soon'
|
2018-05-03 10:19:36 +02:00 |
|
|
ansuz
|
b9a74c2119
|
hide visible effects of race condition, leave a note to remember to fix it
|
2018-05-03 10:19:14 +02:00 |
|
|
ansuz
|
ac09ba65ce
|
strip both old and new style checkpoint labels before decrypting when fetching history
|
2018-05-02 14:39:06 +02:00 |
|
|
ansuz
|
3eb199bca7
|
bump version to 2.0.0
|
2018-05-02 11:44:12 +02:00 |
|
|
ansuz
|
123612b893
|
Merge branch 'de-translation-pl' into staging
|
2018-05-02 11:09:22 +02:00 |
|
|
ansuz
|
8b13bd0be5
|
lint compliance and merge
|
2018-05-02 11:07:28 +02:00 |
|
|
ansuz
|
de768869eb
|
add missing semicolons
|
2018-05-02 10:56:02 +02:00 |
|
|
ansuz
|
e5c35f457c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-05-02 10:46:09 +02:00 |
|
|
ansuz
|
699a635746
|
add trailing slash when redirecting to drive
|
2018-04-30 11:47:53 +02:00 |
|
|
ansuz
|
41583b7858
|
Merge branch 'checkpoint-bug' into merge-checkpoint-bug
|
2018-04-27 17:45:26 +02:00 |
|
|
ansuz
|
43b8873c9e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-04-19 11:14:07 +02:00 |
|
|
ansuz
|
6f1c2d5701
|
add leading space before 'domain' in config.example.js
|
2018-04-12 17:39:17 +02:00 |
|
|
ansuz
|
bc35c3349f
|
set content-type headers for the 404 page
|
2018-04-12 17:24:51 +02:00 |
|
|
ansuz
|
a4674e40e1
|
fix bug in register page which locks up the registration form
|
2018-04-12 14:33:47 +02:00 |
|
|
ansuz
|
d0eeefc04c
|
update clientside dependencies
|
2018-04-12 11:57:49 +02:00 |
|
|
ansuz
|
f276915712
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-04-04 15:07:41 +02:00 |
|
|
ansuz
|
92fe555cb5
|
update footer and package.json
|
2018-04-04 15:02:28 +02:00 |
|
|
ansuz
|
b323989347
|
remove extraneous console statements
|
2018-04-04 14:49:33 +02:00 |
|
|
ansuz
|
c24c06e90c
|
sign with your global private signing key
|
2018-04-04 14:17:48 +02:00 |
|
|
ansuz
|
ee46a4e862
|
remove some unnecessary checks for file-crypto and make encryption properly async
|
2018-03-26 18:30:52 +02:00 |
|
|
ansuz
|
8c4ed76fa7
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-03-23 18:05:33 +01:00 |
|
|
ansuz
|
1f700a8374
|
fix confusing error message
|
2018-03-23 18:05:16 +01:00 |
|
|
ansuz
|
8230c471cd
|
add npm dependency for sortify
|
2018-03-20 11:31:37 +01:00 |
|
|
ansuz
|
7c072aeccb
|
add remove-pins rpc
|
2018-03-20 11:16:18 +01:00 |
|
|
ansuz
|
ed8f9e4e3f
|
remove XXX after review
|
2018-03-20 11:15:44 +01:00 |
|
|
ansuz
|
bc3fe4f32c
|
update version in footer and package.json
|
2018-03-20 11:14:55 +01:00 |
|
|
ansuz
|
11b0781717
|
delete unused code
|
2018-03-20 10:44:26 +01:00 |
|
|
ansuz
|
bd6b6dcb49
|
actually fix weird checkbox logic, and lint compliance
|
2018-03-19 17:13:44 +01:00 |
|
|
ansuz
|
dc783ce3e4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-03-19 16:56:15 +01:00 |
|
|
ansuz
|
96a63a3b7b
|
fix weird checkbox logic in share menu
|
2018-03-19 16:56:09 +01:00 |
|
|
ansuz
|
5b21911341
|
pass flow tests
|
2018-03-16 12:26:39 +01:00 |
|
|
ansuz
|
b2df2ba341
|
prototype owned file upload
|
2018-03-12 17:50:47 +01:00 |
|
|
ansuz
|
7dc7d5d950
|
lint compliance
|
2018-03-09 12:12:47 +01:00 |
|
|
ansuz
|
64afcb7c0b
|
comment out busyloop workaround for tippyjs
|
2018-03-09 10:12:12 +01:00 |
|
|
ansuz
|
ca65e6e54a
|
Merge branch 'soon'
|
2018-03-09 10:07:38 +01:00 |
|
|
ansuz
|
03ae9d5714
|
Merge branch 'soon'
|
2018-03-08 16:38:16 +01:00 |
|
|
ansuz
|
5f08ad2ea1
|
fix mangled 404 translation
|
2018-03-08 16:27:41 +01:00 |
|
|
ansuz
|
34d5c04eb4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-03-08 16:08:33 +01:00 |
|
|
ansuz
|
7091dfb669
|
standardize naming for the drawer, and reorder poll description
|
2018-03-08 16:05:47 +01:00 |
|
|
ansuz
|
82329dbe70
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-03-08 15:06:30 +01:00 |
|
|
ansuz
|
ec19b82609
|
add new help text
|
2018-03-08 15:06:22 +01:00 |
|
|
ansuz
|
71f519f982
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-03-07 17:49:57 +01:00 |
|
|
ansuz
|
4262c8e6e4
|
correct french grammar
|
2018-03-07 17:49:38 +01:00 |
|
|
ansuz
|
c7e4db7f38
|
transcribe english faq
|
2018-03-07 17:48:44 +01:00 |
|
|
ansuz
|
1452d65bd4
|
fix missing section in privacy policy
|
2018-03-07 12:08:02 +01:00 |
|
|
ansuz
|
0af90ef88d
|
resolve merge conflict
|
2018-03-05 15:00:57 +01:00 |
|
|
ansuz
|
3d66822473
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-03-05 14:52:24 +01:00 |
|
|
ansuz
|
fdf2899e88
|
@kpcyrd said I should update this
|
2018-03-05 14:51:22 +01:00 |
|
|
ansuz
|
66d83dc045
|
update version
|
2018-02-27 15:13:39 +01:00 |
|
|
ansuz
|
c1a609e1d3
|
Merge branch 'soon'
|
2018-02-16 18:04:52 +01:00 |
|
|
ansuz
|
7cf8bdb841
|
Merge branch 'soon'
|
2018-02-16 17:08:38 +01:00 |
|
|
ansuz
|
91437c558e
|
fix weird messages
|
2018-02-16 17:06:11 +01:00 |
|
|
ansuz
|
4426631793
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-02-16 16:13:17 +01:00 |
|
|
ansuz
|
11fabea327
|
update footer and package.json version
|
2018-02-16 16:13:01 +01:00 |
|
|
ansuz
|
1191c14a29
|
lint compliance
|
2018-02-08 11:11:51 +01:00 |
|
|
ansuz
|
f8399eaaa6
|
avoid concatenating 'undefined' in drive interface
|
2018-02-08 11:08:10 +01:00 |
|
|
ansuz
|
d676a5e7db
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into keywords
|
2018-02-07 11:14:19 +01:00 |
|