Commit Graph
28010 Commits
Author SHA1 Message Date
zenggang 336a4e5951 * Fix bug#15368 2021-09-27 15:32:22 +08:00
朱金勇 978cfdbdc8 Merge branch 'sprint/165_test' into 'sprint/165'
* Init test framework

See merge request easycorp/zentaopms!32
2021-09-27 06:47:51 +00:00
zhujinyong f1151c37c7 * Adjust code for test demo. 2021-09-27 14:05:51 +08:00
zhujinyong e059381d7d * Supply multiple config files. 2021-09-27 02:52:35 +08:00
朱金勇 452d4d8605 Merge branch 'sprint/165_zenggang' into 'sprint/165'
Sprint/165 zenggang

See merge request easycorp/zentaopms!27
2021-09-26 09:47:55 +00:00
朱金勇 f76d206ee5 Merge branch '165_tianshujie42861' into 'sprint/165'
* Finish task #42861.

See merge request easycorp/zentaopms!24
2021-09-26 09:45:24 +00:00
tianshujie 898d78514e * Finish task #42861. 2021-09-26 17:32:52 +08:00
tianshujie 48fb6fc46f * Finish task #42861. 2021-09-26 17:23:55 +08:00
zenggang 6798a9cb46 * Fix bug#15280 2021-09-26 17:10:11 +08:00
朱金勇 98b74f4a94 Merge branch 'sprint/165_wangyidong' into 'sprint/165'
* finish task #42832.

See merge request easycorp/zentaopms!22
2021-09-26 09:08:04 +00:00
zenggang 40d848f03f * Fix bug#15282 2021-09-26 17:06:13 +08:00
朱金勇 db1ec55d84 Merge branch 'spirnt/165_liyuchun_42860' into 'sprint/165'
* Finish task #42860.

See merge request easycorp/zentaopms!26
2021-09-26 08:57:41 +00:00
liyuchun 7dfa0963e6 * Finish task #42860. 2021-09-26 16:23:20 +08:00
tianshujie 62483636fd * Finish task #42861. 2021-09-26 15:11:50 +08:00
liyuchun 36a6d9f4e3 * Finish task #42834. 2021-09-26 14:43:28 +08:00
王怡栋 e9044ca0c9 * adjust for task #42832. 2021-09-26 12:11:44 +08:00
朱金勇 beaae9f167 Merge branch 'sprint/165_dingna_task42850' into 'sprint/165'
* Finish task #42850

See merge request easycorp/zentaopms!21
2021-09-26 04:01:53 +00:00
王怡栋 0d4c2da922 * finish task #42832. 2021-09-26 10:16:10 +08:00
dingna b416d20512 * Finish task #42850 Cost:0.5h 2021-09-26 09:51:02 +08:00
管西迎 04607e8a79 Merge branch 'sprint/165_test' into 'sprint/165'
* Send encrypted password when creating user by API.

See merge request easycorp/zentaopms!20
2021-09-24 06:56:37 +00:00
zhujinyong eb04910243 * Send encrypted password when creating user by API. 2021-09-24 14:50:27 +08:00
朱金勇 1bf7d48cdb Merge branch '165_dingna' into 'sprint/165'
* Finish task #42849.

See merge request easycorp/zentaopms!11
2021-09-24 05:11:12 +00:00
朱金勇 1f9ab6c380 Merge branch 'sprint/165_dingna_task42826' into 'sprint/165'
* Finish task #42826.

See merge request easycorp/zentaopms!19
2021-09-24 05:07:05 +00:00
朱金勇 f0c48a05f7 Merge branch 'sprint/165_dingna_task42851' into 'sprint/165'
* Finish task #42851.

See merge request easycorp/zentaopms!18
2021-09-24 05:06:33 +00:00
dingna ad2da66aac * Finish task #42826. 2021-09-24 09:48:55 +08:00
dingna 27670f7b3a * Finish task #42851. 2021-09-24 09:31:23 +08:00
zhujinyong b866ebe1fd Merge branch 'sprint/165' of http://gitlab.zcorp.cc/easycorp/zentaopms into sprint/165 2021-09-24 08:44:24 +08:00
zhujinyong 9f702ff91a * Use rpe for testcase. 2021-09-24 08:43:03 +08:00
dingna 83dbf6a99d * Code for task #42849. 2021-09-23 17:07:09 +08:00
朱金勇 4d99f28b8c Merge branch '165_tianshujie' into 'sprint/165'
* Finish task #42847.

See merge request easycorp/zentaopms!10
2021-09-23 08:02:13 +00:00
dingna 0f6152e9db * Code for task #42849. 2021-09-23 15:45:44 +08:00
zhujinyong 8484303a23 + Add count config for zendata. 2021-09-23 14:55:06 +08:00
zhujinyong 4576217894 * Load config. 2021-09-23 13:18:20 +08:00
dingna 391fb25125 * Finish task #42849. 2021-09-23 11:34:44 +08:00
zhujinyong 6d90be6dcc * Init directory of test. 2021-09-23 08:58:59 +08:00
tianshujie 2a4b2497dc * Finish task #42847. 2021-09-23 08:56:40 +08:00
liyuchun f182feb33c * Fix bug #15183. 2021-09-18 08:37:12 +08:00
thanatos b977bd5eb8 fix call_user_func_array bug on php 8.0 2021-09-17 14:03:27 +08:00
dingna d9ac355260 * Fix bug #14529. 2021-09-17 13:19:57 +08:00
zenggang ee07a042a4 * Fix bug#15211,14525 2021-09-16 17:31:40 +08:00
mayue 233f599d2a * Adjust style in features page. 2021-09-16 16:55:21 +08:00
dingna a3dc73a6dc * Fix bug #15201. 2021-09-16 10:26:55 +08:00
孙广明 59c4b2b41f * Finish task #42588. 2021-09-16 10:12:30 +08:00
tianshujie 00619a268f * Fix dynamic error. 2021-09-16 09:04:36 +08:00
tianshujie a26b46215a * Fix bug #15205. 2021-09-16 08:50:11 +08:00
Hao Sun bc312bfe2d * improve UI for cropavatar dialog and fix conflict with autosize feature of ModalTrigger. 2021-09-15 19:23:32 +08:00
Hao Sun 116e8bab90 * remove unused ajax initialization. 2021-09-15 18:00:11 +08:00
Hao Sun 514492576c * fix avatar uploader not work in user profile page. 2021-09-15 17:55:12 +08:00
dingna 6e15fb25be * Modify the execution button link. 2021-09-15 16:44:23 +08:00
dingguodong 7e2466b119 * Optimize and streamline the codes. 2021-09-15 16:31:57 +08:00