Caleb James DeLisle
|
96a5b5bbc1
|
Merge branch 'soon' into staging
|
2017-05-31 15:01:09 +02:00 |
|
Caleb James DeLisle
|
f37b313efc
|
jshint node=true
|
2017-05-31 15:00:41 +02:00 |
|
Caleb James DeLisle
|
69a72d71de
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-31 13:05:56 +02:00 |
|
Caleb James DeLisle
|
5050023b6a
|
pinneddata can now show you what is unpinned
|
2017-05-31 13:05:49 +02:00 |
|
ansuz
|
3465710237
|
Merge branch 'mediatag' of https://github.com/Regzox/cryptpad into tag
|
2017-05-31 12:55:05 +02:00 |
|
ansuz
|
82f5d3c96f
|
abstract checks for authenticated RPCs
|
2017-05-31 12:51:26 +02:00 |
|
Daniel RADEAU
|
8ab9248a78
|
Fix ES6
|
2017-05-31 12:42:37 +02:00 |
|
ansuz
|
d774f8771b
|
remove more unused files
|
2017-05-31 12:23:31 +02:00 |
|
ansuz
|
540304807c
|
remove unused files
|
2017-05-31 12:11:33 +02:00 |
|
Daniel RADEAU
|
21c39572be
|
Update media-tag and fix bower dependencies
|
2017-05-31 11:53:25 +02:00 |
|
ansuz
|
f9023185c1
|
move documentation into docs folder
|
2017-05-31 10:10:33 +02:00 |
|
ansuz
|
1c04af5b30
|
add disclaimer to top of example nginx config
|
2017-05-31 10:07:58 +02:00 |
|
ansuz
|
daf112a5b5
|
take api settings into account for upgrade button
|
2017-05-30 20:11:15 +02:00 |
|
ansuz
|
ebfa228bc0
|
add upgrade button to all static pages
|
2017-05-30 18:39:41 +02:00 |
|
ansuz
|
149568689a
|
color donate button green
|
2017-05-30 17:58:31 +02:00 |
|
ansuz
|
ec6ad6772b
|
send feedback on donation
|
2017-05-30 17:25:36 +02:00 |
|
Daniel RADEAU
|
cb2efe138b
|
Media Tag integration, image, audio, video, pdf
|
2017-05-30 16:36:06 +02:00 |
|
ansuz
|
8507f77116
|
throw if adminEmail and allowSubscriptions are not compatible
|
2017-05-30 16:27:42 +02:00 |
|
ansuz
|
76c530037b
|
enable donate button in all apps
|
2017-05-30 15:51:07 +02:00 |
|
ansuz
|
9ca5bc507e
|
add support for donate button
|
2017-05-30 15:42:53 +02:00 |
|
ansuz
|
909bc2ebf3
|
add new translation key
|
2017-05-30 15:39:13 +02:00 |
|
ansuz
|
605377cf31
|
update default configuration file with new attributes and comments
|
2017-05-30 15:35:51 +02:00 |
|
ansuz
|
a70014dd11
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-30 10:46:17 +02:00 |
|
ansuz
|
99a44f119f
|
don't send referrer headers on pads which may link outward
|
2017-05-30 10:44:40 +02:00 |
|
ansuz
|
75874424cf
|
add 'support cryptpad' translation key
|
2017-05-30 10:41:46 +02:00 |
|
ansuz
|
92a7970eb8
|
fix merge conflicts
|
2017-05-29 19:04:47 +02:00 |
|
ansuz
|
a15ef44a12
|
Merge pull request #126 from pbondoer/spanish
Spanish new keys
|
2017-05-29 18:55:04 +02:00 |
|
Pierre Bondoerffer
|
0a92719763
|
spanish! new keys ahoy
|
2017-05-29 18:25:18 +02:00 |
|
ansuz
|
c4f8286be6
|
add timestamp to rpc error logs
|
2017-05-29 17:35:13 +02:00 |
|
ansuz
|
1240b864ef
|
fix misconfigured history
|
2017-05-29 17:25:06 +02:00 |
|
Pierre Bondoerffer
|
6518b56945
|
poll: french messages
|
2017-05-29 16:50:25 +02:00 |
|
Pierre Bondoerffer
|
f434f002c4
|
poll: make locks clickable
|
2017-05-29 16:32:40 +02:00 |
|
ansuz
|
3915b30055
|
provide a register button on login
also direct users from file to login
|
2017-05-29 13:11:07 +02:00 |
|
Pierre Bondoerffer
|
b6bb576a34
|
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into newpoll
|
2017-05-29 12:59:49 +02:00 |
|
ansuz
|
b910915d47
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-29 11:33:03 +02:00 |
|
ansuz
|
6573813523
|
Merge branch 'soon' into staging
|
2017-05-29 11:32:54 +02:00 |
|
ansuz
|
41a8604cb8
|
Merge pull request #122 from superniko/patch-2
Update messages.ro.js
|
2017-05-29 10:48:24 +02:00 |
|
Caleb James DeLisle
|
66520b6041
|
cleaned up the accounts, limits and revenue sharing and unified the config in one place
|
2017-05-26 18:09:31 +02:00 |
|
Pierre Bondoerffer
|
1092285a68
|
merge master
|
2017-05-26 16:18:51 +02:00 |
|
Caleb James DeLisle
|
6c1861dbc6
|
Merge branch 'soon' into staging
|
2017-05-26 15:48:44 +02:00 |
|
superniko
|
0559b8cb77
|
Update messages.ro.js
|
2017-05-26 16:47:45 +03:00 |
|
Caleb James DeLisle
|
9068a8ed58
|
Merge branch 'patch-1' of git://github.com/superniko/cryptpad into soon
|
2017-05-26 15:36:44 +02:00 |
|
Caleb James DeLisle
|
2ecf257fcd
|
Sync localStorage with sessionStorage in auth because safari...
|
2017-05-26 15:30:01 +02:00 |
|
ansuz
|
3f3d64992d
|
resolve merge conflicts
|
2017-05-26 12:44:58 +02:00 |
|
ansuz
|
57017c68fa
|
hacks for cross-domain safari
|
2017-05-26 12:42:12 +02:00 |
|
ansuz
|
cf658c1b3a
|
backport live changes
|
2017-05-26 12:41:30 +02:00 |
|
superniko
|
70fbbe0078
|
Update messages.ro.js
|
2017-05-25 10:23:27 +03:00 |
|
ansuz
|
a04f179d8b
|
hide preview mode on phones
|
2017-05-24 19:00:14 +02:00 |
|
yflory
|
df2b00122a
|
New drive structure without file names
|
2017-05-24 18:59:44 +02:00 |
|
ansuz
|
dc2b0ae6b4
|
jshint compliance
|
2017-05-24 18:45:48 +02:00 |