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

1260 Commits (8189cc08dd48d6b67e1162cc91a25c419b7eabcf)

Author SHA1 Message Date
ruibaby 0050213f49 Refactor MarkdownUtils. 2019-05-29 15:21:12 +08:00
ruibaby 98caa57e47 1.0.0-beta.8 2019-05-27 17:31:25 +08:00
ruibaby ee299d684c Complete markdown import service. 2019-05-26 16:47:25 +08:00
ruibaby 7c9f8b01f3 Support internal sheet list api. 2019-05-25 14:08:22 +08:00
ruibaby 373c4ce285 Format Code. 2019-05-25 13:40:22 +08:00
ruibaby 8d89fc6c7d Complete: #169 2019-05-25 13:39:55 +08:00
ruibaby 0feb4444b8 Remove CUSTOM_STYLE properties 2019-05-25 13:22:44 +08:00
ruibaby 8a15c7d770 Merge branch 'dev' of https://github.com/halo-dev/halo into dev 2019-05-25 12:13:51 +08:00
ruibaby 374735657a Add comment api for sheet. 2019-05-25 12:13:38 +08:00
johnniang 0ebde83696 Resolve conflict 2019-05-25 06:56:01 +08:00
johnniang 43438a0c75 Change exclude url pattern for comment related api 2019-05-24 07:49:07 +08:00
ruibaby caee1f77a3 Fixed 404 or 500 page rendered error. 2019-05-24 01:15:36 +08:00
ruibaby de6d3d29b9 Support placeholder property for theme setting item. 2019-05-24 00:49:07 +08:00
ruibaby 58d5a4e6e2 Fixed sitemap.html rendered error. 2019-05-24 00:23:08 +08:00
ruibaby 93f146c2c1 Support post and sheet export. 2019-05-24 00:01:40 +08:00
ruibaby 7f1ea3dfb2 Format code and remove useless import. 2019-05-23 15:30:26 +08:00
ruibaby b187c5e5c7 Merge remote-tracking branch 'origin/dev' into dev 2019-05-23 15:21:16 +08:00
ruibaby 6617cb565c Remove useless import. 2019-05-23 15:20:59 +08:00
ruibaby b091f52711 Fixed: Format the commenter's website url. 2019-05-23 00:36:46 +08:00
ruibaby f78d6d4c3f Fixed: The problem that the new comment notification message is empty. 2019-05-23 00:28:58 +08:00
johnniang 527d8bf390 Ignore GithubTest an GitTest 2019-05-22 23:46:26 +08:00
johnniang 935dda282e Fix option updation trigger bug 2019-05-22 23:37:23 +08:00
ruibaby 884d23c2c3 Fixed: render atom or rss page error. 2019-05-22 16:14:08 +08:00
johnniang 08ba24d330 Add git and github test 2019-05-21 23:45:50 +08:00
ruibaby 17bbcacb3b Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/main/resources/application-user.yaml
 2019-05-21 21:31:37 +08:00
ruibaby 1fdb676b71 Disabled spring favicon. 2019-05-21 21:31:12 +08:00
johnniang 72831103a4 Fix sitemap.html show error 2019-05-21 18:15:54 +08:00
johnniang c5bd98caf4 Resovle issue(#164) 2019-05-21 18:15:54 +08:00
Ryan Wang 4eb222825f Update application-user.yaml 2019-05-21 18:15:54 +08:00
ruibaby 7ed2263908 1.0.0-beta.7 2019-05-21 18:15:54 +08:00
ruibaby 9e1edd26bc Change ctx to context. 2019-05-21 18:15:54 +08:00
johnniang 18975dd7f7 Complete issue(#156) 2019-05-21 18:15:54 +08:00
ruibaby e46d960d5a Update admin. 2019-05-21 18:15:54 +08:00
ruibaby 735b9f3aa1 Support static variable. 2019-05-21 18:15:54 +08:00
ruibaby 528cecc9f9 Update anatole theme. 2019-05-21 18:15:54 +08:00
ruibaby 75cc339a61 Update anatole theme. 2019-05-21 18:15:54 +08:00
ruibaby 1c8a09231b Support ctx to instead of options.blog_url. 2019-05-21 18:15:54 +08:00
ruibaby 64f93bfcc0 Change cn.hutool.core.lang.Assert to org.springframework.util.Assert. 2019-05-21 18:15:54 +08:00
ruibaby 2ed74ef3e8 Support blog logo and user avatar url. 2019-05-21 18:15:54 +08:00
ruibaby bdfe1b904b Support blog logo and user avatar url. 2019-05-21 18:15:54 +08:00
ruibaby 5cf659501c Log sheet control. 2019-05-21 18:15:54 +08:00
ruibaby 19f8b588fa Refactor post create and update. 2019-05-21 18:15:54 +08:00
ruibaby 6febabc289 Fixed bug #160 2019-05-21 18:15:54 +08:00
ruibaby 09b47d4d28 Update BaseCommentDTO.java 2019-05-21 18:15:54 +08:00
johnniang ef975aa663 Complete comment children list service 2019-05-21 18:15:54 +08:00
ruibaby 1a1d3a152d Change journal to journals. 2019-05-21 18:15:54 +08:00
ruibaby 2d64b5c329 1.0.0-beta.6 2019-05-21 18:15:54 +08:00
johnniang 816af625e4 Fix page top comments bug 2019-05-21 18:15:54 +08:00
johnniang 9578745677 Complete page top comments service 2019-05-21 18:15:54 +08:00
ruibaby 3742306f78 1.0.0-beta.5 2019-05-21 18:15:54 +08:00
johnniang 18bef3b176 Fix sitemap.html show error 2019-05-21 18:03:32 +08:00
johnniang 3d1aec4c22 Resovle issue(#164) 2019-05-21 17:51:39 +08:00
Ryan Wang 8dcb0b6b9a
Update application-user.yaml 2019-05-21 17:13:13 +08:00
ruibaby 386e9c90db 1.0.0-beta.7 2019-05-21 14:48:24 +08:00
ruibaby b70bc9fe9e Change ctx to context. 2019-05-20 22:55:43 +08:00
johnniang 30955e598f Complete issue(#156) 2019-05-20 22:36:41 +08:00
ruibaby c02bb1dc48 Update admin. 2019-05-18 23:52:24 +08:00
ruibaby c17ca77ba2 Support static variable. 2019-05-18 23:51:11 +08:00
ruibaby 589b43ef2a Update anatole theme. 2019-05-18 23:49:59 +08:00
ruibaby 0a3caf5146 Update anatole theme. 2019-05-18 23:37:39 +08:00
ruibaby b983b9f11d Support ctx to instead of options.blog_url. 2019-05-18 23:30:57 +08:00
ruibaby e68ce3afee Change cn.hutool.core.lang.Assert to org.springframework.util.Assert. 2019-05-18 09:36:10 +08:00
ruibaby 8a19e1c907 Support blog logo and user avatar url. 2019-05-18 09:22:27 +08:00
ruibaby c932e4319a Support blog logo and user avatar url. 2019-05-18 00:31:30 +08:00
ruibaby d61a4e5c9f Log sheet control. 2019-05-17 09:43:36 +08:00
ruibaby 94ffcfa90c Refactor post create and update. 2019-05-16 23:45:55 +08:00
ruibaby 3ef3d1b779 Fixed bug #160 2019-05-16 23:13:51 +08:00
ruibaby 549485f1a1 Update BaseCommentDTO.java 2019-05-16 22:24:44 +08:00
johnniang 2e77999d20 Complete comment children list service 2019-05-16 00:16:55 +08:00
ruibaby 86444ff5da Change journal to journals. 2019-05-15 23:23:49 +08:00
ruibaby 127bf5f6cd 1.0.0-beta.6 2019-05-15 10:57:29 +08:00
johnniang 3ac59e2d29 Fix page top comments bug 2019-05-14 23:47:06 +08:00
johnniang 2dcdcdc080 Complete page top comments service 2019-05-14 23:42:21 +08:00
ruibaby 71dbdbeb75 1.0.0-beta.5 2019-05-14 11:20:16 +08:00
ruibaby 1c1030fb67 Support disable spider. 2019-05-14 10:26:32 +08:00
ruibaby 9342fa7294 Support disable spider. 2019-05-14 10:23:30 +08:00
ruibaby 363acf467b Refactor CommonController. 2019-05-13 20:33:00 +08:00
johnniang 7b480ca32e Fix issue(#154) 2019-05-13 00:47:07 +08:00
johnniang ed81be4ffd Remove deprecated methods and resolve warnings on building 2019-05-12 23:49:27 +08:00
johnniang 748233adc4 Fix issue#149 2019-05-12 00:18:09 +08:00
ruibaby 2c8d43785d Merge remote-tracking branch 'origin/dev' into dev 2019-05-12 00:00:52 +08:00
johnniang 384ada38d1 Fix issue(#153) 2019-05-11 23:59:36 +08:00
ruibaby d0e4046257 Add version for EnvironmentDTO. 2019-05-11 23:59:07 +08:00
ruibaby d80e3950bc Update admin and comment. 2019-05-11 01:09:31 +08:00
johnniang f9be43731d Remove Async annotation on event listeners 2019-05-10 15:26:50 +08:00
ruibaby fdff4640cd Fixed anatole theme comment. 2019-05-10 15:24:16 +08:00
johnniang 9d3f409fb6 Fix fatal error while twice installations 2019-05-10 11:28:27 +08:00
johnniang 93dfc49f9d Fix get old options after saving options bug 2019-05-10 01:28:52 +08:00
ruibaby 506538d03f Merge remote-tracking branch 'origin/dev' into dev 2019-05-09 23:21:17 +08:00
ruibaby cfd6ad4720 Update admin. 2019-05-09 23:21:10 +08:00
johnniang 844aee0218 Fix theme properties not changed bug 2019-05-09 23:11:29 +08:00
ruibaby b3d0189349 Update admin. 2019-05-09 22:37:18 +08:00
johnniang 05f43d1363 Enable 10G multipart max file size and max request size 2019-05-09 22:31:09 +08:00
johnniang 9bad78d552 Fix unsupported theme media type bug 2019-05-09 22:25:30 +08:00
ruibaby 72897a0a7b Translate param tips. 2019-05-09 22:01:54 +08:00
ruibaby cfaa73aec2 Update anatole theme. 2019-05-09 21:18:28 +08:00
ruibaby dcca261951 Update halo-comment.js. 2019-05-09 12:50:56 +08:00
ruibaby 6bec0f1d10 Add halo-admin build files. 2019-05-09 11:10:52 +08:00
johnniang 3738b7adde Fix test errors 2019-05-09 00:47:32 +08:00
ruibaby 6cd6bbf94d Change gallery to photo. 2019-05-08 23:08:03 +08:00
johnniang a74549c624 Fix option updated event bug 2019-05-08 20:12:29 +08:00
johnniang ae224980da Validate install param manually 2019-05-08 17:39:10 +08:00
johnniang 62ad6cda96 Fix file encoding bug 2019-05-08 17:38:16 +08:00
johnniang d9dbc5ab13 Fix option updated event bug 2019-05-08 16:48:24 +08:00
ruibaby 7070c92b19 Fixed render atom.xml error again. 2019-05-07 21:13:05 +08:00
ruibaby 2929d08bb5 Fixed render atom.xml error. 2019-05-07 21:09:10 +08:00
ruibaby 1c3a40cbab Merge remote-tracking branch 'origin/v1' into v1 2019-05-07 20:40:42 +08:00
ruibaby 7f1683cd44 Change cdn for comment. 2019-05-07 20:40:33 +08:00
johnniang 70d4515dd0 Fix anatole error 2019-05-07 20:39:48 +08:00
johnniang 4ff188983d Add halo comment js 2019-05-07 20:16:32 +08:00
johnniang 1b48541a28 Fix migration error 2019-05-07 20:16:10 +08:00
johnniang 357f094057 Add Dockerfile support 2019-05-07 17:27:49 +08:00
johnniang f38786573e Fix fatal bug for exclude url pattern 2019-05-07 14:24:21 +08:00
johnniang e2d8792da4 Add version api for halo application 2019-05-07 11:33:58 +08:00
johnniang 497aaab67f Add halo version to application 2019-05-07 11:15:48 +08:00
johnniang 8adf79432c Remove deprecated option methods 2019-05-07 09:51:17 +08:00
johnniang b82c39e620 Move test mail to MailController 2019-05-07 09:50:13 +08:00
johnniang 0b4823d015 Refactor load mail configuration 2019-05-07 09:26:13 +08:00
johnniang ff1836e978 Let comment properties: API_ENABLED work 2019-05-07 09:06:18 +08:00
johnniang fd79c8db4d Remove useless reloadConfig in MailService 2019-05-07 09:05:12 +08:00
ruibaby ccb712d29c Merge remote-tracking branch 'origin/v1' into v1 2019-05-07 01:47:21 +08:00
ruibaby 4bd7f8f096 Complate CommentEventListener. 2019-05-07 01:47:12 +08:00
johnniang ff4876bef1 Let comments content api pass 2019-05-07 01:14:46 +08:00
ruibaby 0a3717e394 Complate CommentEventListener. 2019-05-07 00:01:15 +08:00
johnniang 147b8ce225 Fix content filter bug 2019-05-06 23:47:23 +08:00
johnniang d16a1f8de6 Remove resolved TODO tasks 2019-05-06 22:47:42 +08:00
johnniang 5271be57c1 Add content filter 2019-05-06 19:46:11 +08:00
johnniang 22a7311fef Refactor authentication filter again 2019-05-06 19:14:51 +08:00
johnniang 30f21c50ab Return post summary for listing 2019-05-06 19:01:18 +08:00
johnniang 1e15f21e88 Refactor authentication filters 2019-05-06 19:00:39 +08:00
johnniang cfc8207919 Add installation validation 2019-05-06 17:13:53 +08:00
johnniang f7d16e06a3 Complete api authentication 2019-05-06 17:01:59 +08:00
ruibaby 574ae54208 Create pageBy api for log. 2019-05-05 23:31:30 +08:00
ruibaby b2415d33ce Create ContentJournalController.java. 2019-05-05 01:10:30 +08:00
ruibaby 2a503d8550 Refactor AdminController.java. 2019-05-04 23:54:39 +08:00
ruibaby a10fa0e312 Merge remote-tracking branch 'origin/v1' into v1 2019-05-04 12:23:11 +08:00
ruibaby fc8d9de4a9 Update anatole theme. 2019-05-04 12:23:02 +08:00
johnniang 80a6cf0999 Add additional static location 2019-05-04 11:16:00 +08:00
johnniang 8930f9d0d2 Refactor some theme services 2019-05-04 10:35:34 +08:00
johnniang cbabebff68 Refactor paging latest comments 2019-05-04 10:28:18 +08:00
johnniang 4b812c8242 Return same error if username is not found 2019-05-04 10:19:43 +08:00
ruibaby be5d8cb554 Fixed sheet render error. 2019-05-04 01:45:30 +08:00
ruibaby 700f00bb5b Fixed sheet render error. 2019-05-04 01:43:58 +08:00
ruibaby 41793365e2 Create getEnvironments api. 2019-05-03 23:56:31 +08:00
ruibaby ff7ecc9d09 Create list latest by status api for comment. 2019-05-03 14:34:55 +08:00
johnniang a6697c5d6b Translate some tips 2019-05-03 11:28:13 +08:00
ruibaby 90d81b7871 Merge remote-tracking branch 'origin/v1' into v1 2019-05-02 01:55:31 +08:00
ruibaby e1d023fb35 Remove useless files. 2019-05-02 01:55:24 +08:00
johnniang 1b2f5270e2 Refactor category tree concrete 2019-05-01 21:53:42 +08:00
johnniang 4c8d38ae07 Fix migration logical bug 2019-05-01 21:46:33 +08:00
ruibaby f2b9fc768d Enable gzip. 2019-05-01 19:53:09 +08:00
ruibaby 43e362a58d Refactor CategoryTagDirective.java. 2019-04-30 23:11:26 +08:00
johnniang c06df35be9 Refactor installation procedure 2019-04-30 18:14:39 +08:00
johnniang b3ca63b528 Add theme reloading api 2019-04-30 18:01:36 +08:00
johnniang 6fcf1a6952 Refactor theme service 2019-04-30 15:58:39 +08:00
johnniang e4e36cbfe5 Refactor template existence check 2019-04-30 15:26:25 +08:00
johnniang 57172cdf55 Remove security context after every api request 2019-04-30 12:16:14 +08:00
ruibaby 03b7c33297 Fixed sheet render error. 2019-04-30 11:49:28 +08:00
ruibaby 297dafc34f Remove @SQLDelete and @Where. 2019-04-30 10:21:14 +08:00
ruibaby deaaf5be5b Update anatole theme. 2019-04-30 01:15:35 +08:00
ruibaby 57c0f80399 Merge remote-tracking branch 'origin/v1' into v1 
# Conflicts:
#	src/main/java/run/halo/app/model/freemarker/tag/PostTagDirective.java
 2019-04-30 00:51:45 +08:00
ruibaby 102fb0fee8 Fixed freemarker directive bugs. 2019-04-30 00:51:13 +08:00
johnniang d9cf8245b8 Predefine freemarker configuration 2019-04-30 00:19:06 +08:00
johnniang f7fb7c7542 Disable auto delete in cache lock for admin controller 2019-04-29 18:26:59 +08:00
johnniang f5701691fb Complete refresh token logic 2019-04-29 18:19:40 +08:00
johnniang 12a6a62794 Change /api/portal/ to /api/content/ 2019-04-29 17:45:35 +08:00
johnniang 059054c425 Fix swagger security builder error 2019-04-29 17:43:18 +08:00
johnniang 259a47e238 Enhance swagger configuration 2019-04-29 17:26:55 +08:00
johnniang 6ed9a927ac Add add method in DateUtils 2019-04-29 17:06:14 +08:00
johnniang 0b35392b1a Fix cache expiry calculation error 2019-04-29 17:02:09 +08:00
ruibaby 3193ed9f77 Complete install method. 2019-04-29 16:46:55 +08:00
ruibaby 34e13f35c0 Refactor PostTagDirective. 2019-04-29 16:19:13 +08:00
ruibaby 53eee6cb82 Refactor PostTagDirective. 2019-04-29 15:39:13 +08:00
ruibaby 683444b66f Refactor freemarker directive. 2019-04-29 15:33:18 +08:00
ruibaby 0873c59b71 Update anatole theme. 2019-04-29 15:19:37 +08:00
johnniang df30cde1ee Check installation before requesting api 2019-04-29 14:18:24 +08:00
johnniang 1a7f621502 Remove session authentication 2019-04-29 13:52:45 +08:00
johnniang 7c6708d5f4 Complete token authentication 2019-04-29 13:52:23 +08:00
johnniang e580f4fa96 Refactor partial AdminController 2019-04-29 10:48:25 +08:00
johnniang e244a91a2e Remove http servlet request inject 2019-04-29 10:20:53 +08:00
johnniang 80551dd28b Create AuthToken entity 2019-04-29 10:18:24 +08:00
johnniang ad443bd06d Replace blank blog url with machine ip when installing 2019-04-29 03:20:20 +08:00
johnniang 0134924052 Initialize work directory when starting up 2019-04-29 03:15:42 +08:00
johnniang 26c0192517 Refactor option service 2019-04-29 02:59:17 +08:00
johnniang aabc665ba0 Refactor list options by keys 2019-04-29 02:23:49 +08:00
johnniang cea6a55963 Add option cache feature 2019-04-29 02:06:02 +08:00
johnniang 6e8ef4b35a Refactor string cache store usage 2019-04-29 01:34:00 +08:00
johnniang b0cb31ad48 Enhance string cache store 2019-04-29 01:24:02 +08:00
johnniang 98a6fc9e75 Complete option updated event 2019-04-29 00:55:10 +08:00
johnniang 63d072776e Complete user update event 2019-04-29 00:45:32 +08:00
johnniang 0dbe543cff Refactor pageVosBy in BaseCommentService 2019-04-29 00:45:32 +08:00
ruibaby 51c9bbea89 Create tree_keys api for option. 2019-04-28 22:21:40 +08:00
johnniang 4635357269 Prevent to create one more users 2019-04-28 21:30:33 +08:00
johnniang 4e5694cef0 Fix existence query bug again 2019-04-28 20:51:14 +08:00
johnniang 2933e0297f Fix existence query bug 2019-04-28 20:49:37 +08:00
johnniang b4ec2b2318 Remove theme property in theme activated event 2019-04-28 20:49:22 +08:00
johnniang 31be6e18a7 Refactor FreemarkerConfiguration 2019-04-28 20:35:40 +08:00
johnniang 24a23bf7fb Change default workDir in development environment 2019-04-28 20:15:38 +08:00
johnniang c0b3f89727 Enhance migration 2019-04-28 20:07:18 +08:00
johnniang 0ded87246a Refactor user param 2019-04-28 15:17:11 +08:00