Commit Graph

54 Commits

Author SHA1 Message Date
EricTYL f76098aad6 Merge branch 'master' into 'master'
add honor types filter

let honor index page return honors by types

See merge request !1
2019-11-04 11:07:48 +08:00
EricTYL 04d59309fc i18n for query all kinds of honors 2019-11-04 11:02:23 +08:00
EricTYL 117d22bcf7 add honor type filter 2019-11-04 10:52:20 +08:00
EricTYL 06c1446a5b auto indent app/controllers/personal_honors_controller.rb 2019-11-04 10:40:59 +08:00
wmcheng bcbfd97106 Update honor.rb add title 2018-12-04 22:55:39 +08:00
wmcheng 9eb01a5e8d Update _form.html.erb start_year plus 5 for user selection tab 2018-11-30 19:56:39 +08:00
Harry Bomrah ce280fe922 small fix for empty title 2017-12-26 14:49:22 +08:00
Harry Bomrah 78eb25a3ca fix for empty title 2017-12-19 18:33:10 +08:00
Harry Bomrah b169f868b8 paginates per 2017-01-11 14:32:40 +08:00
Harry Bomrah fe263544a3 filename fixed 2016-06-06 17:37:04 +08:00
Harry Bomrah d604cf2a9c added excel and charts 2016-06-06 17:15:12 +08:00
Harry Bomrah 1fcb59b006 small fix for the link 2016-05-31 17:10:20 +08:00
Harry Bomrah 9ed10d1e19 changed format 2016-04-11 19:56:44 +08:00
Harry Bomrah 835dd7fc28 added scope for index 2016-04-11 19:26:05 +08:00
Harry Bomrah 5ab686b34e added award date for sort 2016-04-11 17:56:13 +08:00
Harry Bomrah 6cd6549ac4 fix for backend 2016-04-06 15:49:30 +08:00
Harry Bomrah b97742b6db fixed award date 2016-04-06 14:59:45 +08:00
Harry Bomrah 8bcab846c4 award date fixed and date format 2016-04-06 14:52:31 +08:00
Harry Bomrah e39650abca modified date 2016-04-06 13:27:58 +08:00
Harry Bomrah 97de505179 added country and award date 2016-04-06 02:09:04 +08:00
Harry Bomrah 1433be1a9b can modify fields 2016-03-21 19:02:08 +08:00
Harry Bomrah 2a2cb7637c year fix in honor 2016-01-13 18:42:14 +08:00
Harry Bomrah 8b55567fe6 small fix for field type comparision 2016-01-13 18:04:11 +08:00
Harry Bomrah 485f9b5401 fix for column removal 2016-01-13 17:54:54 +08:00
Harry Bomrah be3945cd44 removed blank columns 2016-01-12 20:32:40 +08:00
Harry Bomrah 299875a130 small fixes for excel import 2015-12-14 16:12:52 +08:00
Harry Bomrah 6181a5a75d added import from xlsx file 2015-12-14 15:18:27 +08:00
Harry Bomrah 2f6b6d62b1 sort fixes 2015-12-09 15:26:55 +08:00
Harry Bomrah af05f4dbf0 year converted to integer in model 2015-12-04 14:53:31 +08:00
Harry Bomrah 43a14b5c9e sorting and dates fixed 2015-12-02 18:29:00 +08:00
Ruling-Mac f8f80a1373 add copy to all languages 2015-10-21 16:20:28 +08:00
Harry Bomrah 0f3ae81bc5 add a fix for settings 2015-07-21 19:15:53 +08:00
Harry Bomrah 4c23e5761e fix for hiding and showing by normal members 2015-07-20 15:21:37 +08:00
Harry Bomrah d9bcf0ba6d fix for slug_title 2015-04-29 18:06:03 +08:00
JiangRu b09132c925 fix if awarding_unit is empty 2015-04-14 18:53:44 +08:00
JiangRu 3a61eab435 desktop controller renamed 2015-03-16 15:09:31 +08:00
spen 3ec3ccc13f add data can select member 2015-01-20 14:44:40 +08:00
spen bd3677f2c6 something fix 2015-01-09 15:44:32 +08:00
JiangRu 446bf1ac8a desktop honor 2014-12-04 17:55:01 +08:00
Harry Bomrah 877b622c13 fix for frontend 2014-10-03 14:13:07 +08:00
Harry Bomrah 816d8d4b07 no member rescue 2014-10-02 20:47:49 +08:00
Harry Bomrah 7e23454c93 fix for honor without name 2014-10-02 19:46:12 +08:00
manson 52b22f3f45 Update frontend 2014-08-01 19:47:43 +08:00
manson 9577859d45 add authorization 2014-08-01 12:23:36 +08:00
manson d441bf2135 Pagination 2014-07-18 15:03:24 +08:00
manson ec6173efe3 Fix url encode 2014-07-15 17:26:23 +08:00
Harry Bomrah 3e2e4911f7 added rss2_id and also translations for some field 2014-07-14 21:27:02 +08:00
manson 71ab680473 Remove gem dependency 2014-07-07 10:28:16 +08:00
manson 927bf12fc2 Add url to frontend 2014-07-04 12:16:46 +08:00
manson 1de7e5c509 Fix hidden status 2014-07-03 19:32:20 +08:00