Commit Graph
13231 Commits
Author SHA1 Message Date
wangyidong 86ec6cd982 * code for task #4815. 2018-09-07 15:14:16 +08:00
wangyidong c0557029ab * fix bug for check priv. zentaopms_10.3.1_20180907 2018-09-07 14:49:32 +08:00
wangyidong 4fb50d5132 Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-07 14:39:13 +08:00
wangyidong f2d58faaf1 * change for upgrade. 2018-09-07 14:37:45 +08:00
Catouse c2907dc63a Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-07 14:11:10 +08:00
Catouse 6be860c4d2 * change style of active item in tree. 2018-09-07 14:10:56 +08:00
wangyidong fb9e21ffa4 * adjust code. 2018-09-07 14:10:14 +08:00
Catouse f87ff72f2a Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-07 14:05:42 +08:00
Catouse 21d96d54d3 * finish task #4788. 2018-09-07 14:05:37 +08:00
Yagami d45210d7bc Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-07 10:19:31 +08:00
Yagami cd3ab96967 * Finish task #4767. 2018-09-07 10:18:56 +08:00
滔哥 def4a53d04 * Finished task#4801 2018-09-07 01:44:22 +08:00
滔哥 05b9275e14 * Finished task#4802. 2018-09-07 00:41:41 +08:00
Catouse eb38ccc270 * finish task #4695. 2018-09-06 18:05:17 +08:00
Catouse ff3ff14d4c * improve UI of doc/view. 2018-09-06 18:05:04 +08:00
Catouse a6fe7e73cf Merge branch 'master' of https://github.com/easysoft/zentaopms
# Conflicts:
#	module/build/view/linkbug.html.php
#	module/build/view/linkstory.html.php
#	module/release/view/linkbug.html.php
#	module/release/view/linkstory.html.php
2018-09-06 17:43:57 +08:00
Catouse b538734033 * finish task #4781. 2018-09-06 17:42:59 +08:00
wangyidong e261f646e4 * finish task #4766. 2018-09-06 17:38:20 +08:00
wangyidong 2217278a00 Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-06 17:34:26 +08:00
wangyidong 0c5a8851f6 * finish task #4785. 2018-09-06 17:34:08 +08:00
Catouse 00c0ece2dc * improve search form UI. 2018-09-06 17:27:02 +08:00
Catouse 184ac37fd2 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-06 17:13:05 +08:00
Catouse 8a3002eae0 * finish task #4730. 2018-09-06 17:12:59 +08:00
wangyidong 3bf970be26 Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-06 16:49:09 +08:00
wangyidong d5eddfdbbf * finish task #4765. 2018-09-06 16:48:27 +08:00
Catouse 0f1a436771 * finish task #4814 and fix bug #2158. 2018-09-06 16:31:33 +08:00
Catouse a39a70cc5c Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-06 16:12:05 +08:00
Catouse c18b40d9fd * finish task #4817 and fix bug #2149. 2018-09-06 16:11:58 +08:00
wangyidong 83771d20a9 * finish task #4787. 2018-09-06 14:40:14 +08:00
wangyidong 6cba9e3fd7 Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-06 14:15:30 +08:00
wangyidong 0dcb3c898b * finish task #4809. 2018-09-06 14:06:36 +08:00
wangyidong 813a3f5ca0 * finish task #4819. 2018-09-06 14:03:49 +08:00
Catouse 3df464a583 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-06 13:51:57 +08:00
Catouse 8128f97863 * finish task #4826 and fix bug #2129. 2018-09-06 11:38:45 +08:00
wangyidong 3b4c510290 Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-06 11:36:46 +08:00
wangyidong f2ef810386 * finish task #4809. 2018-09-06 11:36:26 +08:00
Catouse bf7db07f4e * finish task #4825 and fix bug #2126. 2018-09-06 11:33:20 +08:00
Catouse 51a7178fa0 * finish task #4833 and fix bug #2090. 2018-09-06 11:03:13 +08:00
Catouse f4bcaa6258 * fix noticeBox style. 2018-09-06 10:44:17 +08:00
wangyidong f588b7fc27 Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-06 08:52:03 +08:00
wangyidong 7a49b3b6c7 * finish task #4834. 2018-09-06 08:51:26 +08:00
Yagami 37230abc6d * Finish task #4770. 2018-09-05 16:37:13 +08:00
Yagami 7fce5f23df Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-05 15:39:09 +08:00
Yagami 7af638e14c * Fix task #4783. 2018-09-05 15:38:34 +08:00
wangyidong 7e70c106eb * change for kanban height. 2018-09-05 15:35:51 +08:00
wangyidong 30f8957593 Merge branch 'master' of github.com:easysoft/zentaopms 2018-09-05 14:41:41 +08:00
wangyidong 5d4675c428 * finish task #4840. 2018-09-05 14:41:21 +08:00
Catouse a32c1e6433 Merge branch 'master' of https://github.com/easysoft/zentaopms 2018-09-05 13:54:13 +08:00
Catouse acd78f289e * change arrow image in flowchart block. 2018-09-05 13:53:59 +08:00
Yagami 985fbf9bd9 * Finish task #4779. 2018-09-05 13:31:15 +08:00