Commit Graph
72 Commits
Author SHA1 Message Date
liumengyi d04248fc2a * Remove , at the end of row in the lastest children in holiday. 2023-11-13 13:57:25 +08:00
Lufei ff7cd5959a * Change holiday api root.
close GH-127.
2023-11-13 09:37:38 +08:00
daitingting c19cabaf02 * Format codes. 2023-11-07 02:34:26 +00:00
daitingting c777138fae * Add required mark. 2023-11-07 02:26:24 +00:00
liumengyi 83ef12ba1a * Optimize code for holiday. 2023-10-18 10:38:37 +08:00
liumengyi 52681c0d8a * Add margin. 2023-07-25 09:07:58 +08:00
liumengyi 11b227a8d7 * Fix holiday errors. 2023-07-25 08:43:21 +08:00
liumengyi 3a98e5b166 * Unify style. 2023-07-18 09:30:04 +08:00
liumengyi ed2c6e7b2f * Change select to picker, and hidden toggle button. 2023-07-18 09:10:42 +08:00
sunguangming ae0b1a7804 * Move holiday's ext model into model.php. 2023-07-13 13:49:39 +08:00
liumengyi fa9e419b3e * Modify delete of holiday to modal box. 2023-06-30 19:39:23 +08:00
liumengyi 6815069457 * Modify width. 2023-06-25 13:57:09 +08:00
liumengyi 01e0d8217b * Set the width of the modal box to a CSS class. 2023-06-25 11:28:06 +08:00
liumengyi e29880edca * Optimize code. 2023-06-21 19:00:51 +08:00
liumengyi c6a9013ae7 * Refactor holiday::edit. 2023-06-21 18:44:12 +08:00
liumengyi 02ab7d5e5e * Optimize code. 2023-06-21 17:31:07 +08:00
liumengyi dc1880ab80 * Refactor holiday::import. 2023-06-21 17:28:02 +08:00
liumengyi cc8ad3f3c9 * Refactor holiday::create. 2023-06-21 16:36:00 +08:00
liumengyi fc14347876 * Change to modal. 2023-06-16 14:04:10 +08:00
liumengyi b340051b71 * Optimize code for holiday::browse. 2023-06-16 10:45:20 +08:00
liumengyi e0c770491a * Change to modal box. 2023-06-16 10:20:41 +08:00
liumengyi 90a51004b6 * Refactor holiday::browse. 2023-06-14 16:45:21 +08:00
zhouxin 77a2da90d9 * Batch modify quote for unit test. 2023-05-25 13:43:27 +08:00
zhouxin 4efea42989 + Move unit test from test directory to each module. 2023-04-24 02:16:47 +00:00
朱金勇 7f9d638d28 * Fix sql for dmdb. 2023-04-05 14:18:24 +00:00
wangyidong 2e596f3907 * add title for show all desc. 2023-03-01 18:34:09 +08:00
caoyanyi d6fe7e5e79 * Fix bug #32453. 2023-02-28 13:27:47 +08:00
tianshujie c82f1a02a7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_ui 2023-02-28 13:13:13 +08:00
tianshujie 573b2ef793 * Modify the holiday list style. 2023-02-28 10:36:01 +08:00
wangyidong 11507ffff2 * fix bug #32277. 2023-02-27 16:16:04 +08:00
guofeilong 0d4a09fb42 * Code for style refactors in holiday. 2023-02-17 09:33:54 +08:00
tianshujie 2a388d06a7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-16 09:00:16 +08:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
caoyanyi 53a597e301 * Hide holiday import style. 2023-02-14 15:26:59 +08:00
wangyidong 6b0a919b6f * code for task #83737. 2023-02-13 15:23:46 +08:00
caoyanyi ea3f16c869 * Optimize page style. 2023-02-08 15:00:54 +08:00
caoyanyi 3c2e056d46 * Adjust code. 2023-02-08 14:45:22 +08:00
caoyanyi adfc82feef * Optimize holiday import style. 2023-02-08 13:10:07 +08:00
caoyanyi 03ed75a2d3 * Code for task #83742. 2023-02-08 12:44:50 +08:00
Lufei 79540ab480 * Use string instead of varchar. 2022-12-08 14:23:23 +08:00
tianshujie e31283d2f9 * Modified Obtain the configuration information about the workweek. 2022-11-17 15:47:12 +08:00
wangyidong fdc9b93d82 * adjust for upgrade and holiday. 2022-09-08 16:08:03 +08:00
zhouxudong 6884f83b21 * Finish task #61110. 2022-07-20 01:31:31 +00:00
zhouxudong fd9c465df7 * Finish task #61110. 2022-07-19 02:21:10 +00:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
孙广明 192198a02f Merge branch 'test_sunjun' into 'master'
test_sunjun

See merge request easycorp/zentaopms!3262
2022-05-07 02:03:09 +00:00
sunjun 3ceae4320f test_sunjun 2022-05-07 01:41:38 +00:00
zhouxin d1ebd38016 * Add tsetcase for holiday. 2022-05-06 09:19:37 +00:00
tanghucheng 7442260c49 * Fix bug . 2022-04-28 16:47:11 +08:00