Commit Graph

17447 Commits

Author SHA1 Message Date
sgm0422
c6ebec0920 * Fix admin menu. 2020-05-20 09:26:59 +08:00
Yagami
a14ad24aa7 * Fix menu. 2020-05-19 22:02:09 +08:00
sgm0422
f23e26cd86 * Fix program managemembers and create link. 2020-05-19 19:32:08 +08:00
sgm0422
005eca6d81 * Hide some menu. 2020-05-19 19:13:14 +08:00
sgm0422
260b0610da Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x 2020-05-19 19:09:46 +08:00
sgm0422
1402d09395 * Fix program details. 2020-05-19 19:09:35 +08:00
zhaohaibo
e49039bd29 * task #753 2020-05-19 18:58:49 +08:00
leiyong
dbd749908c * Adjust task module code. 2020-05-19 03:50:15 -07:00
zhaohaibo
37142586b4 * task #728 2020-05-19 18:44:34 +08:00
zhaohaibo
25543b6413 * task #729 2020-05-19 18:37:23 +08:00
zhaohaibo
e553ffc0ba Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x
* task #731
2020-05-19 18:07:44 +08:00
leiyong
b10b019168 * merger cmmi branch. 2020-05-19 03:05:38 -07:00
zhaohaibo
97c0e9f4f1 * task #731 2020-05-19 18:05:13 +08:00
zhaohaibo
2ecb563509 * task #736 2020-05-19 17:42:39 +08:00
zhaohaibo
1bad49a04f * perfect code 2020-05-19 13:23:33 +08:00
zhaohaibo
1e69c201f8 * modify function create edit finish 2020-05-19 13:11:46 +08:00
sgm0422
7cd2453f35 * Add program swapper. 2020-05-19 10:39:39 +08:00
sgm0422
5dc4fbcec8 * Fix menu and program. 2020-05-18 16:46:40 +08:00
sgm0422
7478fb8c30 * Fix details. 2020-05-18 13:54:00 +08:00
Catouse
3a7d84aa55 * remove menuHeader element. 2020-05-18 10:16:42 +08:00
Yagami
cf2d5cc26f * Fix menu. 2020-05-15 17:11:30 +08:00
Yagami
d1e3e3184f * Fix menu. 2020-05-15 09:20:20 +08:00
Yagami
1738363830 * Fix bug #577. 2020-05-14 16:50:39 +08:00
Yagami
9f1e075c82 * Fix program module. 2020-05-14 14:39:52 +08:00
Yagami
2f249572f7 * Fix menu. 2020-05-14 10:14:02 +08:00
sgm0422
eee8e1d3de * Fix menu. 2020-05-13 20:50:19 +08:00
Yagami
9e1220be5f * Fix menu. 2020-05-13 17:05:27 +08:00
Yagami
33c3308f5d Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x 2020-05-13 16:31:23 +08:00
Yagami
d71d534a2a * Fix menu. 2020-05-13 16:31:10 +08:00
chenfei
7b9a2c2290 * Add underline to checkcode method. 2020-05-13 15:31:14 +08:00
Yagami
6fe5f81780 Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x 2020-05-12 17:29:57 +08:00
Yagami
9e131109d0 * Fix menu. 2020-05-12 14:30:57 +08:00
Catouse
d69f621d07 * fix error on use english language data. 2020-05-12 13:52:39 +08:00
Catouse
5e2a7e1758 * add english language data file. 2020-05-12 13:39:31 +08:00
Catouse
24aef867c6 * fix members count and working hours algorithm. 2020-05-12 13:39:21 +08:00
Catouse
7d7054b1ba * fix data-toggle in dropMenu not work. 2020-05-12 09:56:21 +08:00
Catouse
f9ea9e5801 * remove debug code. 2020-05-12 09:34:01 +08:00
Catouse
101432eb31 * fix card style. 2020-05-12 09:33:12 +08:00
Catouse
e11abdc27e * fix page shake on load. 2020-05-11 10:55:14 +08:00
Catouse
5aba9e2f4b * fix cards style with very long title. 2020-05-11 10:35:59 +08:00
Catouse
e1a22df6c4 * fix program/all not work. 2020-05-11 10:29:18 +08:00
Catouse
80c1978afa * task #7126, refactor all project/create btn to program/createguide. 2020-05-11 10:27:50 +08:00
Catouse
f005903fd7 * improve UI of program swapper menu. 2020-05-08 13:56:06 +08:00
Catouse
326d45d0c5 * task #7131, task #7132, task #7133, add cards view for program index page. 2020-05-08 11:37:28 +08:00
Yagami
b55e3730f5 Merge branch '15.x' of https://github.com/easysoft/zentaopms into 15.x 2020-05-08 08:58:39 +08:00
Yagami
27fc29b764 * Code for task #7121. 2020-05-08 08:51:32 +08:00
Catouse
71eb6e7022 * fix menu state error on page load with cookie. 2020-05-07 17:38:40 +08:00
Catouse
cdf0d1a758 * fix menu state error on page load. 2020-05-07 17:13:07 +08:00
Catouse
f497da5494 * fix menu state error on page load. 2020-05-07 17:06:34 +08:00
Catouse
4f4c9e9145 * fix menu. 2020-05-07 16:42:32 +08:00