 Yagami
|
b2c73e7a21
|
* Fix common menu.
|
2020-08-27 14:25:58 +08:00 |
|
|
Yagami
|
b72a7dee43
|
Merge branch 'master' into 20.x
|
2020-08-26 16:10:36 +08:00 |
|
|
Yagami
|
77cf55dd79
|
* Fix system menu header.
|
2020-08-26 09:23:01 +08:00 |
|
|
z
|
b1cd0ed599
|
* code for task #7600.
|
2020-08-06 13:36:41 +08:00 |
|
|
Catouse
|
c2b35db7d1
|
* fix picker undefined error in some pages without import picker js.
|
2020-08-06 10:48:30 +08:00 |
|
|
z
|
a748df7c3c
|
* code for task #7600.
|
2020-08-04 14:05:41 +08:00 |
|
|
Catouse
|
7d1f51118f
|
* task #7372, bug #3196, fix datatable line height in firefox.
|
2020-07-27 10:24:44 +08:00 |
|
|
z
|
4502545269
|
* revert datatable tr height.
|
2020-07-27 09:15:41 +08:00 |
|
|
Catouse
|
11f71b3cf4
|
* fix table setting button now show after hot refresh table.
|
2020-07-24 09:30:35 +08:00 |
|
|
z
|
be145c47e6
|
Merge branch 'master' of github.com:easysoft/zentaopms
|
2020-07-23 13:02:53 +08:00 |
|
|
Catouse
|
38a7d60b21
|
* task #7414, bug #3095, fix file manager not work on upload images in kindeditor.
|
2020-07-23 11:08:25 +08:00 |
|
|
z
|
227ccdd17d
|
* finish task #7372.
|
2020-07-23 09:32:23 +08:00 |
|
|
z
|
a76b09bef2
|
* adjust code for flow.
|
2020-07-13 16:21:10 +08:00 |
|
|
z
|
c43f0fd426
|
* adjust for zh-tw lang.
|
2020-07-07 11:24:23 +08:00 |
|
|
z
|
3aca3ee0cc
|
* finish task #7301.
|
2020-07-03 13:07:49 +08:00 |
|
|
leiyong
|
d2a7566f3f
|
* Finish cmmi task#869.
|
2020-07-01 18:51:09 -07:00 |
|
|
leiyong
|
91ecc5764b
|
* Finish cmmi task#869.
|
2020-06-18 19:16:47 -07:00 |
|
|
sgm0422
|
23a2df6a50
|
* Fix vars.
|
2020-05-21 09:31:25 +08:00 |
|
|
sgm0422
|
005eca6d81
|
* Hide some menu.
|
2020-05-19 19:13:14 +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
|
2f249572f7
|
* Fix menu.
|
2020-05-14 10:14:02 +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
|
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
|
97474dcac5
|
* task #7129, add program swapper menu to header.
|
2020-05-07 14:50:59 +08:00 |
|
|
Yagami
|
6d1a047b02
|
* Finish task #7119.
|
2020-05-06 11:13:13 +08:00 |
|
|
Catouse
|
bf33d10b9d
|
* task #7116, task #7127, task #7128, task #7130, implement new menu.
|
2020-05-05 17:20:44 +08:00 |
|
|
leiyong
|
6a2ce5fade
|
* Finish task#7105.
|
2020-04-30 01:47:19 -07:00 |
|
|
Catouse
|
4e54cf859f
|
* fix code syntax highlighter not work.
|
2020-04-13 10:27:22 +08:00 |
|
|
wangyidong
|
9e83e63996
|
* code for php7.4.
|
2020-03-18 16:48:14 +08:00 |
|
|
Catouse
|
3f608337a0
|
* fix js error in french language.
|
2020-03-18 09:35:35 +08:00 |
|
|
wangyidong
|
cb60f926d9
|
* adjust code.
|
2019-12-25 17:35:52 +08:00 |
|
|
Catouse
|
4517f9f4fd
|
* fix cannot select text in kindeditor in ie11, task #6671, bug #2888.
|
2019-12-17 14:37:38 +08:00 |
|
|
Catouse
|
4ea90b2f0d
|
* add ja language to zui and kindeditor.
|
2019-12-17 09:34:42 +08:00 |
|
|
Catouse
|
b45f5c8a68
|
* add multi-language support, and fix UI of table statistic.
|
2019-12-16 17:42:26 +08:00 |
|
|
wangyidong
|
b68c0ace0f
|
* finihsh task #6669.
|
2019-12-12 08:59:19 +08:00 |
|
|
wangyidong
|
36c1a6d2c4
|
* finish task #6647.
|
2019-12-04 16:10:06 +08:00 |
|
|
Yagami
|
383a2e236b
|
* Finish task #6579.
|
2019-11-27 10:05:25 +08:00 |
|
|
Catouse
|
5b02546da1
|
Revert "* upgrade jquery to 3.4.1, task #6533, bug #2755, task #6528, bug #2787."
This reverts commit f98ea2c6de.
# Conflicts:
# www/js/jquery/lib.js
|
2019-11-25 16:37:57 +08:00 |
|
|
Catouse
|
f98ea2c6de
|
* upgrade jquery to 3.4.1, task #6533, bug #2755, task #6528, bug #2787.
|
2019-11-21 16:15:44 +08:00 |
|
|
Yagami
|
7166433796
|
* Fix task #6489.
|
2019-11-21 13:15:08 +08:00 |
|
|
Yagami
|
97a65c43a7
|
* Finish task #6489.
|
2019-11-21 09:13:31 +08:00 |
|
|
Yagami
|
e85b63ec85
|
* Finish task #6541.
|
2019-11-19 14:36:19 +08:00 |
|