Commit Graph
69 Commits
Author SHA1 Message Date
leiyong 917e316962 * Fix bug. 2020-12-07 15:21:38 +08:00
z b42d47e257 Merge branch '12.x' 2020-11-23 20:42:59 +08:00
tianshujie98 b35cd2d1f2 * Fix bug. 2020-11-10 10:09:50 +08:00
tianshujie98 226e6738cf * Finish task #8247. 2020-11-09 15:27:29 +08:00
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
Yagami d4e8a1ba84 * Fix project get pairs method. 2020-09-29 13:08:01 +08:00
tianshujie98 8c9bd18054 * Finish task #7915. 2020-09-24 14:35:45 +08:00
tianshujie98 557ff5320f * Finish task #7915. 2020-09-24 14:15:36 +08:00
tianshujie98 cdb3f00021 * The judgment of deleting two versions. 2020-09-24 13:20:03 +08:00
tianshujie98 be17c9d494 * The judgment of deleting two versions. 2020-09-24 13:12:27 +08:00
qiyu-xie 001e036822 * Finish task#7936. 2020-09-17 16:33:50 +08:00
Yagami 66f4f5403a * Fix sql and rename program to PRJ. 2020-09-16 11:28:55 +08:00
qiyu-xie 442d4bedad *Fix bug #3387. 2020-09-03 16:13:32 +08:00
qiyu-xie b0c696cc5b * Fix bug#3387. 2020-09-02 15:50:59 +08:00
holan20180123 7a661001da * Finish task #7758. 2020-08-31 14:57:44 +08:00
z 652f1becdb * fix for branch with '-'. 2020-08-28 09:36:28 +08:00
tianshujie98 3d363c7f2e * Fix repo/view/revision.html.php bug. 2020-08-27 09:58:21 +08:00
Yagami b72a7dee43 Merge branch 'master' into 20.x 2020-08-26 16:10:36 +08:00
z ad6fdd08dc * fix bug and adjust code. 2020-08-10 11:12:04 +08:00
holan20180123 99e92ac05f * Finish task #7611. 2020-08-07 17:27:54 +08:00
z f4987f4a04 * code for task #7548. 2020-07-24 21:45:48 +08:00
z 2f6f314865 * code for task #7426. 2020-07-23 13:01:56 +08:00
z 13a7e4802b * finish task #7426. 2020-07-23 11:04:02 +08:00
z 7e53e5a034 * adjust for sync commit. 2020-07-03 15:19:16 +08:00
sgm0422 e387bc69f6 * Add program to edit repo. 2020-07-02 09:13:18 +08:00
sgm0422 01d630040b * Add program to repo. 2020-07-01 16:57:13 +08:00
z 99e8d2a9e9 * adjust for repo branch. 2020-06-04 12:06:47 +08:00
wangyidong 576c22593d * finish task #7076. 2020-04-30 15:31:26 +08:00
wangyidong 54cb29a788 * adjust for highlight and add story reg. 2020-04-08 10:39:28 +08:00
wangyidong a694c8493f * change comment to commit. 2020-03-06 18:27:21 +08:00
wangyidong ae0e2344d2 * adjust code create and edit integration. 2020-03-06 13:24:09 +08:00
wangyidong 9d49c247f5 * adjust for sync branch. 2020-03-05 15:46:32 +08:00
wangyidong 718373cc06 * finish task #6939. 2020-03-04 18:21:46 +08:00
wangyidong b9d709ccc4 * finish task #6953. 2020-03-04 15:07:49 +08:00
wangyidong cb25b5af7f * finish task #6956. 2020-03-03 16:11:23 +08:00
wangyidong fb8d617515 * finish task #6918. 2020-02-28 16:07:37 +08:00
wangyidong 172a9724e2 * code for task #6912,6913,6914,6916. 2020-02-28 15:05:56 +08:00
wangyidong e2c02c246b Merge branch 'master' into zentaopms_12.0.1 2020-02-26 18:27:08 +08:00
wangyidong f9867d5da6 * adjust for merge. 2020-02-26 15:05:24 +08:00
wangyidong c00a40a60a * adjust for task #6893. 2020-02-26 10:45:55 +08:00
wangyidong 2cdf9b3c78 * finish task #6858,6895. 2020-02-26 08:49:23 +08:00
wangyidong c4dc4b6545 * finish task #6893. 2020-02-24 17:10:35 +08:00
wangyidong d0652826ac * finish task #6905,6895. 2020-02-18 11:37:37 +08:00
wangyidong d8d4cbf890 * finish task #6871. 2020-02-14 10:45:35 +08:00
wangyidong ec536afaa0 * finish task #6859. 2020-02-13 17:07:37 +08:00
wangyidong 785a479c5b * finish task #6863. 2020-02-13 16:50:11 +08:00
wangyidong 8bb1c86464 * finish task #6883. 2020-02-11 15:41:59 +08:00
aaronchen2k 77eddecece update 2020-02-10 15:06:52 +08:00