453 Commits

Author SHA1 Message Date
fanxb
c9156f12d1 fix:修复name过长无法导入问题 2023-12-02 18:40:43 +08:00
fanxb
5126e31867 dcos:文档更新 2023-12-01 15:34:54 +08:00
fanxb
f78349a1d2 fix:修复展示问题 2023-12-01 15:27:51 +08:00
fanxb
b0b608de5a docs:文档更新
Some checks failed
continuous-integration/drone/pr Build is failing
2023-12-01 14:58:42 +08:00
fanxb
523698a967 feat:首页图加载优化,增加OneNav导入支持 2023-12-01 13:18:44 +08:00
fanxb
405a2e05ed feat:首图下载下来 2023-11-29 23:42:33 +08:00
fanxb
6b59dfbf26 Merge branch 'master' into dev 2023-11-29 19:29:42 +08:00
5a8f805a15 更新 README.md
Some checks failed
continuous-integration/drone/push Build is failing
2023-11-25 00:50:04 -05:00
42a2829847 Merge pull request 'master' (#16) from master into dev
Reviewed-on: #16
2023-11-25 00:49:22 -05:00
dfb39e5ee8 fix:修复执行报错
Some checks failed
continuous-integration/drone/push Build is failing
2023-11-25 00:48:57 -05:00
fanxb
946c032ba5 Merge pull request 'dev' (#15) from dev into master
Reviewed-on: #15
1.3
2023-08-13 15:37:04 +08:00
fleyx
3a77e5af4d doc:文档更新 2023-08-13 15:36:02 +08:00
fleyx
1d282b1095 Merge remote-tracking branch 'origin/master' into dev 2023-08-13 15:19:33 +08:00
fanxb
bb7deda121 Merge pull request 'feat:支持搜索引擎自定义' (#14) from dev into master
Reviewed-on: #14
2023-08-13 15:19:18 +08:00
fleyx
0d000223a2 feat:支持搜索引擎自定义 2023-08-13 15:18:48 +08:00
fanxb
51eb22adaa Merge pull request 'dev' (#13) from dev into master
Reviewed-on: #13
2023-08-13 15:07:16 +08:00
fleyx
c56ca2809c feat:支持搜索引擎自定义 2023-08-13 15:05:40 +08:00
fleyx
383450ebe4 temp 2023-08-08 23:10:59 +08:00
fanxb
ebc1da0972 更新 '.drone.yml' 2023-04-01 05:41:48 -04:00
fanxb
9dc1fe47d9 Merge pull request 'dev' (#12) from dev into master
Reviewed-on: #12
2023-04-01 05:30:11 -04:00
fanxb
35d3420470 feat:放开github登录 2023-04-01 17:29:45 +08:00
fanxb
529b42a185 更新 '.drone.yml' 2023-03-12 01:32:33 -05:00
fanxb
58a8cefaf5 Merge branch 'dev' of ssh://gitea.fleyx.com:222/fanxb/bookmark into dev 2023-03-12 10:55:06 +08:00
fanxb
b9cef34a06 refactor:vue-cli upgrade to 5.0.8 2023-03-12 10:54:54 +08:00
fanxb
928e3fac48 fix:修复bookmark缺陷 2023-02-16 19:07:40 +08:00
fanxb
c9429557b3 Merge pull request 'fix:修复bookmark缺陷' (#11) from dev into master
Reviewed-on: #11
2023-02-16 19:01:59 +08:00
fanxb
4bed4fd34d docs:修改文档 2022-12-05 19:09:28 +08:00
fanxb
5d52e389d6 Merge pull request 'docs:修改文档' (#10) from dev into master
Reviewed-on: #10
2022-12-05 19:05:42 +08:00
fanxb
767c26d89b docs:文档修改 2022-12-04 20:52:58 +08:00
fanxb
83125ae55a Merge pull request 'dev' (#9) from dev into master
Reviewed-on: #9
2022-12-04 20:49:07 +08:00
fanxb
b5f715eda6 Merge pull request 'master' (#8) from master into dev
Reviewed-on: #8
2022-12-04 19:04:45 +08:00
fanxb
cc3298f3b4 fix:修改arm上编译报错 2022-12-04 18:34:44 +08:00
fanxb
2b69814296 更新 'README.md' 2022-11-25 23:19:01 +08:00
fanxb
2880b6282c Merge pull request 'fix:修复定时任务线程池不起作用' (#7) from dev into master
Reviewed-on: #7
2022-09-24 18:50:34 +08:00
fanxb
ff560ae790 fix:修复定时任务线程池不起作用 2022-09-24 18:50:18 +08:00
fanxb
c5a35ea54e Merge pull request 'fix:修复定时任务线程池不起作用' (#6) from dev into master
Reviewed-on: #6
2022-09-24 18:44:57 +08:00
fanxb
22c2c48eea Merge branch 'master' into dev 2022-09-24 18:44:50 +08:00
fanxb
580d18a500 fix:修复定时任务线程池不起作用 2022-09-24 18:45:20 +08:00
fanxb
5868aa4a98 Merge pull request 'dev' (#5) from dev into master
Reviewed-on: #5
2022-09-24 17:19:27 +08:00
fanxb
42cbbe5999 deploy:增加drone部署 2022-09-24 17:15:51 +08:00
fanxb
9dc21ed87a Merge pull request 'master' (#3) from master into dev
Reviewed-on: #3
2022-09-24 17:00:35 +08:00
fanxb
32e63ed1fb Merge pull request 'deploy:增加drone部署' (#2) from dev into master
Reviewed-on: #2
2022-09-24 17:00:20 +08:00
fanxb
35ee930661 Merge remote-tracking branch 'origin/master' 2022-09-24 16:59:07 +08:00
fanxb
19aeab2856 deploy:增加drone部署 2022-09-24 16:56:21 +08:00
FleyX
866ce22bb5
Merge pull request #38 from FleyX/dev
Dev
2022-09-22 19:50:45 +08:00
FleyX
84c2c213a9
Merge pull request #37 from FleyX/dependabot/maven/bookMarkService/business/bookmark/org.jsoup-jsoup-1.15.3
build(deps): bump jsoup from 1.14.3 to 1.15.3 in /bookMarkService/business/bookmark
2022-09-21 16:35:44 +08:00
dependabot[bot]
9cc1a7b871
build(deps): bump jsoup in /bookMarkService/business/bookmark
Bumps [jsoup](https://github.com/jhy/jsoup) from 1.14.3 to 1.15.3.
- [Release notes](https://github.com/jhy/jsoup/releases)
- [Changelog](https://github.com/jhy/jsoup/blob/master/CHANGES)
- [Commits](https://github.com/jhy/jsoup/compare/jsoup-1.14.3...jsoup-1.15.3)

---
updated-dependencies:
- dependency-name: org.jsoup:jsoup
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-01 23:51:05 +00:00
fanxb
5e12b5a8b1 fix:修复定时任务线程池不起作用 2022-07-18 20:25:24 +08:00
fanxb
8ab7d0c341 Merge branch 'dev' of fanxb/bookmark into master 2022-07-10 13:18:36 +08:00
fanxb
4b9adc3acd Merge branch 'dev' of ssh://git.fleyx.com:2200/fanxb/bookmark into dev 2022-07-10 13:16:47 +08:00