Commit Graph

166 Commits

Author SHA1 Message Date
Hao Sun
a6e7949301 * refactor avatar helper, the $user param cannot be an avatar url now. 2021-10-26 16:39:44 +08:00
liugang
f860008e56 * Remove the outdated code. 2021-10-25 16:18:48 +08:00
dingna
5888921712 * Finish task #42375. 2021-09-14 09:28:25 +08:00
tianshujie
851fa4a77a * Modify the problem that the avatar of the program list is incorrectly reported. 2021-09-09 13:38:44 +08:00
Hao Sun
fff95ea74d * refactor: comment. 2021-09-08 16:47:31 +08:00
Hao Sun
93126af4da * set text size in avatar with custom size. 2021-09-08 15:38:03 +08:00
liyuchun
2edd3732cb Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-09-07 09:00:13 +08:00
liyuchun
8bc4f8dfc6 * Code for review. 2021-09-07 08:56:00 +08:00
Hao Sun
61df601ab8 * change back color for default user avatar. 2021-09-06 17:17:33 +08:00
Hao Sun
8c97d88d91 * add html helper method, includes: "html::avatar()"、"html::smallAvatar()"、"html::largeAvatar()"、"html::stringToCode()". 2021-08-25 14:35:12 +08:00
wangyidong
22abf816b9 * finish task #40290. 2021-07-16 11:19:08 +08:00
wangyidong
82c3c82d23 * adjust for convert to pinyin for picker. 2021-06-17 14:46:54 +08:00
zhujinyong
a9015ba45d * Adjust main menu. 2021-03-17 09:35:51 +08:00
z
5644b81408 Merge branch '12.x' 2020-10-30 16:58:47 +08:00
z
3fa53be319 * code for task #7939. 2020-09-23 15:05:45 +08:00
Yagami
189c0928d2 * Remove empty options condition. 2020-08-28 13:48:29 +08:00
qiyu-xie
76381c1fd2 * Merge. 2020-08-05 11:16:37 +08:00
Yagami
b5987e61a1 * Add autocomplete to front class. 2019-02-20 14:27:38 +08:00
wangyidong
6b2957fb14 * finish task #4964. 2018-10-09 10:53:07 +08:00
wangyidong
1148ff0f7c * finish task #4892. 2018-09-19 16:00:38 +08:00
liugang
1266a30bbc * Remove class btn-default.
* Merge conflicts.
2018-05-17 13:35:56 +08:00
wangyidong
56489075b0 Merge branch 'zentaopms_9.8' 2018-05-07 16:48:59 +08:00
liugang
5a529bcc54 * Refact view page and edit page of company. 2018-04-19 18:27:16 +08:00
daitingting
dafec6b33d * Rewrite create page of story. 2018-04-16 10:20:32 +08:00
daitingting
2fa7aa63b3 * Add title for select options.
* Set wrap for options over width.
2018-03-30 14:42:11 +08:00
wangyidong
ea04270362 * adjust for block. 2018-03-07 14:31:26 +08:00
wangyidong
05fc92c45c * adjust for upgrade. 2017-03-23 11:54:55 +08:00
wangyidong
c8d822e454 * rewrite convert pinyin. 2017-03-20 16:32:02 +08:00
wangyidong
099aecdda6 * adjust for select with pinyin. 2016-12-29 17:35:02 +08:00
wangyidong
6ece360ab7 * adjust pinyin. 2016-12-29 17:30:13 +08:00
wangyidong
6150ee7b76 * adjust for pinyin. 2016-12-09 09:38:13 +08:00
wangyidong
21eba69df9 * adjust for select with pinyin. 2016-12-06 14:22:18 +08:00
wangyidong
2f679cee93 * adjust for pinyin. 2016-12-06 10:33:09 +08:00
wangyidong
a70a30f837 * finish task #2733. 2016-11-24 13:48:28 +08:00
wangyidong
c96be8964a * change for framework. 2016-03-10 11:15:24 +08:00
wangyidong
dffd808378 * change for lib can extend with base. 2016-03-10 09:30:15 +08:00
wangyidong
12bdd87463 * fix bug. 2016-03-09 13:13:50 +08:00
wangyidong
df85f2625e * finish task #2474 and fix bug. 2016-03-08 11:32:48 +08:00
Catouse
18f97e6478 * change UI of buttons in table footer. 2016-03-07 13:35:13 +08:00
wangyidong
274639baa5 * fix bug. 2016-03-02 15:25:27 +08:00
wangyidong
20aa49dea9 * fix bug #797 and adjust frawework. 2016-03-02 13:28:04 +08:00
wangyidong
e23311969d * change for new framework. 2016-03-01 10:57:53 +08:00
wangyidong
e097fdcb8e * finish task #2329. 2015-10-16 10:53:10 +08:00
wangyidong
9538c89267 * fix for pro. 2015-07-01 10:27:11 +08:00
Catouse
6e5148963e * fix select buttons. 2014-12-16 10:55:22 +08:00
Catouse
e717233a92 * fixed bug #653. 2014-11-27 13:58:22 +08:00
Catouse
c91b4dfd16 * removed debug code. 2014-11-07 09:56:43 +08:00
wangyidong
b0b9235673 Merge branch 'master' of github.com:easysoft/zentaopms 2014-11-04 03:16:30 +00:00
Catouse
91b5c5deb9 * fixed errors in method ''selectButton". 2014-11-04 11:00:57 +08:00
wangyidong
b1af6eac76 * fix a bug #646. 2014-11-04 01:18:40 +00:00