 wangyidong
|
4bd218b9a4
|
* finish task #4589.
|
2018-07-09 13:55:11 +08:00 |
|
|
liugang
|
8b018e63f6
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-09 11:15:35 +08:00 |
|
|
liugang
|
2ec456f319
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-09 11:15:11 +08:00 |
|
|
liugang
|
c0e5909247
|
* Fix bug.
|
2018-07-09 11:15:03 +08:00 |
|
|
Catouse
|
9aa26a2573
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-09 11:14:11 +08:00 |
|
|
Catouse
|
9255162665
|
* fix table width in story/linkstory view.
|
2018-07-09 11:14:05 +08:00 |
|
|
Catouse
|
e41051e78f
|
* update zui files.
|
2018-07-09 11:13:41 +08:00 |
|
|
Catouse
|
15335941e7
|
* update themes.
|
2018-07-09 11:13:28 +08:00 |
|
|
chenfeiCF
|
f6c5cf3689
|
* Finish task #4638.
|
2018-07-09 10:44:00 +08:00 |
|
|
chenfeiCF
|
c8ce5e64c9
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-07-09 10:43:19 +08:00 |
|
|
Catouse
|
abc1c41928
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-09 10:23:03 +08:00 |
|
|
liugang
|
9552cc6fd3
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-09 10:08:15 +08:00 |
|
|
liugang
|
370cdfad9d
|
* Finish task #4634
|
2018-07-09 10:07:52 +08:00 |
|
|
daitingting
|
f0e022127d
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-09 09:56:55 +08:00 |
|
|
daitingting
|
6d2d35bff0
|
* Adjust status when the old status is done.
|
2018-07-09 09:56:07 +08:00 |
|
|
Catouse
|
3190c876d0
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-09 09:54:54 +08:00 |
|
|
Catouse
|
2d2df9c013
|
* improve UI of block views for placement in small column.
|
2018-07-09 09:54:46 +08:00 |
|
|
Catouse
|
1cbbb130d8
|
* update zui.
|
2018-07-09 09:54:18 +08:00 |
|
|
dajiao007
|
159597411c
|
Merge branch 'master' of http://github.com/easysoft/zentaopms
|
2018-07-09 09:49:30 +08:00 |
|
|
wangyidong
|
83d7855fb9
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-07-09 09:49:10 +08:00 |
|
|
wangyidong
|
8da87c9dcf
|
* finish task #4641.
|
2018-07-09 09:48:35 +08:00 |
|
|
dajiao007
|
45df604068
|
* modify english labels
|
2018-07-09 09:45:33 +08:00 |
|
|
dajiao007
|
cb13c64e9c
|
* modify english labels
|
2018-07-09 09:39:49 +08:00 |
|
|
Catouse
|
9ed3cdd5f8
|
* improve UI of dashboard.
|
2018-07-09 09:24:34 +08:00 |
|
|
chenfeiCF
|
01e06b7a89
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-07-09 08:53:39 +08:00 |
|
|
daitingting
|
29371f8b70
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-05 17:55:49 +08:00 |
|
|
daitingting
|
0817ec73cc
|
* Optimize text.
|
2018-07-05 17:55:30 +08:00 |
|
|
wangyidong
|
5eb55fe399
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-07-05 17:06:48 +08:00 |
|
|
wangyidong
|
c527d0b64b
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-07-05 17:06:16 +08:00 |
|
|
wangyidong
|
357a0a14de
|
* finish task #4603.
|
2018-07-05 17:05:12 +08:00 |
|
|
Yagami
|
f9592f477d
|
* Finish task #4565.
|
2018-07-05 17:04:52 +08:00 |
|
|
daitingting
|
0ff9dc27d4
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-05 16:23:35 +08:00 |
|
|
daitingting
|
3bd73f1111
|
* Adjust codes.
|
2018-07-05 16:23:20 +08:00 |
|
|
wangyidong
|
c85e1f6fe6
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-07-05 15:45:14 +08:00 |
|
|
wangyidong
|
48688a7be8
|
* adjust for sql error.
|
2018-07-05 15:44:45 +08:00 |
|
|
daitingting
|
e612d79e04
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-05 15:39:08 +08:00 |
|
|
daitingting
|
5d4b235a62
|
* Compute begin and end for parent task by his children, finish task #4627.
|
2018-07-05 15:37:42 +08:00 |
|
|
wangyidong
|
bac2527f2a
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2018-07-05 15:03:18 +08:00 |
|
|
wangyidong
|
c3c9305775
|
* finish task #4556.
|
2018-07-05 14:58:46 +08:00 |
|
|
liugang
|
167c2f196e
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-05 14:26:35 +08:00 |
|
|
liugang
|
fed443460d
|
* Finish task #4628.
|
2018-07-05 14:26:18 +08:00 |
|
|
Catouse
|
29de85a69a
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-05 14:20:07 +08:00 |
|
|
Catouse
|
7565708ccd
|
* adjust style of block views.
|
2018-07-05 14:19:56 +08:00 |
|
|
Catouse
|
a373f375c8
|
* apply zui scrollbar style.
|
2018-07-05 14:19:41 +08:00 |
|
|
Catouse
|
226c1f1a3a
|
* add fade effection to dashboard element.
|
2018-07-05 14:12:28 +08:00 |
|
|
Catouse
|
47085c06eb
|
* fix style and .panel-move-handler element not remove when refresh it.
|
2018-07-05 14:11:51 +08:00 |
|
|
liugang
|
7c710b4424
|
Merge branch 'master' of https://github.com/easysoft/zentaopms
|
2018-07-05 13:56:54 +08:00 |
|
|
liugang
|
330d108f57
|
* Finish task #4637.
|
2018-07-05 13:56:37 +08:00 |
|
|
chenfeiCF
|
0fa4796de9
|
* Finish task #4512.
|
2018-07-05 13:54:18 +08:00 |
|
|
Catouse
|
c22a2127d7
|
* change line-height of .article-content.
|
2018-07-05 13:49:50 +08:00 |
|