ec6ad6772b
send feedback on donation
2017-05-30 17:25:36 +02:00
cb2efe138b
Media Tag integration, image, audio, video, pdf
2017-05-30 16:36:06 +02:00
8507f77116
throw if adminEmail and allowSubscriptions are not compatible
2017-05-30 16:27:42 +02:00
76c530037b
enable donate button in all apps
2017-05-30 15:51:07 +02:00
9ca5bc507e
add support for donate button
2017-05-30 15:42:53 +02:00
909bc2ebf3
add new translation key
2017-05-30 15:39:13 +02:00
605377cf31
update default configuration file with new attributes and comments
2017-05-30 15:35:51 +02:00
81b931e56f
Update messages.pt-br.js
2017-05-30 09:45:14 -03:00
a70014dd11
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-30 10:46:17 +02:00
99a44f119f
don't send referrer headers on pads which may link outward
2017-05-30 10:44:40 +02:00
75874424cf
add 'support cryptpad' translation key
2017-05-30 10:41:46 +02:00
08619e733a
Partial translation + duplicated token fix
...
Partial translation + duplicated token fix
2017-05-29 15:19:04 -03:00
2d2e00b569
Merged translated and non-translated in pt-BR
...
I've merged the new tokens on the old translation in order to get a better understanding when updating the Brazilian Portuguese translation. It ran fine locally.
2017-05-29 14:43:15 -03:00
92a7970eb8
fix merge conflicts
2017-05-29 19:04:47 +02:00
a15ef44a12
Merge pull request #126 from pbondoer/spanish
...
Spanish new keys
2017-05-29 18:55:04 +02:00
0a92719763
spanish! new keys ahoy
2017-05-29 18:25:18 +02:00
c4f8286be6
add timestamp to rpc error logs
2017-05-29 17:35:13 +02:00
1240b864ef
fix misconfigured history
2017-05-29 17:25:06 +02:00
6518b56945
poll: french messages
2017-05-29 16:50:25 +02:00
f434f002c4
poll: make locks clickable
2017-05-29 16:32:40 +02:00
3915b30055
provide a register button on login
...
also direct users from file to login
2017-05-29 13:11:07 +02:00
b6bb576a34
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into newpoll
2017-05-29 12:59:49 +02:00
b910915d47
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-29 11:33:03 +02:00
6573813523
Merge branch 'soon' into staging
2017-05-29 11:32:54 +02:00
41a8604cb8
Merge pull request #122 from superniko/patch-2
...
Update messages.ro.js
2017-05-29 10:48:24 +02:00
66520b6041
cleaned up the accounts, limits and revenue sharing and unified the config in one place
2017-05-26 18:09:31 +02:00
1092285a68
merge master
2017-05-26 16:18:51 +02:00
6c1861dbc6
Merge branch 'soon' into staging
2017-05-26 15:48:44 +02:00
0559b8cb77
Update messages.ro.js
2017-05-26 16:47:45 +03:00
9068a8ed58
Merge branch 'patch-1' of git://github.com/superniko/cryptpad into soon
2017-05-26 15:36:44 +02:00
2ecf257fcd
Sync localStorage with sessionStorage in auth because safari...
2017-05-26 15:30:01 +02:00
3f3d64992d
resolve merge conflicts
2017-05-26 12:44:58 +02:00
57017c68fa
hacks for cross-domain safari
2017-05-26 12:42:12 +02:00
cf658c1b3a
backport live changes
2017-05-26 12:41:30 +02:00
70fbbe0078
Update messages.ro.js
2017-05-25 10:23:27 +03:00
a04f179d8b
hide preview mode on phones
2017-05-24 19:00:14 +02:00
df2b00122a
New drive structure without file names
2017-05-24 18:59:44 +02:00
dc2b0ae6b4
jshint compliance
2017-05-24 18:45:48 +02:00
b32c329269
remember whether you were using preview mode for a pad
2017-05-24 18:41:19 +02:00
d9f7470f06
copy user details into sessionStorage for safari
2017-05-24 18:28:16 +02:00
a5ffd278a7
write styles for code in .less
2017-05-24 17:27:03 +02:00
3803f6a20f
only render preview if preview container is visible
2017-05-24 17:25:33 +02:00
617e027f12
catch markdown preview errors
2017-05-24 15:50:35 +02:00
bc26f7fc4e
Merge branch 'soon' into staging
2017-05-24 15:04:40 +02:00
70c1061f47
Fix romanian translation
2017-05-24 14:49:00 +02:00
83c0a6d37d
Romanian translation
2017-05-24 14:37:13 +02:00
c5bb830757
don't preview if hightlight mode is not markdown
2017-05-24 14:21:31 +02:00
fd83ae3e61
implement createRandomInteger
2017-05-24 11:34:40 +02:00
4d9060f49e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-24 11:28:06 +02:00
378bf2aa94
yflory's word wrap fix
2017-05-24 11:27:31 +02:00
ansuz