Commit Graph
28679 Commits
Author SHA1 Message Date
Hao Sun 77aa89db59 * add new icons: version、thumbs-up、thumbs-down. 2021-11-04 17:41:28 +08:00
李玉春 f14b5910fe Merge branch 'sprint/170_dingna_task_43913' into 'sprint/170'
* Finish task#43913.

See merge request easycorp/zentaopms!307
2021-11-04 08:29:24 +00:00
dingna ccabbde1e0 * Adjust code for task#43913. 2021-11-04 16:21:59 +08:00
dingna 4f30e04c95 * Adjust code for task#43913. 2021-11-04 16:18:02 +08:00
dingna 966abc3d55 * Adjust code for task#43913. 2021-11-04 16:06:08 +08:00
王怡栋 7f9a50407a Merge branch 'sprint/170_sunhao/fix_task41233' into 'sprint/170'
* Task #41233, fix open in new tab on pressed ctrl key not work as expected and improve perf.

See merge request easycorp/zentaopms!287
2021-11-04 07:22:55 +00:00
王怡栋 f0c33b07e4 Merge branch 'sprint/170_liugang/fix_fullscreen_bug' into 'sprint/170'
* Fix that can't toggle fullscreen mode in IE11.

See merge request easycorp/zentaopms!303
2021-11-04 07:21:45 +00:00
dingna 421cb2dfa8 * Adjust code for task#43913. 2021-11-04 14:48:51 +08:00
dingna 0afeb5620a * Adjust code for task#43913. 2021-11-04 14:45:40 +08:00
李玉春 b4905cdf02 Merge branch 'sprint/170_tianshujie_43907' into 'sprint/170'
* Modify variable error.

See merge request easycorp/zentaopms!311
2021-11-04 06:32:57 +00:00
tianshujie 50ad0453f6 * Modify variable error. 2021-11-04 14:25:33 +08:00
孙广明 6f5e1b75f7 Merge branch 'sprint/170_zhouxin_43877' into 'sprint/170'
Sprint/170 zhouxin 43877

See merge request easycorp/zentaopms!308
2021-11-04 06:23:51 +00:00
李玉春 9d359fa387 Merge branch 'sprint/170_hufangzhou_43899' into 'sprint/170'
* Add the last plan lang item.

See merge request easycorp/zentaopms!309
2021-11-04 05:44:25 +00:00
hufangzhou d8baf1d3fa * Add the last plan lang item. 2021-11-04 13:42:51 +08:00
zhouxin 8fe8ad90af Finish task 43877. 2021-11-04 13:22:09 +08:00
dingna 638903f5c4 * Finish task#43913. 2021-11-04 13:21:43 +08:00
孙广明 4f5e19fc66 Merge branch 'sprint/170_zhengrunyu_43915' into 'sprint/170'
*Finish task #43915.

See merge request easycorp/zentaopms!297
2021-11-04 05:14:47 +00:00
zhengrunyu 64d4d04c7e *Finish task #43915. 2021-11-04 13:13:10 +08:00
zhouxin c3558d6b75 Finish task #43877. 2021-11-04 13:12:17 +08:00
zhengrunyu 01a7ed9151 *Finish task #43915. 2021-11-04 13:09:02 +08:00
zhengrunyu 5b47d67d93 *Finish task #43915. 2021-11-04 13:05:19 +08:00
李玉春 b60cdf29e2 Merge branch 'sprint/170_hufangzhou_43899' into 'sprint/170'
* Finish task #43899.

See merge request easycorp/zentaopms!305
2021-11-04 05:04:03 +00:00
hufangzhou af5b6ff489 * Finish task #43899. 2021-11-04 11:48:22 +08:00
liugang de56fc1253 * Fix that can't toggle fullscreen mode in IE11. 2021-11-04 10:30:01 +08:00
李玉春 e3dd8fcba4 Merge branch 'sprint/170_tianshujie_43907' into 'sprint/170'
*Finish task #43907.

See merge request easycorp/zentaopms!299
2021-11-04 01:57:55 +00:00
李玉春 76bbef3f01 Merge branch 'sprint/170_songchenxuan_15695' into 'sprint/170'
* Fix bug #15695.

See merge request easycorp/zentaopms!300
2021-11-04 01:56:48 +00:00
root f79d676ad3 * Fix bug #15695 2021-11-04 09:51:54 +08:00
root 66f83b187d * Fix bug #15695 2021-11-04 09:50:51 +08:00
root 4dc9c7c5df * Fix bug #15695 2021-11-04 09:33:56 +08:00
root eafd443fca * Fix bug #15695 2021-11-04 09:31:17 +08:00
李玉春 e951745a7e Merge branch 'sprint/170_mayue_12047' into 'sprint/170'
* Fix bug #12047.

See merge request easycorp/zentaopms!298
2021-11-04 01:17:07 +00:00
tianshujie 79597546d9 * Finish task #43907. 2021-11-04 09:07:09 +08:00
mayue cb6a36fd4b * Fix bug #12047. 2021-11-04 08:54:25 +08:00
mayue f123cdefc1 * Fix bug #12047. 2021-11-04 08:18:20 +08:00
zhengrunyu 79e7052af0 *Finish task #43915. 2021-11-03 17:23:38 +08:00
zhengrunyu 3a5bbcdaf7 *Finish task #43915. 2021-11-03 17:20:24 +08:00
zhengrunyu 6a20c5b9b9 *Finish task #43915. 2021-11-03 17:16:46 +08:00
李玉春 11fc599508 Merge branch 'sprint/170_mayue_15973' into 'sprint/170'
* Fix bug #15973.

See merge request easycorp/zentaopms!291
2021-11-03 08:52:18 +00:00
李玉春 c91536aea4 Merge branch 'sprint/170_songchenxuan_15689' into 'sprint/170'
* Fix bug #15689

See merge request easycorp/zentaopms!292
2021-11-03 08:10:57 +00:00
李玉春 bf89b952d9 Merge branch 'sprint/170_dingna_task_43900' into 'sprint/170'
* Finish task#43900.

See merge request easycorp/zentaopms!286
2021-11-03 08:10:42 +00:00
李玉春 0ce134c1e4 Merge branch 'sprint/170_tianshujie_43907' into 'sprint/170'
* Finish task #43907.

See merge request easycorp/zentaopms!293
2021-11-03 08:07:55 +00:00
dingna 2dd70ed7e4 * Finish task#43900. 2021-11-03 16:02:06 +08:00
tianshujie d297c809b3 * Finish task #43907. 2021-11-03 15:51:04 +08:00
root 02c2f5e2e2 * Fix bug #15689 2021-11-03 15:45:26 +08:00
mayue fb9bc91030 * Fix bug #15973.* Fix bug #15973.* Fix bug #15973.* Fix bug #15973.* Fix bug #15973.* Fix bug #15973.* Fix bug #15973.* Fix bug #15973. 2021-11-03 15:38:49 +08:00
李玉春 c3a2ed73ba Merge branch 'sprint/170_zhouxin_43875' into 'sprint/170'
Finish task #43875.

See merge request easycorp/zentaopms!290
2021-11-03 07:38:21 +00:00
zhouxin b5d3e49e80 Finish task #43875. 2021-11-03 15:22:31 +08:00
李玉春 01e30c4dbd Merge branch 'sprint/170_mayue_15780' into 'sprint/170'
* Fix bug #15780.

See merge request easycorp/zentaopms!288
2021-11-03 07:18:17 +00:00
李玉春 961a683fcb Merge branch 'sprint/170_songchenxuan_15691' into 'sprint/170'
* Fix bug #15691.

See merge request easycorp/zentaopms!289
2021-11-03 07:17:40 +00:00
root 30c118cd9a * Fix bug #15691 2021-11-03 15:06:36 +08:00