ansuz
|
c80c97d7db
|
lint compliance
|
2017-12-01 13:23:23 +01:00 |
|
ansuz
|
82cd822b29
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-12-01 11:51:17 +01:00 |
|
ansuz
|
bcdc0d810a
|
make 404 page translateable, point to home page or drive
|
2017-12-01 11:51:04 +01:00 |
|
yflory
|
bd85f1b003
|
Fix file upload and remove unnecessary dependencies
|
2017-12-01 10:16:48 +01:00 |
|
ansuz
|
b5516ddcd0
|
send 404 page from server
|
2017-11-30 19:19:21 +01:00 |
|
ansuz
|
443eeaa407
|
fancy 404 page
|
2017-11-30 19:17:59 +01:00 |
|
Caleb James DeLisle
|
7544bb1ced
|
Fix a few issues with RPC which I managed to verschlumbesserung
|
2017-11-30 18:48:19 +01:00 |
|
Caleb James DeLisle
|
7c8572c99d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-11-30 18:32:27 +01:00 |
|
Caleb James DeLisle
|
5187b3f26c
|
Flow compliance and fix a few bugs in rpc.js
|
2017-11-30 18:32:20 +01:00 |
|
yflory
|
664625a6ef
|
Fix more async store issues
|
2017-11-30 18:22:26 +01:00 |
|
yflory
|
d1277d7026
|
Merge branch 'staging' into refactor2
|
2017-11-30 17:25:23 +01:00 |
|
ansuz
|
aca83ce72a
|
expose self as global for linter
|
2017-11-30 17:25:05 +01:00 |
|
ansuz
|
3f892e04a5
|
fix codemirror overflow css
|
2017-11-30 17:24:43 +01:00 |
|
yflory
|
5c3237e093
|
Fix issues with the async store
|
2017-11-30 17:21:58 +01:00 |
|
yflory
|
b3688db202
|
Use async store
|
2017-11-30 15:01:17 +01:00 |
|
yflory
|
0840570fbf
|
Async store part 1
|
2017-11-30 10:33:09 +01:00 |
|
ansuz
|
96cf83af34
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-11-27 18:26:11 +01:00 |
|
ansuz
|
385ac9607c
|
pass 'self' into common-util instead of using window
|
2017-11-27 18:26:04 +01:00 |
|
yflory
|
f0dca50c62
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-11-27 18:10:49 +01:00 |
|
yflory
|
acd8ab7446
|
Add the markdown toolbar in profile
|
2017-11-27 18:10:37 +01:00 |
|
ansuz
|
97d56303bc
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-11-27 17:59:07 +01:00 |
|
ansuz
|
1d0da582b4
|
update bower.json
|
2017-11-27 17:58:50 +01:00 |
|
yflory
|
b0a384e8e0
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-11-27 17:55:48 +01:00 |
|
yflory
|
74e59a513a
|
Add the markdown toolbar to the slide and poll apps
|
2017-11-27 17:55:20 +01:00 |
|
ansuz
|
22c5ff757b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-11-27 15:05:07 +01:00 |
|
ansuz
|
650d26afea
|
use unified listmap in profile app
|
2017-11-27 15:04:59 +01:00 |
|
yflory
|
68d602f74a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-11-27 14:44:57 +01:00 |
|
yflory
|
644f6e9985
|
Use the bounce app to open links from inner
|
2017-11-27 14:44:44 +01:00 |
|
ansuz
|
5eacc158d9
|
make tests pass again
|
2017-11-27 13:45:40 +01:00 |
|
ansuz
|
812df7de6f
|
Merge branch 'merge-staging' into staging
|
2017-11-27 12:18:34 +01:00 |
|
ansuz
|
be5c5831dd
|
lint compliance
|
2017-11-27 12:18:04 +01:00 |
|
yflory
|
444ba91287
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-11-27 12:17:46 +01:00 |
|
yflory
|
b0f553e9ea
|
Add a markdown toolbar to help with the markdown syntax
|
2017-11-27 12:17:35 +01:00 |
|
ansuz
|
77c81f2426
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into merge-staging
|
2017-11-27 12:16:47 +01:00 |
|
ansuz
|
4ff4ccd1d3
|
use faster and more correct 'find' implementation
|
2017-11-27 11:30:50 +01:00 |
|
ansuz
|
e3f04ef076
|
Merge branch 'soon' into staging
|
2017-11-27 11:11:49 +01:00 |
|
ansuz
|
71cf3a4ddf
|
fix creation of personal todo list
|
2017-11-27 11:09:28 +01:00 |
|
ansuz
|
701af29192
|
fix broken register/login process
|
2017-11-24 15:12:00 +01:00 |
|
ansuz
|
a3c093838c
|
merge latest staging and resolve conflicts
|
2017-11-24 13:46:59 +01:00 |
|
ansuz
|
56102d3689
|
use unified listmap
|
2017-11-24 13:40:21 +01:00 |
|
ansuz
|
661db129b2
|
lint compliance
|
2017-11-24 10:32:58 +01:00 |
|
ansuz
|
80978377f2
|
return transformed cursor value
|
2017-11-24 10:03:45 +01:00 |
|
ansuz
|
2e00214783
|
drop unreachable code
|
2017-11-23 16:57:01 +01:00 |
|
ansuz
|
ee6c2097f5
|
resolve merge conflicts
|
2017-11-23 16:56:49 +01:00 |
|
yflory
|
9795ac32cb
|
Ability to burn an anonymous drive from the browser
|
2017-11-23 14:36:42 +01:00 |
|
yflory
|
4b5abdecbe
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-11-23 12:29:32 +01:00 |
|
yflory
|
280a7c2765
|
Clean cryptpad-common
|
2017-11-23 12:28:49 +01:00 |
|
ansuz
|
1e9856647e
|
lint compliance
|
2017-11-22 17:40:00 +01:00 |
|
ansuz
|
98c2b0c802
|
Merge branch 'soon' into staging
|
2017-11-22 17:38:49 +01:00 |
|
ansuz
|
3ff0eb116b
|
don't let search interfere with renaming
|
2017-11-22 17:23:14 +01:00 |