liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,104 Commits 1 Branch 0 Tags
491d63ceee192bba318f8d5acbad86ad8f9b0216
Commit Graph

74 Commits

Author SHA1 Message Date
matt1097
f02b7ba94e fix(git): Reduce git concurrency to avoid lock file conflicts. (#6511) 2023-06-16 17:07:31 -04:00
NGPixel
e954b50a7a feat: footer text override option 2023-02-16 20:45:55 -05:00
NGPixel
ac930fc23e fix: change simple-git import 2023-02-04 16:09:41 -05:00
Eric Knibbe
2e8585478f fix(git): handle file renames between folders (#6020) 
* git storage: handle file renames between folders

---------

Co-authored-by: Nicolas Giard <github@ngpixel.com>
 2023-01-29 23:09:33 -05:00
Eric Knibbe
41454cfd30 fix(git): disable color.ui in git storage (#6014) 2023-01-13 17:54:15 -05:00
CDN
73af37b81b fix: git log should explicitly separate branch from paths (#5911) 2022-12-02 02:33:24 -05:00
Jared Brogan
31bd327487 fix: correct azure blob storage typo (#5591) 2022-09-03 22:57:21 -04:00
El Gato da Great
e3d94f7177 fix: don't push files to git if ignored (#5334) 
* fix: don't push files to git if ignored

* tweak: change gitPath var to gitFilePath

* fix: "update" instead of "create" of updated file

Co-authored-by: Jacob Parker <blocckba5her@gmail.com>
Co-authored-by: DevBlocky <16978528+DevBlocky@users.noreply.github.com>
 2022-05-26 20:42:14 -04:00
myml
b3731dd26e fix: handle unicode chars when syncing files using git storage (#5272) 
git has the quotopath option enabled by default,
filepaths with unicode characters will be escaped,
causing the wiki to not handle changes.
 2022-05-09 21:39:08 -04:00
Nicolas Giard
485aa765d0 fix: add sfo3 to digitalocean spaces module 2022-04-29 21:38:39 -04:00
Marián Skrip
2815f38c52 feat(logging): add option to configure JSON logging (#5022) 
* fix: Use logger for logs using console logging

* feat: Add option to configure JSON logging

* fix: use generic logFormat instead of json specific

* fix: use logFormat for docker config

* fix: use logFormat to build winston formatters

Co-authored-by: Nicolas Giard <github@ngpixel.com>
 2022-02-18 19:48:22 -05:00
mordini
d93bd1ad5a fix: git storage - 'import everything' feature restored (#4559) (#4572) 2021-10-09 13:59:47 -04:00
Rainshaw
1dc974245f fix: sftp error when dir already exists (#4024) 
when the dir exists, sftp.mkdir() would raise an error and ends the for loop.
 2021-09-14 20:14:32 -04:00
Eric Knibbe
c5a45e578e fix: git storage - handle renamed files & assets (#4307) 2021-09-01 12:11:33 -04:00
Max
033b8e6b21 fix: S3 copyObject usage - Missing bucket name (#3745) 
* Fix copyObject usage: supply bucket name

* No semicolon

* Assign empty string on initialization

* Remove empty line
 2021-03-23 11:14:29 -04:00
Adrián Martínez Interactiv4
52304a8149 fix: update storage.js to match pageHelper.injectPageMetadata (#2832) 
* Update storage.js to match pageHelper.injectPageMetadata

At pageHelper.injectPageMetadata references editorKey and tags to build metadata, but this data seems not to be supplied to this function, since page object is only built from specified columns.

As a result, tags are always empty when exporting pages, and editor key appears as undefined.

It happens also with git storage, but may happen with another storage providers.

I run into this issue running Wiki.js 2.5.170 with the following Docker stack:

CONTAINER ID        IMAGE                                   COMMAND                  CREATED             STATUS              PORTS                                         NAMES
39373979b693        requarks/wiki:2                         "docker-entrypoint.s…"   44 minutes ago      Up 9 minutes        0.0.0.0:80->3000/tcp, 0.0.0.0:443->3443/tcp   wiki
608de6278aaa        requarks/wiki-update-companion:latest   "dotnet wiki-update-…"   5 months ago        Up 6 hours          80/tcp                                        wiki-update-companion
12c7b35ba295        postgres:11                             "docker-entrypoint.s…"   5 months ago        Up 6 hours          5432/tcp                                      db

* Provide id to allow to query for tags

* Update git storage to provide editorKey and tags
 2021-01-29 14:15:22 -05:00
jaljo
cda1f1e805 feat: export creation date in dumped content (#2345) 
* Export creation date in dumped content

* date_creation -> dateCreated

Co-authored-by: Joris Langlois <joris.langlois@knplabs.com>
 2020-08-31 11:28:55 -04:00
Regev Brody
b2ff064d34 fix: stream assets from storage local locations (#2087) 2020-07-12 12:19:01 -04:00
TakeruDMC
cf3a48a6fa fix: "undefined" error on deletePage by git storage (#2132) 2020-07-03 17:44:42 -04:00
NGPixel
ca0708ea75 feat: extra options for generic S3 module 2020-06-07 18:28:16 -04:00
NGPixel
e45145986a feat: generic S3 module 2020-06-07 18:08:33 -04:00
NGPixel
b2931471c0 fix: remove ssh port param for git module 2020-04-25 14:04:14 -04:00
NGPixel
566043ec43 fix: perform git move manually to prevent bad source 2020-04-24 20:30:08 -04:00
NGPixel
4308152a08 fix: uriencode git user/pass for http remote 2020-04-21 23:35:49 -04:00
NGPixel
2213ba2c81 fix: git custom ssh port not handled 2020-04-21 19:45:25 -04:00
NGPixel
6a00a5dbce fix: git ssh port incorrect default value 2020-04-19 22:47:02 -04:00
NGPixel
e68932aa40 feat: purge local repo action for git module 2020-02-03 23:39:00 -05:00
wallrick
b1c7edac90 feat: add ssh port override option for git module (#1432) 
* Adding an override for the ssh port

* fix: git module - ssh custom port

Co-authored-by: Nicolas Giard <github@ngpixel.com>
 2020-02-02 23:21:14 -05:00
NGPixel
6920a35d80 feat: visualize pages (dendograms) 2020-01-05 15:04:16 -05:00
NGPixel
0d6676c19b feat: SFTP storage module + sensitive field option 2019-12-25 01:47:19 -05:00
NGPixel
4a2f1d045b feat: azure blob storage provider + s3 rename fix 2019-12-23 00:12:19 -05:00
NGPixel
19e4ab69d2 fix: add missing EOL for git key contents 2019-11-16 19:11:37 -05:00
NGPixel
28fdf14002 fix: export + import tags in storage events 2019-10-27 15:56:39 -04:00
Justin Kromlinger
8000ebec8f refactor: use dataPath variable as given in file config (#1118) 
* Actually use path variables as given in default config

* Drop paths.content, avoid populating the global WIKI object
 2019-10-25 18:20:02 -04:00
NGPixel
c4303a5659 feat: git sync - process assets 2019-10-20 18:34:38 -04:00
NGPixel
f1668b9ac5 feat: import assets from disk module 2019-10-20 14:42:10 -04:00
NGPixel
186174f8fe feat: asset upload/move/delete for S3 module 2019-10-19 17:45:01 -04:00
NGPixel
d987058336 feat: asset add/rename/remove + dump action for git and disk modules 2019-10-19 17:39:45 -04:00
NGPixel
f4816d0628 fix: pageHelper getFileExtension missing return 2019-10-18 20:23:37 -04:00
Nicolas Giard
cffd32dee0 feat: local disk import all action + v1 import content (#1100) 2019-10-14 23:44:37 -04:00
NGPixel
62d1d7a1df feat: move page 2019-10-13 19:59:50 -04:00
NGPixel
7a3198c306 fix: linting 2019-10-11 16:39:48 -04:00
NGPixel
38c33c58bb feat: rebuild page tree worker 2019-10-07 00:06:47 -04:00
Nick
454da698a1 fix: git sync untracked 2019-09-27 14:17:12 -04:00
Andrew Sim
5202eadebb feat: AWS S3 + Digitalocean Spaces storage modules (#1015) 
* Provide basic implementation of AWS S3 storage module

* Abstract S3 Compatible Storage Module logic

* Refactor `getFileExtension()` into the `page` object

* Add implementation for Digitalocean storage module

* Remove accidental `async`/`await` in S3 Storage Module

* Remove argument from the call to `page.getFileExtension()`

https://github.com/Requarks/wiki/pull/1015#discussion_r321990073
 2019-09-08 21:11:25 -04:00
Nick
eac12121bb fix: always prefix lang for non-default language in disk storage module (#1000) 2019-08-31 17:56:49 -04:00
rbtprograms
0f9ddf1e5d fix: Switch converted to Object Literal (#940) 
* updating a switch into object literal and fixed a couple linter errors

* added a comment about weird formatting

* style: use lodash get

* fix: pass eslint + puglint + jest
 2019-08-04 16:31:13 -04:00
Nick
fd8d358b63 fix: git private key alt paste mode 2019-07-14 18:55:12 -04:00
Nick
604941fe6a feat: utilities section (wip) + auth utilities 2019-06-30 15:18:26 -04:00
NGPixel
4e990d50eb feat: gitlab auth module + storage locale namespacing fix 2019-06-25 02:13:41 +00:00