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

1404 Commits (04512db9ba99be5f735967ab82c04f73215ef5b7)

Author SHA1 Message Date
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
johnniang de70c1066e Remove useless installation render 2019-04-28 10:23:41 +08:00
johnniang 72b396e57e Fix comment sort bug 2019-04-28 00:00:28 +08:00
ruibaby 4c2f329a39 Change menu sort to priority. 2019-04-27 20:52:37 +08:00
ruibaby 07d07e2170 Update JournalController.java 2019-04-27 00:53:58 +08:00
johnniang b61d24d7bd Fix migration bug 2019-04-27 00:19:51 +08:00
johnniang 5adeed87cb Complete comments migration 2019-04-27 00:06:28 +08:00
ruibaby 6f35efe90f Support journal search. 2019-04-26 22:58:27 +08:00
johnniang c438d99d47 Complete migration handler 2019-04-26 17:09:27 +08:00
johnniang e13e56f57b Build basic controllers and services for backup and recovery 2019-04-26 10:52:05 +08:00
johnniang 72a2a0647b Refactor tag dto conversion 2019-04-26 10:13:27 +08:00
johnniang 1fd99967b5 Refactor category dto conversion 2019-04-26 10:05:39 +08:00
johnniang ad751f1797 Complete category updating api 2019-04-26 09:58:24 +08:00
ruibaby 1c7e6eaeb7 Merge remote-tracking branch 'origin/v1' into v1 2019-04-26 01:38:22 +08:00
ruibaby 288925ff12 Create journal update api for journal. 2019-04-26 01:38:12 +08:00
johnniang 987784f88a Complete sheet list and creation api 2019-04-26 01:00:25 +08:00
johnniang e8ba507717 Complete journal list and creation api 2019-04-26 00:32:52 +08:00
ruibaby 6e56732cf4 Merge remote-tracking branch 'origin/v1' into v1 2019-04-26 00:31:00 +08:00
ruibaby 473f17c257 Create menu get api for menu. 2019-04-26 00:29:25 +08:00
johnniang c454acd4a9 Perfect sheet and journal comment controller 2019-04-26 00:13:59 +08:00
johnniang 619d30bac3 Complete sheet comment list api 2019-04-26 00:08:35 +08:00
johnniang 8dc22c20e5 Complete sheet comment creation api 2019-04-25 23:40:40 +08:00
johnniang d7aebebf18 Complete journal comment list api 2019-04-25 23:13:13 +08:00
johnniang 2219583487 Complete JournalService#convertToCmtCountDto 2019-04-25 22:45:11 +08:00
ruibaby f541d470de Change gallery to photo. 2019-04-25 22:39:50 +08:00
johnniang da52405843 Remove useless post dtos 2019-04-25 22:18:57 +08:00
johnniang 16476f5a9b Refactor sheet service and contorller 2019-04-25 22:09:05 +08:00
johnniang 64397753be Refactor post service and controller 2019-04-25 22:02:40 +08:00
johnniang c3985cf9c5 Rename comment to post comment 2019-04-25 20:34:02 +08:00
johnniang c9bfd11cd5 Complete journal comment list api 2019-04-25 20:10:07 +08:00
johnniang ef2c2b2759 Refactor related comment services 2019-04-25 19:59:19 +08:00
johnniang 388a37adfe Enhance InputConverter 2019-04-25 19:59:19 +08:00
ruibaby faa2a26e7a Complate properties default value. 2019-04-25 15:58:13 +08:00
johnniang 5f6a8ba790 Refactor journal entity, repository, service and controller 2019-04-25 14:03:59 +08:00
johnniang f99efc891f Fix journal creation error 2019-04-25 14:03:59 +08:00
ruibaby 6cfca880ab Merge remote-tracking branch 'origin/v1' into v1 2019-04-25 11:54:07 +08:00
ruibaby 6c371408eb Remove Owo plugin. 2019-04-25 11:53:13 +08:00
johnniang f5ebfbe8dc Complete get journal page api 2019-04-25 11:26:57 +08:00
johnniang 25a8d663db Complete list latest journals and journal creation api 2019-04-25 10:57:15 +08:00
johnniang e854626366 Fix option list bug 2019-04-25 10:16:35 +08:00
johnniang 4819a9824f Complete option default value and type feature 2019-04-25 02:23:19 +08:00
ruibaby f893294076 Create gallery save api for gallery. 2019-04-25 01:41:41 +08:00
ruibaby cf3301d15a Create page api for gallery. 2019-04-25 01:11:58 +08:00
johnniang 8b80ed69b1 Change some variable names 2019-04-24 23:35:08 +08:00
johnniang 4695868fa7 Refactor visit event 2019-04-24 23:31:32 +08:00
ruibaby 93eb1250f7 Fixed sheet update error. 2019-04-24 23:30:27 +08:00
johnniang 4a46132ffe Refactor post service 2019-04-24 23:15:54 +08:00
ruibaby f44ffe5001 Add @Data for SheetParam. 2019-04-24 22:43:14 +08:00
ruibaby eda106fad3 Merge remote-tracking branch 'origin/v1' into v1 2019-04-24 22:29:30 +08:00
ruibaby cafe1508de Refactor SheetParam. 2019-04-24 22:29:21 +08:00
johnniang 06ad1bf82f Refactor post repository 2019-04-24 22:25:55 +08:00
johnniang 204bc8b4a4 Refactor sheet apis 2019-04-24 22:01:10 +08:00
johnniang 56ff28cbbf Refactor sheet pageBy api 2019-04-24 21:53:59 +08:00
johnniang 227891f465 Remove useless class 2019-04-24 21:47:24 +08:00
johnniang be960c2fe9 Resolve conflict 2019-04-24 21:43:50 +08:00
johnniang e77d5449d0 Refactor repo, service related comment 2019-04-24 21:41:36 +08:00
ruibaby 511b952b00 Render sheet page. 2019-04-24 19:01:31 +08:00
johnniang d256ef7653 Complete Sheet base structure 2019-04-24 18:33:42 +08:00
ruibaby 822a362a45 Update anatole setting.yaml. 2019-04-24 17:08:06 +08:00
ruibaby 02b6878aec Change options.yaml to settings.yaml. 2019-04-24 14:36:20 +08:00
johnniang 819c999dcf Build base structure of mixed entities 2019-04-24 13:40:50 +08:00
ruibaby df276066db Change page to sheet. 2019-04-24 13:38:24 +08:00
ruibaby af29d32df0 Change run.halo.app.web.controller to run.halo.app.controller 2019-04-24 11:50:04 +08:00
ruibaby 56f5577356 Change page to sheet. 2019-04-24 11:45:21 +08:00
johnniang 7b21b085e7 Change Post entity to Sheet 2019-04-24 11:27:20 +08:00
johnniang 1c9f561f22 Refactor comment creation 2019-04-24 11:04:43 +08:00
johnniang 85ba526a1d Increase post visit queue and post visit task map init capacity 2019-04-24 11:04:43 +08:00
ruibaby 6b663cce6a Send email to admin when have a new comment. 2019-04-23 23:31:29 +08:00
johnniang bfc19c9cf3 Add additional admin resources location 2019-04-23 22:53:37 +08:00
johnniang 038f9e197e Complete admin redirection 2019-04-23 22:46:40 +08:00
johnniang b2af6dcc0a Complete structure of mailing on comment 2019-04-23 21:34:04 +08:00
johnniang 3a15fb307c Replace ServiceException with EmailException in MailService 2019-04-23 20:05:34 +08:00
johnniang a5b016ef19 Add category post count support 2019-04-23 18:39:03 +08:00
johnniang 36c8a21af4 Rename output dto to dto 2019-04-23 17:50:36 +08:00
ruibaby e6e880d20a Merge remote-tracking branch 'origin/v1' into v1 2019-04-23 14:46:37 +08:00
ruibaby 81ba6e3c5f Update anatole theme. 2019-04-23 14:46:22 +08:00
ruibaby 42ec47ae2f Update CAN_EDIT_SUFFIX. 2019-04-23 00:26:28 +08:00
johnniang 7810637da4 Enable base response in content fetching api 2019-04-22 22:34:17 +08:00
johnniang d0576bf653 Change log package to logger 2019-04-22 22:22:40 +08:00
johnniang e92328911c Fix tag deletion bug 2019-04-22 22:17:36 +08:00
johnniang cee5ccba69 Complete post likes feature 2019-04-22 21:11:33 +08:00
johnniang 1daead943d Remove deprecated classes 2019-04-22 20:35:50 +08:00
johnniang 77196780ee Complete post visits statistic feature 2019-04-22 17:41:40 +08:00
ruibaby d1da6880f6 Refactor GalleryTagDirective. 2019-04-22 17:36:12 +08:00
johnniang 2ae70e1760 Complete log creation 2019-04-22 11:23:01 +08:00
johnniang 8e64b9acd6 Deprecate event queue publisher and listener manager 2019-04-22 10:56:59 +08:00
ruibaby 6b46e8a897 Support attachment query by type. 2019-04-22 00:24:16 +08:00
ruibaby b17e03acff Update anatole theme. 2019-04-21 22:56:54 +08:00
johnniang 27a8460ce1 Complete event queue publishing 2019-04-21 22:52:32 +08:00
ruibaby d41c32da43 Complete archives page controller. 2019-04-21 16:21:13 +08:00
ruibaby 25ca8b96be Change portal.api to content.api. 2019-04-21 16:09:02 +08:00
ruibaby 4c2eaa1266 Complete search controller. 2019-04-21 15:55:31 +08:00
ruibaby 6fa03b0f21 Complate category page and tag page. 2019-04-21 15:35:16 +08:00
johnniang 336b5bea71 Update common_macro.ftl 2019-04-21 14:56:42 +08:00
ruibaby 45e6030594 Update common_macro.ftl. 2019-04-21 14:51:27 +08:00
johnniang 7983ba8fb1 Fix list previous posts bug 2019-04-21 14:46:51 +08:00
ruibaby 36f69cab39 Refactor gallery page. 2019-04-21 14:45:33 +08:00
johnniang 38eadc9674 Add list previous and next posts service 2019-04-21 14:31:10 +08:00
johnniang 384286782f Optimize content archive controller 2019-04-21 14:22:28 +08:00
ruibaby 135586b4ec Update anatole theme. 2019-04-21 12:24:37 +08:00
johnniang b6e42e2d7e Add get preview and next post feature 2019-04-21 11:52:41 +08:00
ruibaby 6f6ed51e8a Merge remote-tracking branch 'origin/v1' into v1 2019-04-21 11:45:02 +08:00
ruibaby 219560714b Update anatole theme. 2019-04-21 11:44:47 +08:00
johnniang 2292db3c59 Refactor content feed part 2019-04-21 11:41:31 +08:00
johnniang 0353c92995 Handle HttpMediaTypeNotAcceptableException with 406 status 2019-04-21 10:03:28 +08:00
johnniang 4cd77ed829 Disallow to return some settings that aren't in theme configuration 2019-04-21 09:32:08 +08:00
johnniang 5a7b02c4aa Convert theme setting with type 2019-04-21 00:52:43 +08:00
johnniang fe391c93e7 Change halo properties boxed bool type to primitive bool type 2019-04-20 22:52:20 +08:00
johnniang 287250358e Change list media types api path to snake style 2019-04-20 21:27:20 +08:00
johnniang 175739dbd4 Fix theme activation bug 2019-04-20 21:24:26 +08:00
ruibaby ea761fa73f Merge remote-tracking branch 'origin/v1' into v1 2019-04-20 19:12:47 +08:00
ruibaby e13c617c81 Support attachment query by media type. 2019-04-20 19:12:35 +08:00
johnniang 987d160075 Remove some useless codes 2019-04-20 18:00:21 +08:00
johnniang bd9dd69674 Refactor freemarker configuration with event 2019-04-20 17:52:26 +08:00
ruibaby bd7d627d76 Merge remote-tracking branch 'origin/v1' into v1 2019-04-20 17:03:53 +08:00
ruibaby 297bde97d2 Update anatole theme. 2019-04-20 17:03:42 +08:00
johnniang e81ed5b660 Add theme folder name in theme property 2019-04-20 16:57:13 +08:00
johnniang e46c1f8740 Replace themeName with themeId 2019-04-20 16:31:47 +08:00
johnniang feeecc30b2 Fix theme render build error 2019-04-20 16:10:27 +08:00
ruibaby ff4f9c4bd6 Create update api for attachment. 2019-04-20 12:26:52 +08:00
johnniang 5b59a8ab50 Complete theme fetching feature 2019-04-19 13:57:28 +08:00
johnniang ef9b6eb9f8 Change theme property list to set 2019-04-19 10:49:34 +08:00
johnniang 01b57826f0 Refactor theme uploading and addition 2019-04-19 10:15:28 +08:00
johnniang ef417a2c14 Add some useful features to FileUtils 2019-04-19 09:36:20 +08:00
johnniang 3d17e0f786 Perfect FileUtils 2019-04-19 08:31:05 +08:00
ruibaby 8b688e784a Merge remote-tracking branch 'origin/v1' into v1 2019-04-19 00:48:21 +08:00
ruibaby 4a2ac0bf29 Support attachment search. 2019-04-19 00:47:58 +08:00
johnniang 5ebf5653f3 Move theme config handler to new package 2019-04-18 23:42:51 +08:00
johnniang 76b3310027 Add a common theme addition service 2019-04-18 23:41:31 +08:00
ruibaby 9e9bd1a377 Create pageBy api for comment. 2019-04-18 22:21:39 +08:00
johnniang 54b4f9da68 Refactor authentication filter 2019-04-17 00:41:40 +08:00
johnniang 8517f98ee4 Change router from /admin/api to /api/admin 2019-04-16 23:41:08 +08:00
ruibaby c2bcfd59fc Create update api for link. 2019-04-16 23:17:29 +08:00
johnniang 59ecc132b3 Disable open in view feature of jpa 2019-04-16 23:11:09 +08:00
johnniang 4b7df3286f Change default theme id to caicai_anatole 2019-04-16 23:11:09 +08:00
ruibaby fae4b9a4ef Clear cache when theme uploaded. 2019-04-16 20:15:43 +08:00
ruibaby 001d9f8885 Complates upload theme api. 2019-04-16 20:01:20 +08:00
ruibaby 297b751e38 Add createTime for AttachmentOutputDTO. 2019-04-15 20:55:17 +08:00
ruibaby 94e77c3d4b Resolve attachment relative path problem again. 2019-04-13 19:08:23 +08:00
johnniang b138c2f820 Add avatar property in ThemeProperty#Author 2019-04-13 00:20:17 +08:00
johnniang 028b2b423f Resolve attachment relative path problem 2019-04-12 19:13:11 +08:00
johnniang 184523c8a3 Clear theme cache when saving options 2019-04-12 10:00:21 +08:00
johnniang 734b9e7338 Allow copying theme folder in non production environment 2019-04-11 23:49:46 +08:00
johnniang dda7225b2d Refactor theme configuration and theme property resolvers 2019-04-11 23:42:24 +08:00
ruibaby eeeee26b7c Refactor theme.yaml. 2019-04-11 22:48:14 +08:00
ruibaby 7e2948950c Change theme.properties to theme.yaml. 2019-04-11 22:47:27 +08:00
johnniang 6a37a9ae01 Refactor theme files comparision rule 2019-04-11 21:38:10 +08:00
johnniang 0e208448e6 Refactor category remove service 2019-04-11 21:38:10 +08:00
ruibaby de7b44cbbc 移除 hutool-setting 2019-04-11 21:35:21 +08:00
ruibaby 7c3d795cd4 主题文件列表排序 2019-04-11 21:14:40 +08:00
johnniang adabcedb5a Add more log detail print of hibernate in development environment 2019-04-11 09:26:51 +08:00
johnniang cad85c0bc7 Extract pageListVoBy to convertToListVo in PostService 2019-04-11 09:26:51 +08:00
johnniang 3d8579cb13 Complete post query api 2019-04-10 16:52:40 +08:00
johnniang 4b486ae099 Perfect theme configuration resolve 2019-04-10 12:48:21 +08:00
johnniang 901a6a0456 Change Tab to Group 2019-04-10 11:58:40 +08:00
johnniang e84025e9e3 Complete yaml theme configuration resolver 2019-04-10 11:53:22 +08:00
johnniang f72be35337 Move theme configuration entities 2019-04-10 11:29:20 +08:00
johnniang 8054b8f714 Complete yaml conversion test 2019-04-10 11:12:15 +08:00
johnniang 8a8d55eae1 Add data type property into ThemeSetting entity 2019-04-10 08:26:16 +08:00
johnniang b8fd0e4841 Add screenshots and isActivated into ThemeProperties 2019-04-09 22:06:46 +08:00
johnniang a68431b09f Complete theme setting api 2019-04-09 20:44:26 +08:00
johnniang cd82468496 Refactor ThemeSetting entity 2019-04-09 20:01:24 +08:00
johnniang 1b249de99e Complete copy folder from jar file 2019-04-09 19:49:00 +08:00
johnniang 52c3081577 Fix option list bug 2019-04-09 15:22:33 +08:00
johnniang fbb3653599 Add DirectoryAttackTest 2019-04-09 14:05:36 +08:00
johnniang 6a97628ffa Add a fetch theme configuration by theme id api 2019-04-09 14:01:10 +08:00
johnniang 67409cb792 Refactor ThemeService 2019-04-09 13:57:24 +08:00
johnniang 81dea867eb Fix hasOptions bug 2019-04-09 10:38:48 +08:00
johnniang e098e44d58 Enhance ThemeService 2019-04-09 10:18:48 +08:00
ruibaby 9b3bdc8d5e Refactor theme.properties. 2019-04-09 10:07:14 +08:00
johnniang 1f703ecf45 Fix some implicit bugs 2019-04-09 09:10:25 +08:00
johnniang 468a0323b4 Refactor and beauty codes 2019-04-09 01:18:52 +08:00
johnniang f87dc413e3 Remove source column of Option entity 2019-04-08 23:37:00 +08:00
johnniang 1fe26cb7d8 Add ThemeSetting entity 2019-04-08 23:23:03 +08:00
johnniang edefa7e810 Add some logs in save option service 2019-04-08 22:58:30 +08:00
johnniang 8fb7057cd4 Refactor ThemeService 2019-04-08 22:45:42 +08:00
ruibaby ad069a1812 Complate options.yaml for Material theme. 2019-04-08 22:39:36 +08:00
ruibaby 7a88a0c38b Update options.yaml for Material theme. 2019-04-08 22:09:18 +08:00
ruibaby c72934f671 Refactor ThemeService. 2019-04-08 21:58:13 +08:00
ruibaby 21c39ac33a Modify options.yaml 2019-04-08 21:42:52 +08:00
johnniang d35b6e7da3 Refactor controllers and HaloConst 2019-04-08 19:12:30 +08:00
johnniang d717d72303 Update anatole options.yaml again 2019-04-08 17:32:24 +08:00
johnniang 8398b1c40e Update anatole options.yaml 2019-04-08 17:08:48 +08:00
johnniang 23cd1d17fc Complete theme configuration fetch api 2019-04-08 16:08:19 +08:00
johnniang f362a56bc7 Refactor anatole options.yaml 2019-04-08 13:46:22 +08:00
ruibaby 7399d67b6a Add options.yaml for Material theme. 2019-04-08 12:38:22 +08:00
ruibaby 313377802b Add options.yaml for anatole. 2019-04-08 12:19:08 +08:00
johnniang 99e12d7941 Deprecate some dangerous services 2019-04-08 11:34:54 +08:00
ruibaby 8860a3270e 菜单支持多级 2019-04-07 21:49:08 +08:00
ruibaby c42203ac20 提供删除主题的接口 2019-04-07 17:49:32 +08:00
ruibaby e5abaefc37 提供删除主题的接口 2019-04-07 17:44:34 +08:00
ruibaby eeb06ca9bb Revert 2019-04-06 20:59:52 +08:00
ruibaby 5c1b521b11 删除无用配置 2019-04-05 23:40:26 +08:00
ruibaby 7fad38ebec 代码优化 2019-04-05 23:35:41 +08:00
RYAN0UP_ 48528fd169
Merge pull request #137 from MyFaith/v1 
增加阿里云附件上传
 2019-04-05 23:18:05 +08:00
MyFaith 56e350b972 阿里云附件上传 2019-04-05 23:07:22 +08:00
ruibaby 0530171e5f 代码优化 2019-04-05 20:18:31 +08:00
ruibaby cb4519a3ed Add message about datasource configuration for application.yaml. 2019-04-05 11:52:07 +08:00
ruibaby 105fb451af Create api for get custom template. 2019-04-04 17:04:58 +08:00
ruibaby 82af70abcc Complete admin theme api. 2019-04-04 14:06:30 +08:00
johnniang 94eacf1da6 Update Arrays.asList with Collections.singletonList 2019-04-03 23:54:32 +08:00
johnniang 545bb023eb Change dev database config from mysql to h2 2019-04-03 23:53:03 +08:00
ruibaby 2db1669e3f Change base package to run.halo.app. 2019-04-03 20:06:59 +08:00
johnniang 68393361cd Remove url validation on url property of Menu 2019-04-03 17:33:41 +08:00
johnniang 6ceb18784f Complete menu updation and deletion api 2019-04-03 17:26:37 +08:00
johnniang 65d42a1bdb Complete menu creation api 2019-04-03 17:20:50 +08:00
johnniang 7793737459 Complete menu list api 2019-04-03 17:04:18 +08:00
ruibaby 69b25189b6 Fixed bugs. 2019-04-03 14:21:26 +08:00
ruibaby 4c5a586543 Remove the THEME attribute from BaseContentController. 2019-04-03 13:45:54 +08:00
johnniang 1a6f549fbf Complete portal option apis 2019-04-03 12:16:12 +08:00
johnniang b2c41adadb Complete link team view api 2019-04-03 11:48:31 +08:00
johnniang f36f101f08 Complete link creation api 2019-04-03 11:48:31 +08:00
johnniang b7fa57902e Move comment list api from admin to portal 2019-04-03 10:34:04 +08:00
johnniang c95b52a5f3 Complete portal comment api 2019-04-03 10:28:19 +08:00
johnniang c2361bbae0 Complete cc.ryanc.halo.web.controller.portal.api.UserController#getProfile 2019-04-03 09:59:09 +08:00
johnniang c45185dd6f Refactor some entities 2019-04-03 09:41:46 +08:00
johnniang ed8d86f2bd Fix test errors and comment build.testResources in pom.xml 2019-04-03 09:26:41 +08:00
johnniang 717e5b25b4 Complete cc.ryanc.halo.web.controller.portal.api.TagController.listPostsBy api 2019-04-03 02:11:19 +08:00
johnniang e64298209e Add another cc.ryanc.halo.repository.base.BaseRepository.findAllByIdIn(java.lang.Iterable<ID>, org.springframework.data.domain.Pageable) common method 2019-04-03 02:10:21 +08:00
johnniang 6e9936119d Complete cc.ryanc.halo.web.controller.portal.api.PostController#pageBy and #getBy 2019-04-02 23:44:17 +08:00
johnniang 87264d89bc Add TagController for portal api 2019-04-02 23:10:26 +08:00
ruibaby 54a1b59a15 Merge remote-tracking branch 'origin/v1' into v1 2019-04-02 22:58:12 +08:00
ruibaby cc1dcc3ffa Refactor ThemeService 2019-04-02 22:58:01 +08:00
ruibaby 9f41562620 Merge remote-tracking branch 'origin/v1' into v1 
# Conflicts:
#	src/main/java/cc/ryanc/halo/service/impl/ThemeServiceImpl.java
 2019-04-02 22:56:30 +08:00
ruibaby 14d69f28e4 Refactor ThemeService 2019-04-02 22:55:29 +08:00
johnniang e8a78182b8 Add some comments on FilenameUtils 2019-04-02 22:55:17 +08:00
johnniang 327aecae18 Beautify some details 2019-04-02 22:42:18 +08:00
johnniang b5fd862b65 Add some default value before persisting 2019-04-02 18:40:15 +08:00
johnniang 658667541d Complete ArchiveController#listMonthArchives 2019-04-02 18:11:19 +08:00
johnniang 3c70b83c1d Complete ArchiveController#listYearArchives 2019-04-02 17:43:27 +08:00
ruibaby 1468307620 Refactor ThemeService 2019-04-02 16:59:50 +08:00
ruibaby 44163519c3 Create api of theme files. 2019-04-02 16:57:08 +08:00
johnniang ceb8887454 Add @Transactional annotation on option saving methods 2019-04-02 00:36:24 +08:00
johnniang fc7304bc46 Fix PrimaryProperties implementation bug 2019-04-02 00:25:28 +08:00
johnniang 2951fc5307 Refactor properties 2019-04-02 00:21:46 +08:00
johnniang 64d108d929 Repackage properties 2019-04-01 23:01:45 +08:00
johnniang 1fd26a35ea Fix CORS bug 2019-04-01 15:14:42 +08:00
johnniang 1a3ea785b8 Refactor option source 2019-04-01 12:02:11 +08:00
johnniang c3739ff8b8 Add option map view list an creation api 2019-04-01 11:54:48 +08:00
johnniang 67c18808df Complete comment list view api 2019-04-01 00:48:44 +08:00
johnniang 6f9aac5aad Fix comment creation bug when admin is logging in 2019-03-31 00:01:30 +08:00
johnniang fd9fe59144 Add some default values when persisting Comment entity 2019-03-30 23:41:41 +08:00
johnniang a0738f9ea2 Add tryAuthUrlMethodPatterns for skipping authentication failure if necessary 2019-03-30 23:27:37 +08:00
johnniang 78b6fe5fe2 Enhance exclude url patterns of AdminAuthenticationFilter 2019-03-30 22:45:28 +08:00
ruibaby e99561ef6a Remove useless files 2019-03-30 11:32:48 +08:00
johnniang 4b6887acd9 Add additional counts to return 2019-03-30 00:38:04 +08:00
johnniang 943d8f0865 Complete multi files upload api 2019-03-30 00:20:49 +08:00
johnniang 0324947f36 Complete logout api 2019-03-29 23:25:25 +08:00
johnniang e5f5a66c75 Run a timer for cache cleaner 2019-03-29 22:10:19 +08:00
johnniang baefbf220c Merge remote-tracking branch 'origin/v1' into v1 2019-03-29 21:39:47 +08:00
johnniang 22d04a554b Complete Smms file handler 2019-03-29 21:39:35 +08:00
ruibaby 6ce7721108 Remove ehcache 2019-03-29 19:43:29 +08:00
johnniang fd59393634 Format error tip for banning 2019-03-29 15:08:38 +08:00
johnniang fdc294b335 Fix user login error 2019-03-29 14:41:45 +08:00
johnniang 523afaebe4 Refactor AdminAuthenticationFilter 2019-03-29 12:15:26 +08:00
johnniang e973bf2200 Return access control allow origin with origin where belongs to client 2019-03-29 01:34:33 +08:00
johnniang ac15c7ae48 Remove useless classes 2019-03-29 00:33:39 +08:00
johnniang ac4d50c785 Refactor ValidationUtils 2019-03-29 00:33:22 +08:00
johnniang cd9313c929 Set SecurityContext for development 2019-03-28 23:18:30 +08:00
johnniang 35a2ddf546 Provide an authentication enabled option 2019-03-28 22:52:54 +08:00
johnniang 0add4107ef Replace synchronized with ReentrantLock 2019-03-28 21:55:23 +08:00
johnniang ddf3c7a4fc Remove useless synchronized key work 2019-03-28 21:42:00 +08:00
johnniang 11f28f11da Complete CacheLock support 2019-03-28 19:52:16 +08:00
johnniang 8d04bec3b2 Fix putIfAbsent bug in InMemoryCacheStore 2019-03-28 18:25:57 +08:00
johnniang 58bf3c1d2a Add putIfAbsent method in CacheStore 2019-03-28 15:27:00 +08:00
ruibaby 5846d5abb9 完善注释 2019-03-28 14:39:36 +08:00
johnniang 68b78b9267 Refactor CacheStore 2019-03-28 14:21:42 +08:00
johnniang 8d82a03e90 Refactor admin authentication failure handler 2019-03-28 10:36:52 +08:00
johnniang f4611a3478 Set error data when authentication failure 2019-03-28 01:32:01 +08:00
johnniang 6139392909 Initialize a test user if absent when startup 2019-03-28 01:29:32 +08:00
johnniang dd2caca58d Complete admin login api 2019-03-28 01:16:15 +08:00
johnniang 42032e3b78 Complete AdminAuthenticationFilter 2019-03-28 00:03:59 +08:00
ruibaby 9a9295d6c1 Fixed save options error 2019-03-27 23:16:49 +08:00
ruibaby 29834a9932 Rename filehandler to handler 2019-03-27 22:45:50 +08:00
johnniang 4f11942c9c Add all enum type converter 2019-03-27 21:53:56 +08:00
johnniang 3714e8e5bf Remove Customized Logger 2019-03-27 20:08:32 +08:00
johnniang 272a38cf12 Complete UpYun deletion handler 2019-03-27 19:55:41 +08:00
johnniang 51f71c0255 Complete QnYun deletion handler 2019-03-27 19:44:20 +08:00
johnniang c37b6dd4f8 Complete attachment deletion permanently service 2019-03-27 19:37:22 +08:00
johnniang b6f1a29951 Complete local file deletion service 2019-03-27 19:19:54 +08:00
johnniang 69b77ac245 Set key filed on UploadResult 2019-03-27 15:38:26 +08:00
johnniang e60460362b Refactor MailService 2019-03-27 15:12:27 +08:00
johnniang 58287e3ff3 Add EmailProperties 2019-03-27 15:12:27 +08:00
ruibaby 1d26aad03e Merge remote-tracking branch 'origin/v1' into v1 2019-03-27 14:52:24 +08:00
ruibaby 27036013bd Create application-user.yaml 2019-03-27 14:52:08 +08:00
johnniang e48e0de6a4 Refactor FileHandler 2019-03-27 13:28:58 +08:00
johnniang 5e60db3819 Replace FileService with FileHandlers 2019-03-27 11:22:38 +08:00
johnniang 88e0bc3099 Build FileHandler basic structure 2019-03-27 11:09:46 +08:00
johnniang b85152f8a7 Complete uploadToYpYun service 2019-03-27 10:47:57 +08:00
johnniang ab58e800c4 Handle thumbnail while media type of the file is an image type 2019-03-27 09:19:24 +08:00
johnniang 3c56b60b95 Complete uploadQnYun service 2019-03-27 00:40:40 +08:00
johnniang e042d83baf Refactor BlogProperties 2019-03-26 23:00:31 +08:00
johnniang 7052c3ccf7 Beauty initThemes 2019-03-26 22:08:57 +08:00
ruibaby 39407aa8cf Refactor StartedListener 2019-03-26 21:18:52 +08:00
ruibaby 1d95969198 Merge remote-tracking branch 'origin/v1' into v1 2019-03-26 20:50:29 +08:00
ruibaby f041dfede4 Create initTheme method for StartedListener 2019-03-26 20:49:16 +08:00
johnniang 17e68daf76 Complete file upload locally 2019-03-26 20:32:28 +08:00
ruibaby 888c218643 Fix errors caused by ThemeService 2019-03-26 15:36:12 +08:00
ruibaby 7060cc8046 Fix errors caused by ThemeService 2019-03-26 15:24:44 +08:00
ruibaby ca73a30c78 Create ThemeService 2019-03-26 15:00:29 +08:00
johnniang 3b451491a8 Add workDir config 2019-03-26 14:55:41 +08:00
ruibaby 92e4804bf0 Refactor ThemeUtils 2019-03-26 14:34:55 +08:00
johnniang 88b6d55d23 Fix tag count fetch feature 2019-03-26 14:02:19 +08:00
johnniang 157689b0c2 Complete password update api and refactor user create api 2019-03-26 11:08:04 +08:00
johnniang e8a9498ea4 Complete tag update api 2019-03-25 22:14:34 +08:00
johnniang a8eb88956c Refactor listTags api 2019-03-25 22:05:49 +08:00
johnniang 836e9975e8 Complete delete comment api 2019-03-25 19:33:50 +08:00
johnniang 6b0dc1ce5e Complete comment status update api 2019-03-25 19:26:03 +08:00
johnniang 2e94ff0524 Add additional content in comment content 2019-03-25 18:51:34 +08:00
johnniang 3a1bf64636 Complete comment tree view api 2019-03-25 18:39:12 +08:00
johnniang 8935f7478a Handler user agent with system 2019-03-25 15:52:59 +08:00
johnniang 7a679d0f8e Rename CommentVO to CommentListVO 2019-03-25 15:29:47 +08:00
johnniang 22baaa0972 Remove comment template splicing 2019-03-25 14:50:15 +08:00
johnniang 42fced1c02 Complete comment creation api 2019-03-25 13:21:25 +08:00
johnniang ee2bc1c5ed Refactor BlogProperties enum 2019-03-25 13:18:09 +08:00
johnniang c52123edc6 Fix spring.config.additional-location default config again 2019-03-25 09:59:17 +08:00
johnniang 61ab4a21cb Fix spring.config.additional-location default config 2019-03-25 09:53:17 +08:00
ruibaby 6a2a4532b7 Config freemarker template loader 2019-03-24 10:44:24 +08:00
johnniang 89a3d76160 Add spring.config.additional-location default config 2019-03-23 22:35:51 +08:00
johnniang 847828cd14 Refactor cache owo 2019-03-23 16:12:18 +08:00
johnniang a07bddcb7a Abstract PostRepository for Post, Page and Journal entities 2019-03-23 00:00:18 +08:00
johnniang 8575bcb2ad Refactor Post entity for including Page and Journal entity 2019-03-22 23:50:17 +08:00
johnniang a7af1e7f77 Refactor OPTIONS and remove it 2019-03-22 19:35:11 +08:00
johnniang 2b7753bccf Refactor HaloUtils 2019-03-22 19:06:42 +08:00
ruibaby 1ddb1043d4 Refactor theme module 2019-03-22 18:51:07 +08:00
ruibaby 1018481bd9 Refactor OptionService 2019-03-22 17:21:01 +08:00
ruibaby 3100c9eb29 Refactor Option entity 2019-03-22 17:15:17 +08:00
ruibaby cd3a5845fa Refactor ContentFeedController.java 2019-03-22 16:36:14 +08:00
ruibaby 1c0b225dee Merge branch 'v1' of C:\Users\RYAN0UP\Desktop\halo with conflicts. 2019-03-22 16:34:08 +08:00
johnniang 2184102c68 Resolve implicit concurrency problem 2019-03-22 16:21:19 +08:00
johnniang dfec650f79 Add top priority property in Comment entity 2019-03-22 16:01:00 +08:00
ruibaby a2335bb9a2 Create Freemarker custom tags 2019-03-22 15:59:14 +08:00
ruibaby fadf12a065 Improve apis 2019-03-22 15:24:13 +08:00
johnniang b6f29c0bac Fix null pointer exception 2019-03-22 11:44:00 +08:00
johnniang 47a0f40ce1 Add comment count support in PostListVO 2019-03-22 11:12:02 +08:00
johnniang 1721bb4e15 Complete post removing api 2019-03-22 11:11:24 +08:00
johnniang 20e83c6b2b Disable invoke super equal and hashCode method in PostTag and PostCategory 2019-03-22 10:08:47 +08:00
johnniang 95f23f84ea Fix update post bug 2019-03-21 23:59:56 +08:00
johnniang 7935ccd728 Complete post getting api 2019-03-21 23:47:52 +08:00
johnniang af4c31b676 Refactor post creation and update api 2019-03-21 23:25:15 +08:00
johnniang 7853bd679c Complete post update api 2019-03-21 23:09:24 +08:00
johnniang f27f4f8833 Enhance post creation api 2019-03-21 22:11:15 +08:00
johnniang 3d80e34215 Customize PostCategory#equals and PostTag#hashCode 2019-03-21 22:07:07 +08:00
johnniang c5e675ce66 Customize PostTag#equals and PostTag#hashCode 2019-03-21 22:05:34 +08:00
johnniang 0d814e88a2 Enable getDefaultPageSize again 2019-03-21 21:54:31 +08:00
ruibaby 3456e097c8 Create ContentPageController 2019-03-21 21:05:29 +08:00
ruibaby 000bc6f245 Create ContentFeedController 2019-03-21 20:56:18 +08:00
ruibaby fc4beb2447 Create ContentTagController 2019-03-21 20:48:42 +08:00
ruibaby d81837e3c9 Refactor WebMvcAutoConfiguration 2019-03-21 20:26:42 +08:00
johnniang f0651f8c37 Complete post creation api 2019-03-21 19:26:05 +08:00
ruibaby 078b6ab9c7 Refactor comment module 2019-03-21 16:45:38 +08:00
ruibaby 9b7227dc80 Refactor material theme 2019-03-21 16:38:43 +08:00
ruibaby 3f8dc55ae8 Merge remote-tracking branch 'origin/v1' into v1 2019-03-21 16:29:38 +08:00
ruibaby e1be3169c2 Refactor anatole theme 2019-03-21 16:29:12 +08:00
johnniang 8d120e7927 Complete category creation and enhance category tree view api 2019-03-21 15:19:40 +08:00
johnniang 72eca3a5b5 Complete category tree view api 2019-03-21 14:42:48 +08:00
ruibaby 3ffecd84e4 Refactor UserServiceImpl 2019-03-21 14:35:21 +08:00