Commit Graph
409 Commits
Author SHA1 Message Date
wangyidong 56489075b0 Merge branch 'zentaopms_9.8' 2018-05-07 16:48:59 +08:00
wangyidong 55c68b611d * finish task #3936. 2018-05-04 15:13:22 +08:00
daitingting fd1a63eb5b * Add tip when index page has no project. 2018-04-25 14:01:53 +08:00
liugang b0472a7bad * Refact browse page of company. 2018-04-19 14:24:56 +08:00
liugang e522b82a7e * Add saveSuccess to common lang files. 2018-04-17 15:53:36 +08:00
liugang fe3027623e * Finish task #3846. 2018-04-10 16:54:38 +08:00
wangyidong 2ecdc58a3d * finish task #3769. 2018-04-04 09:39:01 +08:00
wangyidong 9d16d860c9 * finish task #3761. 2018-04-03 17:03:49 +08:00
wumo 7be59d3948 * Change the content of length prompt. 2018-04-03 11:15:22 +08:00
wangyidong 315a6f931f * adjust for datatable. 2018-03-28 16:20:28 +08:00
wangyidong 40318ec8ad * finish task #3683. 2018-03-14 10:56:16 +08:00
wangyidong d35e51a15a * merge new change. 2018-03-13 12:26:20 +08:00
liugang c31114116d * Move error of entry to entry's config. 2018-03-12 18:23:04 +08:00
wangyidong 003db1f422 * change for todo batch create page. 2018-03-02 10:57:26 +08:00
wangyidong ea74787b87 * change todo to calendar. 2018-02-09 11:01:02 +08:00
wangyidong c9ee62c897 * adjust for block view. 2018-02-01 15:39:52 +08:00
wangyidong 8e2dee9fb6 * adjust for case block. 2018-02-01 14:23:19 +08:00
dajiao007 50aaf9cce0 recover 'hide' into statement 2018-01-18 14:10:19 +08:00
dajiao007 3a325feef8 change translation of install pages 2018-01-18 13:50:04 +08:00
dajiao007 2a8146f6fb modify translations of admin module 2018-01-17 16:01:59 +08:00
wangyidong a4d4683a93 * fix bug #1347. 2018-01-17 10:43:13 +08:00
wangyidong 4cc371b757 * finish task #3583. 2018-01-11 16:59:27 +08:00
dajiao007 fa00dc9d9c modify the translate 2018-01-10 19:39:51 +08:00
滔哥 89565cfbc6 * Format code. 2017-12-27 15:42:03 +08:00
滔哥 3a59ee210c * Fix bug for EN. 2017-12-27 09:07:49 +08:00
wangyidong 60ebe9fa2e * fix for upgrade. 2017-12-22 09:05:34 +08:00
tengfei 7df4d8febf Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-20 16:13:58 +08:00
tengfei 117096919d bug open on change 2017-12-20 16:13:43 +08:00
Catouse a775af4846 * finish task #3371. 2017-12-20 11:30:07 +08:00
tengfei 7dacfb2f78 action-common 2017-12-13 09:54:06 +08:00
滔哥 e45eb3ab2a * Task#3500 2017-12-07 14:26:57 +08:00
tengfei 522f28dd39 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-12-06 17:47:50 +08:00
tengfei 8314d813cb 12/6 trans error done 2017-12-06 17:47:31 +08:00
滔哥 1132bf8c7e * Task #3430 2017-12-06 10:45:38 +08:00
滔哥 ea28589fd9 * Task #3430 2017-12-06 09:42:54 +08:00
tengfei 5c8b72ddf0 translation error 12/5 2017-12-05 17:34:48 +08:00
tengfei 232d00dbcd translation minor error 2017-12-05 11:24:06 +08:00
tengfei 5a4f5057d6 “minor change 2017-11-27 17:08:29 +08:00
wangyidong 9c8f506fbe * fix bug #1125. 2017-11-10 14:08:00 +08:00
滔哥 533cc18eb3 * Fix bug 2017-11-10 10:26:30 +08:00
wangyidong 87e4abfcb8 Merge branch 'master' of github.com:easysoft/zentaopms 2017-11-09 16:46:51 +08:00
liugang 90211f67fa * Finish task #3337,3338,3357,3358,3365,3366,3367. 2017-11-09 15:16:22 +08:00
wangyidong c2e05057f5 * finish task #3341. 2017-11-09 15:11:08 +08:00
liugang e8cdfe2bff + Add en lang files.
* Finish task 3292,3293,3294,3305,3306,3307,3308,3309.
2017-11-02 11:35:52 +08:00
滔哥 3b246f43f1 Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-10-31 21:15:18 +08:00
liugang 34b3df57e2 * Remove category from module menu. 2017-10-31 16:33:58 +08:00
滔哥 3d0dff1420 * add score auth 2017-10-31 10:03:54 +08:00
liugang 6dd2154233 * Add category to product. 2017-10-30 17:55:55 +08:00
滔哥 d9290cbf9b * + score in all model 2017-10-27 11:15:28 +08:00
liugang c4f435237e Merge branch 'master' of https://github.com/easysoft/zentaopms 2017-10-26 17:55:18 +08:00