Commit Graph

3477 Commits

Author SHA1 Message Date
shortcutme f4f0e2afa8
Allow like parameters in database queries 2019-07-10 03:14:09 +02:00
shortcutme 67d6b1e724
Fix double logging when running tests 2019-07-10 03:12:56 +02:00
shortcutme e34a9d452a
Allow filter optional files by inner path 2019-07-10 03:11:20 +02:00
ZeroNet 2819a36469
Merge pull request #2084 from tangdou1/patch-5
Update zh.json
2019-07-09 03:01:13 +02:00
tangdou1 8815b4e0c3
Update zh.json 2019-07-08 10:05:34 +08:00
ZeroNet 960635b993
Fix win download link 2019-07-08 02:51:16 +02:00
shortcutme f9dcb29e92
Remove development test version warning, add windows instuctions, remove outdated instuctions 2019-07-08 02:41:30 +02:00
ZeroNet 5a746769d0
Merge pull request #2073 from filips123/fix-infinite-reloading
Fix infinite reloading when system theme changes
2019-07-06 23:25:35 +02:00
Filip Š 87b4500467 Fix infinite reloading when system theme changes 2019-07-05 18:43:54 +02:00
ZeroNet 951e47469a
Merge pull request #2060 from imachug/default-subdir-clone
Fix siteCloning subdirectory with -default files
2019-07-05 17:13:29 +02:00
shortcutme c1db963c76
Rev4112, Fix loading screen glitch, Change unstable trackers 2019-07-04 14:39:41 +02:00
ZeroNet a252ec36f0
Merge pull request #2069 from imachug/patch-1
Guess content type correctly
2019-07-04 11:34:01 +02:00
Ivanq 33b478199a
Guess content type correctly
Fix e.g. vue.min.js being reported as text/plain instead of text/javascript.
2019-07-04 12:09:07 +03:00
shortcutme 21f285e099
Rev4111 2019-07-03 18:37:35 +02:00
shortcutme fec312ed09
Better pytest atexit logging error workaround 2019-07-03 18:37:13 +02:00
shortcutme eb2627721e
Fix pytest 5.x compatibility 2019-07-03 18:36:41 +02:00
shortcutme ff32f822ba
Raise exception instead of using assert 2019-07-03 18:35:55 +02:00
ZeroNet 80bfccd9d3
Merge pull request #2066 from geekless/Dockerfile-fix-caching
Fix the order of commands in Dockerfile to make use of the caching
2019-07-03 16:22:03 +02:00
ZeroNet eb5a24064a
Merge pull request #2067 from rllola/fix-travis
fix pytest version to 4.6.3 to avoid it to broke for python 3.8 dev
2019-07-03 16:21:23 +02:00
rllola b971ccc673 fix pytest version to 4.6.3 to avoid it to broke for python 3.8 dev 2019-07-03 15:48:18 +02:00
Vadim Ushakov 945687bdad Fix the order of commands in Dockerfile to make use of the caching of intermediate Docker images.
In py2 version, `COPY . /root` was placed after `RUN apk ...`, so that the result of `RUN apk ...` can be cached by Docker.

In py3 version, the commands were reordered to make the file `/root/requirements.txt` available for `pip install`. That prevents caching, and the docker image every time is rebuild from scrach.

To enable the caching back again, we can `COPY` just the single file `requirements.txt` before running other commands. Since the file is unmodified most of the time, the resulting image can be effectively cached. The other ZeroNet files are copied after doing `RUN apk ...`, as in the previous version.
2019-07-03 19:18:54 +07:00
ZeroNet 6f56d0a944
Update .travis.yml 2019-07-03 11:44:12 +02:00
ZeroNet 66c48ba4ec
Update to latest packages before tests 2019-07-02 16:03:41 +02:00
ZeroNet f83ade8d33
Merge pull request #2061 from imachug/dotdot
Allow some paths to contain .. but not ../
2019-07-01 17:56:27 +02:00
ZeroNet eae0d1b2a6
Merge pull request #1959 from tangdou1/patch-1
Change default value to 10MB
2019-07-01 17:45:37 +02:00
Ivanq 743f92d15e Allow some paths to contain .. but not ../ 2019-07-01 18:17:42 +03:00
shortcutme 822dec5c03
Rev4110 2019-07-01 16:28:56 +02:00
shortcutme 40b84755de
Add some fixed content_type 2019-07-01 16:28:37 +02:00
shortcutme 1b307166ee
Formatting 2019-07-01 16:27:40 +02:00
shortcutme 7a483e7912
Add short address to site_info 2019-07-01 16:27:34 +02:00
shortcutme 841230fe80
Call onClosed function if websocket is disconneced 2019-07-01 16:27:20 +02:00
shortcutme 900ae4e1ea
Remove notification about port open status on startup 2019-07-01 16:26:57 +02:00
shortcutme 72b6d6c676
Make wrapper compatible with sidebar console function 2019-07-01 16:26:37 +02:00
shortcutme f979ed133f
Workaround for pytest 0.4.1+ atexit logging errors 2019-07-01 16:25:45 +02:00
shortcutme fb2cf5f04d
More detailed logging of file change event 2019-07-01 16:24:48 +02:00
shortcutme 62401b24ec
Add r string literal for regexps 2019-07-01 16:24:23 +02:00
shortcutme 43f833e604
Allow multiple values of same key in the config file 2019-07-01 16:20:13 +02:00
shortcutme 612a3f4401
Fix parsing config file for lines that has no values 2019-07-01 16:19:32 +02:00
shortcutme 4c2cf99fd2
Add console function to sidebar 2019-07-01 16:19:12 +02:00
shortcutme aebd9b410d
Fix feedlistfollow request before siteinfo 2019-07-01 16:08:21 +02:00
Ivanq 8eee9caa01 Fix siteCloning subdirectory with -default files 2019-07-01 09:49:03 +03:00
Ivanq d278a30d19 Allow sites to lock pointer (#2059)
Add `allow-pointer-lock` to iframe sandbox
2019-06-30 16:39:17 +02:00
Ivanq 1117569148 Fix starting ZeroNet via start.py (#2052) 2019-06-28 00:58:58 +02:00
Lola Dam 753396ac0c Try and catch block for dbRebuild (#2047)
* Try and catch block for dbRebuild

* Use self.log.error and not logging

* Use self.log.error and not logging in SiteStorage also

* Check if the rebuild is working
2019-06-23 14:21:50 +02:00
shortcutme 9a267ffcaf
Rev4016, Fix updater 2019-06-12 02:57:18 +02:00
ZeroNet 6254143fc6
Fix noparallel ignoreclass test 2019-06-11 18:24:44 +02:00
shortcutme 862e19a263
Rev4104, Don't start blocking Noparallel calls in separate greenlet to be able to catch exceptions. 2019-06-11 17:04:37 +02:00
shortcutme eeef6fe65f
Rev4102, Fix fileGet test 2019-06-06 03:17:42 +02:00
shortcutme c05916477c
Merge branch 'py3' of https://github.com/HelloZeroNet/ZeroNet into py3 2019-06-06 02:49:14 +02:00
shortcutme 63d7e73cff
Rev4101 2019-06-06 02:49:11 +02:00