Commit Graph

1687 Commits

Author SHA1 Message Date
wangyidong
c0e0423c09 Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-21 16:20:45 +08:00
wangyidong
b93dd94b05 * code for task #6548. 2019-11-21 16:19:59 +08:00
guanxiying
5aa701c747 Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-21 14:23:06 +08:00
Catouse
7734d23fea * fix border of input-group controls in task/create view. 2019-11-21 14:22:10 +08:00
guanxiying
adcd079064 Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-21 14:21:08 +08:00
guanxiying
bad6bbd39c * Add httpOnly param when setcooki. 2019-11-21 14:20:11 +08:00
Catouse
827db2d03f * task #6525, bug #2791. 2019-11-21 14:19:33 +08:00
wangyidong
23c78dece4 * finish task #6548. 2019-11-20 14:25:59 +08:00
Yagami
39e4ddb259 * Finish task #6544. 2019-11-20 10:14:17 +08:00
Yagami
e91028bbb7 * Finish task #6518. 2019-11-19 09:32:12 +08:00
guanxiying
58357af226 * Finish task #6549. 2019-11-18 13:06:50 +08:00
Yagami
aed741992d * Fix module export. 2019-11-15 11:25:28 +08:00
Yagami
51e84b63ee * Finish task #6484. 2019-11-14 14:25:26 +08:00
wangyidong
c628ea60ef * adjust for style. 2019-11-07 11:31:33 +08:00
wangyidong
20a1c5b375 * add CHANGELOG and change de fr zh-tw lang. 2019-10-17 10:14:57 +08:00
wangyidong
6e2a0996d9 + add for Françalang. 2019-10-16 17:28:10 +08:00
Yagami
499964122e * Code for task #1493. 2019-10-16 16:17:49 +08:00
Yagami
d383adbb8b Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-10-14 15:57:01 +08:00
Yagami
697a1122ba * Code for task #6410. 2019-10-14 15:55:30 +08:00
wangyidong
33f5465b54 * finish task #6416. 2019-10-14 15:43:58 +08:00
Yagami
31af090d1e * Finish task #6410. 2019-10-14 14:39:56 +08:00
wangyidong
e5dad96cd2 Merge branch 'master' of github.com:easysoft/zentaopms 2019-10-14 09:36:34 +08:00
wangyidong
8897e5ab4e * finish task #6434. 2019-10-14 09:36:01 +08:00
Yagami
06738da7b7 * Fix activate parent task logic. 2019-10-14 09:27:21 +08:00
Yagami
e1d405f16b * Fix bug. 2019-10-12 17:04:23 +08:00
Yagami
a11601eaff * Finish task #6459. 2019-10-12 15:40:25 +08:00
Yagami
727c6f4fce * Finish task #6451. 2019-10-12 10:09:27 +08:00
Yagami
7116b062ea * Finish task #6403. 2019-10-11 13:29:19 +08:00
Yagami
b16752383d * Finish task #6392. 2019-10-10 14:39:46 +08:00
Yagami
fe47c0600a * Finish task #6381. 2019-10-09 16:49:09 +08:00
wangyidong
8dfe360c5c * adjust for computeHours4Multiple when update task. 2019-09-25 08:51:01 +08:00
wangyidong
c3cd2b7af7 * fix bug #2722. 2019-09-24 10:07:45 +08:00
wangyidong
0a0ce92796 * fix bug. 2019-09-23 16:26:54 +08:00
wangyidong
c16eeefa33 * replace ne() function to notIN(). 2019-09-05 16:00:04 +08:00
Yagami
51fc8211a9 * Remove console. 2019-09-03 15:34:58 +08:00
wangyidong
e161871c4f * code for task #6289. 2019-09-02 15:38:05 +08:00
Yagami
d206d13913 * Finish task #6316. 2019-09-02 10:49:43 +08:00
wangyidong
2a83351760 * add en and zh-tw lang. 2019-08-22 17:34:55 +08:00
wangyidong
162887854f * finish task #6233. 2019-08-22 11:14:56 +08:00
wangyidong
253e0ab3a8 * finish task #6231. 2019-08-21 15:32:29 +08:00
wangyidong
83525e6152 * finish task #6249. 2019-08-21 09:40:35 +08:00
wangyidong
153e8b272d * add new version and upgrade. 2019-08-19 11:34:29 +08:00
wangyidong
97fc947913 * computeWorkingHours has in updateParentStatus method. 2019-08-14 15:34:43 +08:00
liugang
dc022ad849 * Optimize function to printExtendFields. 2019-08-13 14:58:15 +08:00
jinianlan
968390978c Merge branch 'master' of github.com:easysoft/zentaopms 2019-08-12 08:25:42 +08:00
jinianlan
c6cba5483e * finish task #6173,#6174,#6175,#6183,#6186,#6187. 2019-08-12 08:23:00 +08:00
wangyidong
9d4b78a8f2 * finish task #6171. 2019-08-09 10:29:57 +08:00
wangyidong
dec97060a6 * finish task #6205. 2019-08-08 16:29:51 +08:00
wangyidong
7964ce412f * finish task #6190. 2019-08-07 15:27:39 +08:00
liugang
cd0e4ee3fe * Adjust lang files. 2019-08-06 14:35:43 +08:00