Commit Graph
46297 Commits
Author SHA1 Message Date
xieqiyu f76d2abbea * Finish task#75319. 2022-11-08 06:49:57 +00:00
xieqiyu ceaf8a1aa5 * Finish task#75320. 2022-11-08 05:43:34 +00:00
xieqiyu 0ddb613cdc * Finish task#75323. 2022-11-08 03:03:21 +00:00
xieqiyu 5467f11490 * Code for task#75325. Sync siblings when recall review. 2022-11-08 01:39:27 +00:00
xieqiyu 7f04f391e5 * Code for task#75325. Sync siblings when recall change. 2022-11-08 01:29:44 +00:00
xieqiyu f01d68f80b * Code for task#75325. Finish submit review sync siblings. 2022-11-07 07:58:08 +00:00
xieqiyu c1f980e6d7 * Fix bug#29335. 2022-11-07 02:24:55 +00:00
lanzongjun bdba95fc00 * fix bug #29329 2022-11-07 09:33:53 +08:00
孙广明 23c9fb28ce Merge branch 'sprint/zentaopms256_lanzongjun' into 'zentaopms_256'
fix code meeting and  fix bug  #29265

See merge request easycorp/zentaopms!6024
2022-11-04 01:54:15 +00:00
lanzongjun a41290618c * fix bug #29265 2022-11-04 09:28:58 +08:00
tanghucheng 934240acb6 * Code for change story. 2022-11-04 08:57:51 +08:00
lanzongjun b697037e2e fix code meeting 2022-11-03 16:50:21 +08:00
孙广明 426f415e19 Merge branch 'sprint/zentaopms256_lanzongjun' into 'zentaopms_256'
fix meeting code

See merge request easycorp/zentaopms!6019
2022-11-03 07:54:39 +00:00
lanzongjun 3a6b109c97 fix meeting code 2022-11-03 14:49:12 +08:00
lanzongjun d9228e7eaa Merge branch 'zentaopms_256' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms256_lanzongjun 2022-11-03 14:45:10 +08:00
Yagami eee102aba0 Merge branch 'tanghucheng_zentaopms_256' into zentaopms_256 2022-11-03 13:19:58 +08:00
孙广明 4a9d245d21 Merge branch 'zentaopms_256' into 'tanghucheng_zentaopms_256'
# Conflicts:
#   module/story/js/common.js
2022-11-03 05:18:58 +00:00
lanzongjun 7466fb8bdf switch product fix 2022-11-03 10:43:51 +08:00
lanzongjun 9f93db829a switch product fix 2022-11-03 10:41:21 +08:00
xieqiyu 0b25f89725 * Add condition of edit page. 2022-11-03 02:29:36 +00:00
tanghucheng 646b34a04e * Fix ajaxRelieved for story. 2022-11-03 10:09:35 +08:00
xieqiyu d5f1e2a741 * Code for task#74151,#74155. 2022-11-03 02:02:38 +00:00
孙广明 affde0c45f Merge branch 'sprint/zentaopms256_lanzongjun' into 'zentaopms_256'
add check module

See merge request easycorp/zentaopms!6003
2022-11-03 01:35:43 +00:00
lanzongjun b3f14e9906 module requirement check 2022-11-03 09:35:03 +08:00
lanzongjun c525d43c1f fix ajax needCreate param 2022-11-03 09:29:50 +08:00
lanzongjun 204f22bdab add check module 2022-11-03 09:05:48 +08:00
孙广明 4555e2e108 Merge branch 'sprint/zentaopms256_lanzongjun' into 'zentaopms_256'
dynamic fix width

See merge request easycorp/zentaopms!6001
2022-11-02 09:21:15 +00:00
lanzongjun 6c1e8ac355 dynamic fix width 2022-11-02 17:20:02 +08:00
孙广明 dbef6bec02 Merge branch 'sprint/zentaopms256_lanzongjun' into 'zentaopms_256'
* task #74142

See merge request easycorp/zentaopms!5995
2022-11-02 09:10:34 +00:00
孙广明 bdec66c9c9 Merge branch 'tanghucheng_zentaopms_256' into 'zentaopms_256'
* Finish task #74149.

See merge request easycorp/zentaopms!5994
2022-11-02 09:10:14 +00:00
lanzongjun 73cf79584d * task #74142 code meeting fix 2022-11-02 17:06:37 +08:00
lanzongjun e523f6390f * task #74142 2022-11-02 16:02:42 +08:00
tanghucheng abac1771a4 * Finish task #74149. 2022-11-02 16:00:16 +08:00
xieqiyu 7ac890f382 * Fix bug#29180. 2022-11-02 07:36:30 +00:00
唐胡成 421d30ad23 Merge branch 'tanghucheng_zentaopms_256' into 'zentaopms_256'
* Fix bug #29177,29172.

See merge request easycorp/zentaopms!5989
2022-11-02 07:26:34 +00:00
tanghucheng fa92ed247f * Fix bug #29177,29172. 2022-11-02 15:24:43 +08:00
xieqiyu 4c99401fe5 * Code for task#74144,#74155. 2022-11-02 06:58:20 +00:00
lanzongjun f980579b0a * task #74142 2022-11-02 14:42:20 +08:00
tanghucheng 3821cc3e53 * Code for sibling story. 2022-11-02 13:12:19 +08:00
孙广明 6d0b8a3917 Merge branch 'tanghucheng_zentaopms_256' into 'zentaopms_256'
* Fix code format.

See merge request easycorp/zentaopms!5979
2022-11-02 02:59:16 +00:00
tanghucheng 06ed61a897 * Fix code format. 2022-11-02 10:56:38 +08:00
xieqiyu 630e031d59 * Add set stage of story for sync siblings. 2022-11-02 01:49:45 +00:00
xieqiyu a8fc2c5aaa * Adjust style. 2022-11-02 01:26:17 +00:00
孙广明 c13a38a8fb Merge branch 'tanghucheng_zentaopms_256' into 'zentaopms_256'
* Add group.

See merge request easycorp/zentaopms!5971
2022-11-02 00:27:42 +00:00
xieqiyu 3c57bdc787 * Adjust style. 2022-11-01 09:22:44 +00:00
xieqiyu f54e8546fa * Code for task#74154,#74153. 2022-11-01 09:17:00 +00:00
xieqiyu e80da381ba * Finish task#74154,#74153. 2022-11-01 08:06:45 +00:00
lanzongjun 5f4df78b5a * task #74142 2022-11-01 16:06:24 +08:00
xieqiyu d97b9f29d1 * Modify action name. 2022-11-01 07:51:06 +00:00
xieqiyu 0a9a801389 * Code for task#74152. 2022-11-01 07:48:34 +00:00