yflory
|
36550b781f
|
Don't check for stronger hash if we have an edit hash
|
2018-01-26 15:44:38 +01:00 |
|
ansuz
|
0747cd0563
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-26 15:24:21 +01:00 |
|
ansuz
|
b4b51ed86a
|
add a subsystem for scheduling tasks
|
2018-01-26 15:24:07 +01:00 |
|
yflory
|
462c229b17
|
Add links to features table
|
2018-01-26 12:52:25 +01:00 |
|
yflory
|
86144eda22
|
Display a message about pads deleted from the server
|
2018-01-26 12:26:58 +01:00 |
|
yflory
|
7f21b8a566
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-25 17:54:34 +01:00 |
|
yflory
|
9a317018e2
|
Remove deleted pads from the drive
|
2018-01-25 17:54:21 +01:00 |
|
ansuz
|
89ab37f1bf
|
Merge pull request #222 from kpcyrd/docker-fix
Fix docker build
|
2018-01-25 14:56:03 +01:00 |
|
yflory
|
e50b99d5f7
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-25 14:21:08 +01:00 |
|
yflory
|
3d3f58b3fc
|
Improve share modal customization to make it work with async functions
|
2018-01-25 14:20:55 +01:00 |
|
kpcyrd
|
d2b0c8a5cd
|
Add docker build to travis tests
|
2018-01-25 14:04:55 +01:00 |
|
kpcyrd
|
8dd1c97d6c
|
Fix docker build
|
2018-01-25 14:04:55 +01:00 |
|
ansuz
|
1817a7924f
|
don't require heapdump by default
|
2018-01-25 12:17:35 +01:00 |
|
yflory
|
fd4ed3ce3b
|
Fix subscription button in settings
|
2018-01-25 12:14:46 +01:00 |
|
yflory
|
548a32090e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-25 12:09:36 +01:00 |
|
yflory
|
4d0312115a
|
Add a link to the account server for subscribers in settings
|
2018-01-25 12:09:20 +01:00 |
|
ansuz
|
2b8414ca78
|
provide hints for running CryptPad
|
2018-01-24 16:16:46 +01:00 |
|
ansuz
|
80cd3e208a
|
lint compliance
|
2018-01-24 11:35:05 +01:00 |
|
ansuz
|
a5b7b0191f
|
correct validation for 'channelName'
|
2018-01-24 11:31:34 +01:00 |
|
ansuz
|
4e8335bfdd
|
fix support for custom button classes
|
2018-01-24 11:01:15 +01:00 |
|
yflory
|
c50b8dd3e9
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-23 19:03:45 +01:00 |
|
yflory
|
166a9e71cf
|
Add a features comparison page
|
2018-01-23 19:03:31 +01:00 |
|
Caleb James DeLisle
|
a3a739e504
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-23 18:54:57 +01:00 |
|
Caleb James DeLisle
|
b63d1527a0
|
Small bit of better logging
|
2018-01-23 18:54:52 +01:00 |
|
yflory
|
2995782079
|
Different colors for ok and cancel in alertify
|
2018-01-23 17:02:32 +01:00 |
|
ansuz
|
8d87a66284
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-23 16:42:08 +01:00 |
|
ansuz
|
acd5574008
|
send httpUnsafeOrigin via /api/config
|
2018-01-23 16:41:54 +01:00 |
|
Caleb James DeLisle
|
4de6bd6195
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-23 16:32:05 +01:00 |
|
Caleb James DeLisle
|
014aacc76a
|
Added a new RPC to get file offsets of messages by hash or of last 2 checkpoints, also improved checking of valid channel names and fixed a pull-stream bug and exposed async-store to the window
|
2018-01-23 16:31:59 +01:00 |
|
yflory
|
35d65e248f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-23 15:57:17 +01:00 |
|
yflory
|
8628f2831e
|
Fix 404 page inside iframe
|
2018-01-23 15:53:00 +01:00 |
|
ansuz
|
044384a576
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-23 15:51:37 +01:00 |
|
yflory
|
30c6ab4717
|
Add meta description tag
|
2018-01-23 15:17:06 +01:00 |
|
yflory
|
492fcf0bb6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-23 14:36:20 +01:00 |
|
yflory
|
69c33e2f83
|
Ability to disable profile
|
2018-01-23 14:24:40 +01:00 |
|
Caleb James DeLisle
|
1f34e47cbf
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-23 14:15:44 +01:00 |
|
Caleb James DeLisle
|
b3a873bbc9
|
Fix flow
|
2018-01-23 14:15:38 +01:00 |
|
yflory
|
a34e227d37
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-23 13:48:38 +01:00 |
|
yflory
|
51587d1006
|
Ability to disable feedback on the entire instance
|
2018-01-23 13:47:30 +01:00 |
|
Caleb James DeLisle
|
88f3e730b9
|
Update package.json and sync file.js
|
2018-01-23 12:18:08 +01:00 |
|
yflory
|
006d99e19a
|
Fix undefined friends
|
2018-01-23 12:09:54 +01:00 |
|
yflory
|
af2bde27c6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-22 16:56:55 +01:00 |
|
yflory
|
c90ba890ca
|
Add more configurable options and add a new way to use custom config
|
2018-01-22 16:56:37 +01:00 |
|
ansuz
|
ffa392a7e2
|
Merge pull request #221 from ryanpcmcquen/patch-1
Fix Org mode regex.
|
2018-01-22 10:44:33 +01:00 |
|
yflory
|
a790dd0398
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-19 17:04:08 +01:00 |
|
yflory
|
2e436f16c9
|
Refactor context menu in drive
|
2018-01-19 17:03:58 +01:00 |
|
ansuz
|
3c1779a667
|
give function a more sensible name
|
2018-01-19 10:27:16 +01:00 |
|
ansuz
|
5114292b43
|
implement 'removeOwnedChannel' rpc and...
additional checks for rpc permissions
|
2018-01-19 10:26:21 +01:00 |
|
ansuz
|
544a26f6b3
|
fix a typo
|
2018-01-19 10:25:29 +01:00 |
|
Ryan P.C. McQuen
|
ff4a49d59b
|
Fix Org mode regex.
More details here: https://github.com/mickael-kerjean/nuage/pull/16
|
2018-01-18 08:32:37 -08:00 |