Commit Graph
44 Commits
Author SHA1 Message Date
z 5644b81408 Merge branch '12.x' 2020-10-30 16:58:47 +08:00
leiyong 6af8ff9971 * modulePageActions is modified to TRActions. 2020-10-21 09:17:33 +08:00
leiyong c1e6e6a82c modulePageActions is modified to TRActions. 2020-10-21 09:11:19 +08:00
z 12820bf546 * fix for task #8091. 2020-10-09 11:43:18 +08:00
z 4262f4c782 * finish task #8051. 2020-09-30 20:34:53 +08:00
z 0940140b9d * adjust for ja lang. 2020-09-15 09:07:42 +08:00
z 5b8f0c4bc1 + add ja lang. 2020-09-12 10:55:23 +08:00
Yagami bc69f6fb81 * Finish task #7772. 2020-08-31 13:05:24 +08:00
Yagami b72a7dee43 Merge branch 'master' into 20.x 2020-08-26 16:10:36 +08:00
qiyu-xie 76381c1fd2 * Merge. 2020-08-05 11:16:37 +08:00
z 480b7df59d * finish task #7533. 2020-07-24 20:41:06 +08:00
leiyong 9ebffe1e6e * Fix jenkins bug. 2020-07-17 00:08:24 -07:00
leiyong 59d6baede0 * Fix jenkins password cannot contain @. 2020-07-16 14:37:21 +08:00
sgm0422 09c2a265f4 * Delete program in link. 2020-06-12 17:16:55 +08:00
sgm0422 18c3752d9a * Delete program from repo. 2020-06-03 13:13:54 +08:00
sgm0422 3cc7f35436 * Add program condition. 2020-06-01 16:25:11 +08:00
zhaohaibo d4b09b733d add param currentProgram 2020-05-27 13:26:08 +08:00
wangyidong 523162eac5 * add new version and upgrade and add vi lang. 2020-04-10 13:55:45 +08:00
reneeteng 38d3c16954 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-03-12 16:16:15 +08:00
wangyidong 5d36307c44 + add fr.php and de.php. 2020-03-10 15:42:00 +08:00
wangyidong 35a2251dcb * adjust for get svnDir. 2020-03-09 14:13:16 +08:00
reneeteng 118fc78d25 * CI, Jenkins lang updated. 2020-03-08 16:02:49 +08:00
wangyidong 718373cc06 * finish task #6939. 2020-03-04 18:21:46 +08:00
wangyidong d812c120b4 * finish task #6955. 2020-03-03 17:37:03 +08:00
wangyidong aa70c177cc * finish task #6915,6917. 2020-02-28 15:26:39 +08:00
wangyidong 172a9724e2 * code for task #6912,6913,6914,6916. 2020-02-28 15:05:56 +08:00
wangyidong c001e75780 * finish task #6856. 2020-02-21 12:27:05 +08:00
wangyidong c99bc8209e * code for task #6889. 2020-02-21 10:06:30 +08:00
wangyidong 928147ac91 * finish task #6891. 2020-02-20 15:09:25 +08:00
wangyidong d0652826ac * finish task #6905,6895. 2020-02-18 11:37:37 +08:00
aaronchen2k 8705944e92 fix issues report when code review 2020-02-11 09:35:36 +08:00
aaronchen2k e0ae913838 fix issues report when code review 2020-02-11 09:03:09 +08:00
aaronchen2k ac4248fbe8 fix issues report when code review 2020-02-11 08:46:17 +08:00
wangyidong 00799f1f7b * fix error. 2020-02-07 09:12:41 +08:00
aaronchen2k 56392dd151 english translation 2020-02-03 14:35:36 +08:00
aaronchen2k f8d9a16082 jenkins password encrypt 2020-02-01 18:28:50 +08:00
aaronchen2k 6dd177d104 test svn sync 2020-02-01 10:25:28 +08:00
aaronchen2k 4637b81362 fix bread crumb 2020-01-31 22:19:15 +08:00
aaronchen2k b6d68f10b7 changes for original repo and ci models combination 2020-01-31 18:31:08 +08:00
aaronchen2k 40bc31e0d1 changes for original repo and ci models combination 2020-01-31 17:14:52 +08:00
aaronchen2k de8106ab82 fix menu issues 2020-01-23 17:16:00 +08:00
aaronchen2k 96b6c17213 keep repoID in submenu link for bookmark 2020-01-23 16:47:26 +08:00
aaronchen2k deb95b1927 combine repo, ci and jenkins modules under same top module 2020-01-23 16:43:28 +08:00
aaronchen2k 165fb141d1 remove 2020-01-22 14:10:50 +08:00