z
|
154ace870a
|
* finish task #8265.
|
2020-11-12 09:25:13 +08:00 |
|
z
|
e330353df3
|
Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x
|
2020-11-11 15:41:06 +08:00 |
|
z
|
9eeae95349
|
Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x
|
2020-11-11 15:40:47 +08:00 |
|
holan20180123
|
2d0ffc2b4a
|
* Finish task #8194.
|
2020-11-11 15:40:26 +08:00 |
|
z
|
8021dd79c8
|
* adjust for minifyfront.
|
2020-11-11 15:34:46 +08:00 |
|
Catouse
|
30637fbca1
|
* task #8244, bug #3543, fix recording wrong user ip on user login.
|
2020-11-11 14:53:37 +08:00 |
|
z
|
24e55f7d2f
|
* fix bug for validater.
|
2020-11-11 14:45:45 +08:00 |
|
z
|
305ceda937
|
* finish task #3665.
|
2020-11-11 14:43:05 +08:00 |
|
Catouse
|
279674a78a
|
* task #8233, bug #3567, fix server url in im/debug view.
|
2020-11-11 13:53:00 +08:00 |
|
holan20180123
|
c241b1051f
|
* Finish task #8194.
|
2020-11-11 13:32:01 +08:00 |
|
holan20180123
|
55b26ce3cd
|
Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x
|
2020-11-11 11:18:31 +08:00 |
|
holan20180123
|
15e8463347
|
* Finish task #8194.
|
2020-11-11 11:18:08 +08:00 |
|
Catouse
|
2593bbe991
|
* task #8234, bug #3565, fix stripedRows setting of table not work in kindeditor, see http://pms.zentao.net/bug-view-3565.html
|
2020-11-11 09:56:07 +08:00 |
|
Catouse
|
691048885f
|
* task #8225, bug #3577, improve UI of picker.
|
2020-11-10 16:58:10 +08:00 |
|
holan20180123
|
de05a29a06
|
* Finish task #8255.
|
2020-11-10 16:53:29 +08:00 |
|
Catouse
|
6e6761546e
|
* task #8224, bug #3578, update zentao-integrated file for zentao client extension.
|
2020-11-10 15:38:09 +08:00 |
|
Catouse
|
1becf91146
|
* task #8227, bug #3575, enable submit button on check hours.
|
2020-11-10 15:10:15 +08:00 |
|
holan20180123
|
498256388a
|
Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x
|
2020-11-10 14:06:12 +08:00 |
|
holan20180123
|
f80458f916
|
* Finish task #8194.
|
2020-11-10 14:06:00 +08:00 |
|
tianshujie98
|
97e77a11bc
|
* Finish task #8202.
|
2020-11-10 11:44:22 +08:00 |
|
holan20180123
|
159cd5c41d
|
* Finish task #8194.
|
2020-11-10 10:34:08 +08:00 |
|
tianshujie98
|
a10b52f3c6
|
Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x
|
2020-11-10 10:10:01 +08:00 |
|
tianshujie98
|
b35cd2d1f2
|
* Fix bug.
|
2020-11-10 10:09:50 +08:00 |
|
holan20180123
|
bff623a7bc
|
* Finish task #8194.
|
2020-11-10 09:31:52 +08:00 |
|
holan20180123
|
60402b9629
|
Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x
|
2020-11-10 08:49:26 +08:00 |
|
holan20180123
|
8b1e4808c2
|
* Finish task #8194.
|
2020-11-10 08:49:00 +08:00 |
|
tianshujie98
|
449273a9b4
|
* Fix bug.
|
2020-11-10 08:30:52 +08:00 |
|
tianshujie98
|
d986bb6c97
|
Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x
|
2020-11-10 08:21:57 +08:00 |
|
tianshujie98
|
b379b8fb33
|
* Fix bug.
|
2020-11-10 08:21:42 +08:00 |
|
z
|
6e4a3637b1
|
Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x
|
2020-11-09 17:32:33 +08:00 |
|
z
|
b765cbc494
|
* finish task #8242.
|
2020-11-09 17:31:57 +08:00 |
|
tianshujie98
|
5d6312a1c4
|
* Fix bug.
|
2020-11-09 17:26:38 +08:00 |
|
tianshujie98
|
226e6738cf
|
* Finish task #8247.
|
2020-11-09 15:27:29 +08:00 |
|
holan20180123
|
dca05f8be2
|
* Finish task #8226.
|
2020-11-09 09:53:18 +08:00 |
|
z
|
7c04c8bdb8
|
* adjust code for show extension.
|
2020-11-06 16:34:58 +08:00 |
|
holan20180123
|
2011451e51
|
Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x
|
2020-11-06 16:24:20 +08:00 |
|
holan20180123
|
0c6e4dd435
|
* Finish task #8220.
|
2020-11-06 16:23:50 +08:00 |
|
tianshujie98
|
6ec4c302ba
|
* Adjust code style.
|
2020-11-06 15:03:19 +08:00 |
|
tianshujie98
|
3bc0854f51
|
* Adjust code style.
|
2020-11-06 14:59:05 +08:00 |
|
holan20180123
|
447bb54824
|
* Finish task #8222.
|
2020-11-06 14:34:29 +08:00 |
|
holan20180123
|
07d0f7c6d8
|
Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x
|
2020-11-06 14:01:58 +08:00 |
|
holan20180123
|
3fa970bc8c
|
* Finish task #8194.
|
2020-11-06 14:01:32 +08:00 |
|
holan20180123
|
09d6f83f85
|
* Finish task #8194.
|
2020-11-06 14:01:01 +08:00 |
|
tianshujie98
|
97cc8034be
|
* Adjust code style.
|
2020-11-06 13:06:22 +08:00 |
|
tianshujie98
|
7bea80d42f
|
* Finish task #8209.
|
2020-11-06 11:43:36 +08:00 |
|
tianshujie98
|
2a4927cfc6
|
* Adjust code style.
|
2020-11-06 10:08:46 +08:00 |
|
qiyu-xie
|
a8d9f1d796
|
* Finish task#8211.
|
2020-11-06 09:28:53 +08:00 |
|
tianshujie98
|
838a05196d
|
* Adjust code style.
|
2020-11-06 08:42:48 +08:00 |
|
hufangzhou
|
56c180f2ec
|
* Finish task#8243.
|
2020-11-06 08:30:58 +08:00 |
|
hufangzhou
|
981f8b25ad
|
* Adjust the indent of the code.
|
2020-11-05 17:39:08 +08:00 |
|