Commit Graph
108 Commits
Author SHA1 Message Date
sunhao 7cd96f8a12 * common: update themes for old page. 2024-03-25 19:33:45 +08:00
sunguangming 7928e46b5d * Revert file. 2023-11-27 13:55:08 +08:00
sunguangming b9b52ac28b * Remove unused code. 2023-11-27 13:08:26 +08:00
朱金勇 ad288b3f1d * Use isServing() instead of IN_USE. 2023-07-10 05:56:05 +00:00
朱金勇 ccb6a094f9 * Change constant to variable. 2023-07-10 04:31:47 +00:00
Hao Sun ed31bffa6c Merge branch 'zin_merge'
# Conflicts:
#	framework/base/control.class.php
#	framework/control.class.php
2023-04-23 19:44:40 +08:00
Hao Sun 2bcc9bdbf4 Merge branch 'zin_dev'
# Conflicts:
#	module/common/lang/zh-cn.php
#	module/product/lang/de.php
#	module/product/lang/en.php
#	module/product/lang/fr.php
#	module/product/lang/zh-cn.php
#	module/program/js/browse.js
#	module/program/lang/de.php
#	module/program/lang/en.php
#	module/program/lang/fr.php
#	module/program/lang/zh-cn.php
#	module/project/config.php
#	module/project/lang/de.php
#	module/project/lang/en.php
#	module/project/lang/fr.php
#	module/project/lang/zh-cn.php
#	module/search/view/buildform.html.php
#	module/task/control.php
2023-04-23 19:20:45 +08:00
Hao Sun 8ad7706270 * zin: move index/app.ui.js to zin.js 2023-04-18 19:48:48 +08:00
Hao Sun 8d466c52ac * zin: add zin tool to convert old views 2023-03-17 15:03:57 +08:00
Hao Sun 191d565e62 * zin: refactor 2023-03-15 17:23:19 +08:00
caoyanyi 23de8e8d4e * Update zui. 2023-01-03 17:03:46 +08:00
tianshujie f37ca78f61 * Add actions of program list. 2022-11-10 10:07:26 +08:00
tianshujie 0ad559a413 * Finish task #73291. 2022-11-09 17:16:43 +08:00
caoyanyi e593c657d4 * Adjust code. 2022-11-08 10:26:13 +08:00
caoyanyi e685316a70 * Modify zui load. 2022-11-08 10:24:55 +08:00
tianshujie 4c3ed5278c * Fix css path. 2022-11-08 08:38:16 +08:00
caoyanyi eb32dd075e * Modify css and js path. 2022-11-02 10:14:38 +08:00
Lufei ed3340e442 * Support htmx. 2022-10-25 14:34:44 +08:00
tianshujie 058e4ecf73 * Finish task #73291. 2022-10-24 16:00:11 +08:00
wangyidong 685799b216 * adjust for set no sprint Menu. 2022-09-23 16:22:32 +08:00
wangyidong d4f7d6725f * fix for create project. 2022-09-21 14:20:57 +08:00
wangyidong 8be950d693 * code for task #69707. 2022-09-21 08:25:56 +08:00
hufangzhou 8c62376d05 * Fix bug #25281. 2022-07-14 15:49:55 +08:00
王怡栋 8ad9dea460 Merge branch 'sprint/xuan_106' into 'master'
Sprint/xuan 106

See merge request easycorp/zentaopms!4126
2022-06-24 01:35:58 +00:00
宋辰轩 9460102a29 * Format. 2022-06-20 15:11:29 +08:00
宋辰轩 0b83f28fe9 * CommonLang. 2022-06-20 15:09:59 +08:00
dingyongliang 0774bce6ef * electron/zentao: merge navigation bar and control bar. 2022-06-17 09:18:07 +00:00
宋辰轩 328aea3be5 * Modify supportLang to defaultLang. 2022-06-07 10:56:42 +08:00
宋辰轩 d50f757397 * SupportLang. 2022-06-07 09:52:57 +08:00
wangyidong d6cf08b9d7 Merge branch 'tid' 2022-05-18 10:20:48 +08:00
hufangzhou 5b20d429b4 * Fix the bug of login failed. 2022-05-16 09:03:13 +08:00
zhujinyong 9efef2692b + Add no-referrer. 2022-05-14 16:47:44 +08:00
Chenjianyu f0eaee1739 * Fix bug #52077, overwrite .main-actions-holder style to block infinite scrolling. 2022-04-06 17:04:36 +08:00
Wenrui LI d1b1cb38c5 * fix xuan header hook not loaded. 2022-03-29 16:10:28 +08:00
王怡栋 d8577f7d28 * adjust for project kanban. 2022-01-17 17:25:20 +08:00
Hao Sun b011796c15 * fix php syntax error. 2021-11-22 15:33:59 +08:00
Hao Sun 6619652319 * append special class to body in client mode. 2021-11-22 15:10:00 +08:00
王怡栋 aa5a8bdd33 * adjust for add tid for session. 2021-08-30 10:56:52 +08:00
Hao Sun 4779bb64b3 * task #41783, #task 41765, implement tutorial mode and add new tutorial task. 2021-08-26 08:45:07 +08:00
Hao Sun a6bd22b09d * show tooltip for left menu. 2021-08-16 10:15:53 +08:00
wangyidong 4696a6dceb * code for xhtml. 2021-06-03 09:47:06 +08:00
Catouse 5c7acd9d9a * task #8711, add tabs menu for mdule groups. 2020-12-28 08:29:58 +08:00
Yagami b72a7dee43 Merge branch 'master' into 20.x 2020-08-26 16:10:36 +08:00
z a76b09bef2 * adjust code for flow. 2020-07-13 16:21:10 +08:00
z 3aca3ee0cc * finish task #7301. 2020-07-03 13:07:49 +08:00
Catouse 71eb6e7022 * fix menu state error on page load with cookie. 2020-05-07 17:38:40 +08:00
wangyidong cb60f926d9 * adjust code. 2019-12-25 17:35:52 +08:00
Catouse 4ea90b2f0d * add ja language to zui and kindeditor. 2019-12-17 09:34:42 +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