c8bd1bb2ac
Trying to improve the tests which fail always when running remotely
2017-06-01 00:29:17 +02:00
71bd808e4f
Send everything through the test global function
2017-06-01 00:09:39 +02:00
244bd7b378
;;;
2017-05-31 23:32:47 +02:00
7d557df74b
a new and more horrible way of sniffing the logs out of the instance
2017-05-31 23:29:58 +02:00
68296e9d23
one too many quote marks
2017-05-31 20:51:56 +02:00
3ca41d8df7
Change the testing matrix
2017-05-31 20:49:03 +02:00
0d4b74cfba
;;;;;; keep these ;;; for later ;;;;;
2017-05-31 19:46:23 +02:00
24f37ea414
Delicious testing
2017-05-31 19:40:17 +02:00
5e57578fa9
Merge branch 'master' of github.com:xwiki-labs/cryptpad
2017-05-31 18:44:55 +02:00
30f66ab7ba
hotfix 'undefined/' bug
2017-05-31 18:44:44 +02:00
7b94106bac
fix inverted conditional :/
2017-05-31 18:15:31 +02:00
2e03485db4
remove known bad entries from localStorage.userHash...
2017-05-31 18:12:58 +02:00
936bf8df9d
return falsey if userHash is junk
2017-05-31 18:08:41 +02:00
105e5cdac9
fix 'undefined/' userHash
2017-05-31 18:01:12 +02:00
401e908963
use media-tag with xhr error handling
2017-05-31 17:17:01 +02:00
1a8c964fde
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-31 15:31:51 +02:00
087bcd2ea5
update default config with new CSP values
2017-05-31 15:21:29 +02:00
96a5b5bbc1
Merge branch 'soon' into staging
2017-05-31 15:01:09 +02:00
f37b313efc
jshint node=true
2017-05-31 15:00:41 +02:00
69a72d71de
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-05-31 13:05:56 +02:00
5050023b6a
pinneddata can now show you what is unpinned
2017-05-31 13:05:49 +02:00
3465710237
Merge branch 'mediatag' of https://github.com/Regzox/cryptpad into tag
2017-05-31 12:55:05 +02:00
82f5d3c96f
abstract checks for authenticated RPCs
2017-05-31 12:51:26 +02:00
8ab9248a78
Fix ES6
2017-05-31 12:42:37 +02:00
d774f8771b
remove more unused files
2017-05-31 12:23:31 +02:00
540304807c
remove unused files
2017-05-31 12:11:33 +02:00
21c39572be
Update media-tag and fix bower dependencies
2017-05-31 11:53:25 +02:00
f9023185c1
move documentation into docs folder
2017-05-31 10:10:33 +02:00
1c04af5b30
add disclaimer to top of example nginx config
2017-05-31 10:07:58 +02:00
daf112a5b5
take api settings into account for upgrade button
2017-05-30 20:11:15 +02:00
ebfa228bc0
add upgrade button to all static pages
2017-05-30 18:39:41 +02:00
149568689a
color donate button green
2017-05-30 17:58:31 +02:00
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
Caleb James DeLisle