github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity
1,940 Commits
26 Branches
208 Tags
128 MiB
Commit Graph

1655 Commits (696a9ad2ee5807ffa5637061cd059b28d835f9f2)

Author SHA1 Message Date
Ryan Wang f383cd4aa3
fix: #785 (#854) 2020-05-16 19:21:42 +08:00
sebastiancoteanu c3f777fba3
pref: replace == usage with equals to avoid bugs. (#851) 
Co-authored-by: sebastiancoteanu <sebastian.coteanu@arnia.ro>
 2020-05-15 16:55:07 +08:00
Ryan Wang ecc97c207f
chore: remove useless code and dependencies. (#845) 
* chore: remove useless code and dependencies.

* Update build.gradle
 2020-05-15 11:40:02 +08:00
Ryan Wang e7addd41f9
fix: rollback #714 pull request. (#838) 2020-05-12 11:49:40 +08:00
Yqhg8Nt4tuu 4197ca33d8
feat: Support Rename and Edit Staitc Files (#573) (#819) 
* Add rename API

* Add save API

* Add unit test for rename API

* Fix an indentation

* Add a space before '{'

* Add a Param and some invalid checks

* Change comments

* Change test annotation

* Delete impl test unit

* Add directory traversal check for static file operations

Co-authored-by: Rokita <35868425+Ruukita@users.noreply.github.com>
 2020-05-11 22:25:08 +08:00
Gxz-NGU a81f335ee8
pref: 删除冗余注解 (#827) (#830) 2020-05-07 15:20:24 +08:00
chaos.su 9ec3088f1e
support distributed cache and customized halo home. (#754) 
* support distributed cache with redis

* fix HOME_DIR; theme configurations auto update in distributed deployment; update redis cache configuration demo

* remove redundant const of WORK_DIR

Co-authored-by: John Niang <johnniang@riseup.net>
 2020-05-01 14:43:01 +08:00
liaozan f0f354af07
抽取 yyyy-MM-dd-HH-mm-ss- 格式的日期pattern到工具类中 (#813) 
* 排序使用Comparator静态方法实现

* 修复排序逻辑错误

* fix compile error

* 抽取 yyyy-MM-dd-HH-mm-ss- 格式的日期pattern到工具类中
 2020-05-01 00:30:23 +08:00
liaozan 36b3a2d3b4
排序使用Comparator静态方法实现 (#812) 
* 排序使用Comparator静态方法实现

* 修复排序逻辑错误

* fix compile error
 2020-04-30 22:25:37 +08:00
Wu Yuncheng 532b7f0532
fix: volatile in double-checked locking (#799) 2020-04-28 17:58:37 +08:00
ruibaby 11cbe95ed5 release: 1.3.2 2020-04-12 13:32:36 +08:00
jinqilin721 246930ecbe
feat: 附件上传增加华为云OBS支持 (#756) 
* 附件上传增加华为云OBS支持

* Revert "附件上传增加华为云OBS支持"

This reverts commit cad9a352

* 附件上传增加华为云OBS支持
 2020-04-09 10:03:37 +08:00
Ryan Wang ba1eb8fc50
fix: #748 (#749) 2020-04-05 14:51:07 +08:00
bear 3a45b7a5ed
Support MFA-TOTP Auth (#745) 
* add tfa utils

* MFA check api completed

* adminController add loginPreCheck api

* halo-admin test

* checkstyle

* add unit test

* reset MFA
 2020-04-04 19:41:22 +08:00
Ryan Wang b3dafa195a
feat: add switch type for theme settings. (#735) 2020-03-29 11:48:37 +08:00
ruibaby c353411997 release: 1.3.1 2020-03-28 16:03:03 +08:00
Lei XinXin b4ebf7218e
新增DateTimeUtils (#731) 
* 新增DateTimeUtils

* 提交测试用例
 2020-03-28 15:08:24 +08:00
ming 49486198df
fix: #713, 开发环境也能获取版本信息了 (#714) 
* fix #713, 开发环境也能获取版本信息了

* banner version show ok
 2020-03-28 14:33:23 +08:00
wtune f21f5933bf
feat: add index on attachments.create_time (#725) 2020-03-28 00:16:12 +08:00
wtune 51e0620393
feat: add index on photos.create_time (#727) 2020-03-28 00:15:45 +08:00
wtune 4f99e72669
feat: add index on menus.name (#722) 2020-03-27 17:07:25 +08:00
wtune 01e4e5e271
feat: add index on attachments.media_type (#718) 2020-03-27 12:58:27 +08:00
ruibaby 89dc411b0f release: 1.3.0 2020-03-25 18:15:09 +08:00
iwangbingzhi abaaadafe8
update some chinese descriptions (#711) 
Co-authored-by: wangbingzhi <853244870@qq.com>
 2020-03-25 09:01:07 +08:00
ruibaby 8f2894a2a4 release: 1.3.0-beta.4 2020-03-24 23:02:53 +08:00
Ryan Wang bc75275815
feat: provide static mapping feature (#710) 
* Provide static mapping feature

* feat: filter inner mapping for static storage.
 2020-03-24 22:48:58 +08:00
Ryan Wang 2792d11cd2
Fix installation bug (#708) 2020-03-24 20:42:15 +08:00
Ryan Wang ac52e7f677
fix: #703 (#705) 2020-03-22 22:15:52 +08:00
Ryan Wang bee21d7de8
refactor: get database version. (#698) 2020-03-20 22:54:05 +08:00
Ryan Wang 40f510f371
refactor: independent sheet. (#697) 2020-03-20 20:34:51 +08:00
Ryan Wang 26fdbb2cf3
chore: upgrade flexmark version. (#695) 
* chore: upgrade flexmark version.

* fix: test case.
 2020-03-19 17:01:17 +08:00
Ryan Wang a70780c5df
style: code. (#692) 2020-03-18 21:44:46 +08:00
Ryan Wang c847bef498
feat: support custom email templates. (#691) 2020-03-18 21:38:26 +08:00
ruibaby 8eac5716f1 release: 1.3.0-beta.3. 2020-03-18 01:19:25 +08:00
Ryan Wang fc989c965c
chore: upgrade gradle and dependencies. (#688) 2020-03-17 23:56:24 +08:00
Ryan Wang d4cfc3ae7f
feat: #598 (#689) 2020-03-17 23:56:01 +08:00
Ryan Wang a77ebed299
refactor: backup service. (#687) 
* refactor: backup service.

* fix: test case error.
 2020-03-17 20:22:51 +08:00
wtune 03a43fb245
feat: add Index on comments.(type,status) and comments.parent_id (#686) 2020-03-17 15:18:56 +08:00
wtune 9ccd23d730
feat: add Index on posts.(type,status) and posts.create_time (#684) 2020-03-17 15:17:51 +08:00
Ryan Wang 4bc8ad44da
feat: add data export and import api. (#672) 
* feat: add data export and import api.

* refactor: data export and import api.
 2020-03-17 13:14:15 +08:00
Ryan Wang d6b3d6cb5d
fix: #547 (#677) 2020-03-16 23:43:25 +08:00
Ryan Wang fae1df3859
fix: post query sql. (#676) 2020-03-16 22:04:44 +08:00
wtune 4d431fd85d
feat: add Index on theme_settings.setting_key and theme_settings.theme_id (#681) 2020-03-16 22:03:44 +08:00
wtune 2363f4adf7
feat: add Index on post_tags.post_id and post_tags.tag.id (#675) 2020-03-16 14:11:58 +08:00
wtune 1248cb7b14
feat: add Index on post_categories.post_id and post_categories.category_id (#671) 2020-03-16 13:22:24 +08:00
wtune 839a029012
feat: add Index on logs.create_time (#668) 2020-03-16 11:21:35 +08:00
bestsort fe65eccdf7
reduce: memory usage during image upload (#659) 
* optimize FileHandler's logic

* fix code style

* fix: maybe happen OOM when file upload, see #529

* refactor: HashMap -> ConcurrentHashMap

* remove unused class

* reduce memory usage during image upload

* code clean
 2020-03-14 19:19:35 +08:00
wtune e357b7a462
feat: add Index on comments.post_id (#649) 2020-03-14 19:16:33 +08:00
wtune c1f01df394
feat: add index on categories.name and categories.parent_id (#658) 
* Add Index on categories.name

* Add Index on categories.name and categories.parent_id
 2020-03-14 19:10:32 +08:00
wtune 124f352ebb
feat: add Index on links.name (#651) 2020-03-14 17:52:10 +08:00
wtune b2b349ae27
feat: add Index on menus.parent_id (#655) 2020-03-14 17:51:40 +08:00
wtune ee4bc01f65
feat: add Index on photos.team (#657) 2020-03-14 17:50:47 +08:00
wtune fc37803e73
feat: add Index on tags.name (#653) 2020-03-14 17:50:01 +08:00
Ryan Wang c5af5d787d
refactor: hibernate column build. (#638) 
* refactor: hibernate column build.

* feat: after the database migration fails, the record table is automatically cleaned up.
 2020-03-14 11:10:34 +08:00
Ryan Wang 7ae722e6fd
fix: #629 (#641) 2020-03-14 11:09:48 +08:00
bestsort 1d020ff550
Optimize FileHandler's logic (#639) 
* optimize FileHandler's logic

* fix code style

* fix: maybe happen OOM when file upload, see #529

* refactor: HashMap -> ConcurrentHashMap

* remove unused class
 2020-03-14 10:05:53 +08:00
Ryan Wang 153f8ebbef
refactor: attachment month path. (#636) 2020-03-12 15:04:35 +08:00
Ryan Wang 437e59d8a2
refactor: post month path type. (#635) 2020-03-12 14:43:16 +08:00
Ryan Wang 22b24835aa
refactor: banner info. (#634) 2020-03-11 20:09:59 +08:00
Ryan Wang 6b967ad256
refactor: remove recovery api. (#633) 
* refactor: remove recovery api.

* refactor: remove recovery api.
 2020-03-11 13:50:53 +08:00
Ryan Wang a563c493e0
refactor: metas variable. (#632) 
* refactor: metas variable.

* refactor: metas variable.
 2020-03-11 13:49:37 +08:00
ruibaby 378049ba21 release: 1.3.0-beta.2 2020-03-08 11:45:10 +08:00
John Niang 55a9d573bc
fix: a fatal filter bug (#626) 2020-03-08 11:27:41 +08:00
Ryan Wang fd251a4724
refactor: pagination tag. (#625) 2020-03-08 11:25:44 +08:00
Ryan Wang 38b4bb4aeb
chore: upgrade default theme. (#624) 2020-03-07 22:54:52 +08:00
Ryan Wang fa50d2d5d6
refactor: freemarker pagination tag. (#621) 2020-03-07 10:53:13 +08:00
Ryan Wang eb71e98087
refactor: modify the address of the default comment plugin. (#620) 2020-03-06 14:10:00 +08:00
Ryan Wang 491b8c89e8
fix: failure of suffixes in posts. (#619) 2020-03-06 14:09:36 +08:00
Ryan Wang d82f3847c2
feat: support meta_keywords and meta_description in every page. (#612) 2020-03-04 20:03:08 +08:00
Ryan Wang a9fedef8b2
feat: support set archives page size. (#610) 2020-03-02 14:41:16 +08:00
Ryan Wang b70806960b
fix: attachment upload to sm.ms failed. (#609) 
* fix: attachment upload to sm.ms failed.

* fix: attachment upload to sm.ms failed.

* refactor: SmmsFileHandler.

* refactor: SmmsFileHandler.
 2020-03-02 13:04:53 +08:00
Ryan Wang b23755a568
feat: support paging of archive pages. (#608) 
* feat: support paging of archive pages.

* fix: test case.
 2020-03-01 13:52:27 +08:00
Ryan Wang 62eba99d21
feat: add editorType for post. (#605) 
* feat: add editorType for post.

* fix: test case failed.
 2020-02-28 23:17:07 +08:00
Ryan Wang 949a3da3de
refactor: installation data. (#600) 2020-02-27 16:23:22 +08:00
Ryan Wang 136b1fb3b9
refactor: change url field to slug in post. (#597) 2020-02-25 19:44:30 +08:00
Ryan Wang f4a4d5f250
feat: #586 (#595) 2020-02-25 16:08:59 +08:00
ruibaby 7166829d87 release: 1.3.0-beta.1. 2020-02-25 15:30:19 +08:00
Ryan Wang ca33475e31
chore: upgrade default theme. (#594) 
* chore: upgrade default theme.

* Update anatole
 2020-02-25 13:18:55 +08:00
Ryan Wang 72d59a5617
refactor: stop supporting admin folder mapping in workspace. (#593) 2020-02-25 12:52:17 +08:00
John Niang e8db12a93d
Enable code style check available (#590) 
* Add check style plugin and remove halo code style

* Reformat codes for whole project

* Resolve conflicts due to provided checkstyle.xml
 2020-02-25 00:24:51 +08:00
Ryan Wang c224b68fbc
feat: supports setting the post path type and path suffix. (#563) 
* feat: build full path for category and tag.

* feat: build full path for post.

* feat: build full path for sheet.

* feat: build full path for post.

* feat: change post url for rss sitemap pages.

* feat: support set links/photos/journal page prefix.

* feat: support set internal sheet's title.

* refactor: build full path method.

* refactor: archives post full path.

* feat: support nextPageFullPath and prePageFullPath variable in pageable pages.

* Update CommentEventListener.java

* feat: make rss formats more standard.

* feat: add some useful freemarker variable.

* feat: add some useful freemarker variable.

* feat: add some useful freemarker variable.

* refactor: preview post and password post.
 2020-02-24 23:42:54 +08:00
Ryan Wang 8f36a5d124
fix: #549 (#587) 
* fix: #549

* style: change normalizeImageUrl to normalizeUrl.
 2020-02-23 23:34:20 +08:00
John Niang b7b11e2c8f
Refactor email service and remove oh-my-email dependency (#584) 
* Refactor email service

* Remove oh-my-email dependency

* Add mail dependency

* Provide connection test with email server

* Enable send message asynchronously

* Make more friendly information.
 2020-02-21 21:21:28 +08:00
John Niang 4092ed1633
Fix typo about login translate (#583) 2020-02-21 12:19:48 +08:00
John Niang 50af1ec1aa
Fix file upload exception (#581) 
* Refactor FileHandler and related implementations

* Add more friendly error throw

* Make tmp directory as default location for multipart file

* Change error message in Chinese
 2020-02-20 14:47:57 +08:00
John Niang 594923ebd8
Fix installation on the first startup (#578) 2020-02-18 23:39:17 +08:00
Ryan Wang bffd213a55
Correct demo configuration. (#575) 2020-02-15 20:50:36 +08:00
Ryan Wang 78c389b2d4
Support set thumbnail to category and tag. (#574) 
* feat: support set thumbnail to category and tag.

* style: reformat code.
 2020-02-15 20:48:04 +08:00
guqing b78e2161e5
feat: add basic functions of demo mode (#569) 
* feat: add basic functions of demo mode

* feat: add @disableApi annotation to some API that should be disabled

* feat: add DisableApi test case

* fix: change DisableApi annotation name to DisableOnConditation

* Fix test cases

* Add more strict test on failing case

Co-authored-by: John Niang <johnniang@foxmail.com>
 2020-02-14 22:08:38 +08:00
John Niang df3601a751
Refactor halo mode (#571) 2020-02-14 20:57:41 +08:00
Ryan Wang baa2f1ecfd
style: modify email copy. (#568) 
* style: modify email copy.

* style: modify email copy.
 2020-02-14 16:33:40 +08:00
johnniang 118aaf8ddc Create one-time token mechanism 2020-02-12 21:10:00 +08:00
johnniang e0c12a23ee Merge branch 'master' of github.com:halo-dev/halo into fix-backup-function 2020-02-11 21:32:56 +08:00
John Niang 84b6c2aa14
Fix admin index page redirect (#566) 
* Add custom RequestMappingHandlerMapping for enable static resources access

* Fix admin index page redirect
 2020-02-11 21:29:01 +08:00
johnniang 078e3b3013 Remove temp token mechanism 2020-02-11 19:57:07 +08:00
johnniang 5bd9472f9d Merge remote-tracking branch 'upstream/dev' into fix-backup-function 2020-02-11 11:28:16 +08:00
John Niang 49494abbbd
Add custom RequestMappingHandlerMapping for enable static resources access (#558) 2020-02-10 23:48:07 +08:00
Ryan Wang 028268c698
fix: Incorrect sequence of tailing log file#517 (#556) 2020-02-10 21:47:54 +08:00
Ryan Wang 491ff98916 fix: Theme refresh issue #553 (#554) 2020-02-10 16:20:13 +08:00
John Niang 2327aafc1c
Configure halo.workDir into application-test.yaml (#550) 2020-02-09 21:06:59 +08:00
John Niang 44a6c46620
feat: enable default theme submodule support. (#548) 
* Remove anatole theme for submodule

* Enable submodule support

* Enable submodule support for checkouting by github action
 2020-02-09 11:43:00 +08:00
johnniang e365537b70 Create temporary file after halo is started 2020-02-05 18:08:29 +08:00
Ryan Wang 08c579a095
feat: support theme require halo version. (#544) 
* feat: support theme require halo version.

* fix: com.sun.xml.internal.ws.util does not exist error.

* fix: com.sun.xml.internal.ws.util does not exist error again.

* Update ThemeServiceImpl.java
 2020-02-04 16:35:02 +08:00
Ryan Wang bb8ee0f074
feat: support set attachment path type. (#539) 2020-02-02 16:16:20 +08:00
Ryan Wang 32ed3a9a11
style: collate configuration files. (#540) 2020-02-02 16:09:53 +08:00
Ryan Wang e40de371d1
feat: change themes assets base path (#538) 
* feat: change theme resources base path.

* feat: add new variable about theme base path.
 2020-02-01 21:07:58 +08:00
Ryan Wang 63122ef625
feat: support freemarker template Inheritance #534 (#537) 
* feat: #534

* fix: HashMap initialCapacity
 2020-02-01 17:14:36 +08:00
Ryan Wang 28553042cf
Fix wordpress importor. (#536) 2020-02-01 17:09:13 +08:00
Ryan Wang 6f6ed9ee07
feat: support set theme static source path type. (#535) 
* feat: support set theme static source path type.

* refactor: global_absolute_path_enabled property.
 2020-02-01 15:39:21 +08:00
John Niang bc129977d9
Fix test error (#528) 2020-01-31 11:05:15 +08:00
John Niang 6b0804a7b8
Close file input stream after reading image file (#527) 2020-01-31 00:37:45 +08:00
John Niang d47f0f29e6
Uncomment content url mappings (#523) 2020-01-31 00:35:26 +08:00
guqing 61f0748a6a refactor: WordPress data import (#506) 
* refactor: WordPress data import

* refactor: change wordpress convert class to interface and add wordpress convert null judgment

* fix: add some class doc

* fix: exclude commons io

* feat: add custom annotation: @PropertyMappingTo and reflection utils, It can be used to mapping the relationship between source model and target model

* feat: replace the original wordpressconvert implementation with a custom annotation

* fix: change wordpress convert method name

* fix: change wordpress convert method name

* fix: merger conflict
 2020-01-20 15:23:48 +08:00
Ryan Wang 47e9563fe2 feat: create freemarker custom tag of tools. (#505) 
* feat: create freemarker custom tag of tools.
 2020-01-17 17:12:13 +08:00
Ryan Wang bd6cb393ff feat: create theme content api. (#503) 2020-01-17 12:47:55 +08:00
leozhou 89086dd345 fix: #489 
* Update FUNDING.yml

* merge from master

* feat: update page default sort && update the pre and next of posts

* feat: adapter dev branch

* Feat: update getAdjacentPosts return && update post ftl

* fix: revert gradle-wrapper.jar

Co-authored-by: Ryan Wang <i@ryanc.cc>
Co-authored-by: Jiahuan Shen <shenjiahuan1999@hotmail.com>
Co-authored-by: John Niang <johnniang@riseup.net>
Co-authored-by: weiwensangsang <weiwensangsang@users.noreply.github.com>
Co-authored-by: Lei XinXin <40338580+NGLSL@users.noreply.github.com>
Co-authored-by: 寒山 <ms915818993@163.com>
Co-authored-by: IJKZEN <ijkzen@outlook.com>
 2020-01-16 18:00:33 +08:00
John Niang f4c2ca2f8d
Fix vulnerability due to uncheck theme id (#499) 2020-01-16 16:46:16 +08:00
johnniang 23d0a2e01d Disable url regex match temporarily 2020-01-15 23:04:12 +08:00
johnniang dc166d0b4a none: add some test case, but ignored 2020-01-15 23:04:12 +08:00
Lei XinXin 11c32ffdca feat:(add comment blacklist) (#465) 
* feat:(add comment blacklist)

* update enum name

* update enum

* fix:(update pom)

* 优化相关的细节
 2020-01-15 22:43:55 +08:00
pencilso d867f4cca3 feat: add leveldb cache store impl (#494) 
add leveldb config by yaml dev
add cache impl test
 2020-01-12 19:41:09 +08:00
ruibaby de796b35d6 feat: support set categories and tags mapping prefix. 2020-01-11 20:30:57 +08:00
ruibaby 62153403df feat: support /year/month/day/url and /year/month/url mapping. 2020-01-11 12:29:54 +08:00
ruibaby 76dd2b2c72 feat: create get by date api for post. 2020-01-08 12:28:25 +08:00
ruibaby bb58dd5ec4 feat: support set path suffix. 2020-01-07 20:16:11 +08:00
ruibaby 13ab09b799 feat: custom permalink. 2020-01-07 18:46:19 +08:00
ruibaby f975a20fea Merge branch 'static-page' into dev 2020-01-06 20:30:48 +08:00
ruibaby 753a3bc998 release: 1.2.0. 2020-01-05 22:41:54 +08:00
guqing 202cf59128 release: 1.2.0. 2020-01-05 22:26:40 +08:00
ruibaby f24c90b514 fix: content api token name error. 2020-01-04 22:21:23 +08:00
ruibaby 28b4d384dd release: 1.2.0-beta.5. 2020-01-04 21:34:39 +08:00
ruibaby ad4da6366b feat: support set summary for sheet. 2020-01-04 15:26:20 +08:00
Evan Wang 0ce380072e fix:repeated updates of visits and private article visits abnorm… (#463) 2020-01-02 23:52:52 +08:00
ruibaby 6c7968cc2b feat: add archive freemarker custom tag. 2020-01-02 20:33:14 +08:00
ruibaby d3ef9c4a7a pref: remove useless code. 2020-01-01 22:42:50 +08:00
ruibaby e13c014a6b style: remove useless code. 2020-01-01 21:47:51 +08:00
ruibaby 013fa1fdcb fix: the problem that meta is not deleted when the sheet is deleted. 2020-01-01 21:39:52 +08:00
ruibaby 79e66cd3c0 style: add some comment. 2020-01-01 21:24:28 +08:00
ruibaby 9ac31d0b1c feat: support set file source for qiniu oss. 2019-12-31 14:24:56 +08:00
ruibaby 2701146860 feat: support set file source for tencent cos. 2019-12-31 13:46:24 +08:00
ruibaby b7ac3f5fed feat: support set file source for ali oss. 2019-12-31 13:19:01 +08:00
ruibaby b9c2daa49b fix: child comments could not be deleted. 2019-12-29 20:45:18 +08:00
ruibaby eed14995aa feat: add data process apis. 2019-12-29 18:35:13 +08:00
ruibaby 305d907531 feat: support replace url method. 2019-12-28 21:57:51 +08:00
ruibaby 86e61036c6 release: 1.2.0-beta.4. 2019-12-28 19:58:05 +08:00
ruibaby b9e64cbb82 pref: remove cdn_domain option. 2019-12-27 19:25:49 +08:00
ruibaby 04512db9ba refactor: content api. 2019-12-27 17:47:29 +08:00
ruibaby c37f36f61e feat: support deploy static page in netlify. 2019-12-26 20:17:03 +08:00
ruibaby 83e87553b7 feat: add static deploy handlers. 2019-12-26 14:21:49 +08:00
ruibaby 0f59e2fe04 feat: clean static pages folder before generate. 2019-12-26 00:00:16 +08:00