Commit Graph

537 Commits

Author SHA1 Message Date
Yagami
b72a7dee43 Merge branch 'master' into 20.x 2020-08-26 16:10:36 +08:00
z
1a9c007fec * finish task #7648. 2020-08-24 11:33:37 +08:00
Yagami
a86cb31895 * Add holiday and fix project and product menu. 2020-08-19 10:58:29 +08:00
qiyu-xie
21fe8daa0d Fix bug #3338 #3342 2020-08-10 16:22:10 +08:00
holan20180123
794534a0a1 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-08-06 14:10:22 +08:00
holan20180123
6f0fe410ad * Finish task #7596. 2020-08-06 14:08:32 +08:00
tianshujie98
548b5655b0 Merge branch 'master' of github.com:easysoft/zentaopms 2020-08-05 17:22:22 +08:00
tianshujie98
a99aab00ea *Finish task #7587. 2020-08-05 17:04:47 +08:00
leiyong
edf7d6448b * Fix bug,task#7549. 2020-07-27 03:29:59 -07:00
leiyong
e639fd4379 * Finish task#7481. 2020-07-27 02:29:36 -07:00
sgm0422
deb448d2bb * Finish task #7551. 2020-07-25 18:49:20 +08:00
chenfei
893a672c5a * Finish task #7473. 2020-07-22 16:28:09 +08:00
sgm0422
6df8b3e6f8 * Finish task #1084. 2020-07-20 15:01:15 +08:00
sgm0422
c4356f0eaa * Finish task #7466. 2020-07-16 14:11:22 +08:00
tianshujie98
797abba0c9 Merge branch 'master' of github.com:easysoft/zentaopms 2020-07-08 11:06:32 +08:00
tianshujie98
7d1b549059 * Fix bug #3259. 2020-07-08 11:06:08 +08:00
z
2801f04e4c * code for task #7305. 2020-07-06 14:29:44 +08:00
z
ec7af0c7f6 * finish task #7262. 2020-06-17 13:19:58 +08:00
sgm0422
8e706b6e0c * Add create project button. 2020-06-17 13:08:37 +08:00
sgm0422
956c0ab6e8 * Merge code. 2020-06-16 14:48:44 +08:00
sgm0422
09c2a265f4 * Delete program in link. 2020-06-12 17:16:55 +08:00
zhaohaibo
0fb4b5ce32 add param of currentProgram 2020-05-27 14:34:57 +08:00
zhaohaibo
9a72a1e4cd * fix bug 2020-05-20 18:22:26 +08:00
wangyidong
b85560356e * fix for error. 2020-05-15 08:21:18 +08:00
wangyidong
f889168174 * adjust code for toggle fold or unfold. 2020-05-13 10:49:43 +08:00
Catouse
80c1978afa * task #7126, refactor all project/create btn to program/createguide. 2020-05-11 10:27:50 +08:00
Catouse
58c44db0f7 * task #7126, add program create guide modal page. 2020-05-07 16:40:32 +08:00
wangyidong
3b21a74564 * finish task #7081. 2020-04-29 13:25:08 +08:00
wangyidong
da823eacb6 * fix bug. 2020-03-14 13:30:58 +08:00
wangyidong
fcfe033f28 * adjust for parent-child story. 2020-03-13 08:36:31 +08:00
wangyidong
9a795c4755 * adjust for annual data. 2019-12-27 16:47:02 +08:00
guanxiying
db77ddfd47 * update user view when delete a project. 2019-12-11 16:41:43 +08:00
wangyidong
8d0f8521ba * finish task #6623. 2019-12-09 14:29:43 +08:00
wangyidong
a4cf41780c * fix error. 2019-12-05 08:58:44 +08:00
wangyidong
e8e1357b90 * finish task #6601. 2019-11-28 09:45:28 +08:00
Yagami
c961d47610 Merge branch 'master' of https://github.com/easysoft/zentaopms 2019-11-27 10:05:46 +08:00
Yagami
383a2e236b * Finish task #6579. 2019-11-27 10:05:25 +08:00
guanxiying
8af89d8026 * set httponly false for cookie written by js. 2019-11-26 16:58:14 +08:00
guanxiying
1f26dce25e Merge branch 'master' of github.com:easysoft/zentaopms 2019-11-22 14:45:56 +08:00
wangyidong
18a4c9220f * adjust for getTaskOptionMenu method. 2019-11-22 16:59:07 +08:00
guanxiying
0665deed72 * Adjust type and endList of sprint. 2019-11-22 14:45:33 +08:00
guanxiying
bad6bbd39c * Add httpOnly param when setcooki. 2019-11-21 14:20:11 +08:00
Yagami
7a442b0dc2 * Finish task #6546. 2019-11-20 16:04:07 +08:00
wangyidong
8ebd5c0d64 * fix bug #2757. 2019-09-20 15:25:51 +08:00
wangyidong
53e6970362 * adjust for bybranch in project-story page. 2019-09-05 16:50:16 +08:00
wangyidong
7de530b5ae * finish task #6286. 2019-08-30 13:28:21 +08:00
wangyidong
92487e13d1 * finish task #6284. 2019-08-30 09:30:45 +08:00
wangyidong
61a03933c3 * finish task #6247. 2019-08-21 10:06:25 +08:00
wangyidong
92d402f86d * code for task #6171. 2019-08-15 15:03:31 +08:00
liugang
5e68baf8c5 * Add function to get columns, statusMap, statusList, colorList of kanban. 2019-08-08 18:37:25 +08:00