Caleb James DeLisle
|
50082cfd19
|
Remove safari which is failing weirdly and fix race
|
2017-06-01 00:50:36 +02:00 |
|
Caleb James DeLisle
|
92ab8d88ba
|
accept defeat
|
2017-06-01 00:41:31 +02:00 |
|
Caleb James DeLisle
|
c8bd1bb2ac
|
Trying to improve the tests which fail always when running remotely
|
2017-06-01 00:29:17 +02:00 |
|
Caleb James DeLisle
|
71bd808e4f
|
Send everything through the test global function
|
2017-06-01 00:09:39 +02:00 |
|
Caleb James DeLisle
|
244bd7b378
|
;;;
|
2017-05-31 23:32:47 +02:00 |
|
Caleb James DeLisle
|
7d557df74b
|
a new and more horrible way of sniffing the logs out of the instance
|
2017-05-31 23:29:58 +02:00 |
|
Caleb James DeLisle
|
68296e9d23
|
one too many quote marks
|
2017-05-31 20:51:56 +02:00 |
|
Caleb James DeLisle
|
3ca41d8df7
|
Change the testing matrix
|
2017-05-31 20:49:03 +02:00 |
|
Caleb James DeLisle
|
0d4b74cfba
|
;;;;;; keep these ;;; for later ;;;;;
|
2017-05-31 19:46:23 +02:00 |
|
Caleb James DeLisle
|
24f37ea414
|
Delicious testing
|
2017-05-31 19:40:17 +02:00 |
|
ansuz
|
5e57578fa9
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
2017-05-31 18:44:55 +02:00 |
|
ansuz
|
30f66ab7ba
|
hotfix 'undefined/' bug
|
2017-05-31 18:44:44 +02:00 |
|
ansuz
|
7b94106bac
|
fix inverted conditional :/
|
2017-05-31 18:15:31 +02:00 |
|
ansuz
|
2e03485db4
|
remove known bad entries from localStorage.userHash...
|
2017-05-31 18:12:58 +02:00 |
|
ansuz
|
936bf8df9d
|
return falsey if userHash is junk
|
2017-05-31 18:08:41 +02:00 |
|
ansuz
|
105e5cdac9
|
fix 'undefined/' userHash
|
2017-05-31 18:01:12 +02:00 |
|
ansuz
|
401e908963
|
use media-tag with xhr error handling
|
2017-05-31 17:17:01 +02:00 |
|
ansuz
|
1a8c964fde
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-31 15:31:51 +02:00 |
|
ansuz
|
087bcd2ea5
|
update default config with new CSP values
|
2017-05-31 15:21:29 +02:00 |
|
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 |
|