Commit Graph

301 Commits

Author SHA1 Message Date
EricTYL 56822ed38c Merge branch 'master' into 'master'
return subtitle and image for templates

add subtitle and image to return value(hash)

See merge request !4
2019-11-04 12:27:13 +08:00
EricTYL d1957d6b88 remove trailing space 2019-10-29 15:51:02 +08:00
EricTYL 810c283dc6 add img_src for front-end 2019-10-29 15:48:05 +08:00
EricTYL c3c8e4864b add subtitle_ann for front-end 2019-10-29 14:49:10 +08:00
EricTYL 82ab7c40ec auto format 2019-10-29 14:48:02 +08:00
EricTYL 862dc14449 auto format 2019-10-29 14:45:45 +08:00
chiu 2a51723b3f Update _form_file.html.erb
avoid the file to being deleted by js
2019-10-01 20:27:51 +08:00
BOHUNG 02e4df8b1f delete the empty file when user is in show-page 2019-09-15 14:35:23 +08:00
Bomrah Harry fb83cc7ec5 sanatized querystring from url 2019-01-16 17:37:32 +08:00
Bomrah Harry ee215cfadb fix for http and https in index page for loading page 2018-10-25 16:44:49 +08:00
Bomrah Harry 87f853242e fix for https 2018-10-17 17:21:06 +08:00
Harry Bomrah a0df7f77f4 language translations 2018-01-19 17:05:26 +08:00
Harry Bomrah 370f3fd325 added postdate search filter in announcement 2018-01-18 20:40:56 +08:00
Harry Bomrah cf5c45cb34 added filter start and end date options 2017-12-11 16:45:01 +08:00
Harry Bomrah 30687d655f Update feed.html.erb 2017-11-30 11:05:55 +08:00
Harry Bomrah 274801b761 Update new.html.erb 2017-11-26 23:03:21 +08:00
Harry Bomrah a040370005 Update new.html.erb 2017-11-26 22:52:19 +08:00
Harry Bomrah 3c3b2f2051 Update edit.html.erb 2017-11-26 22:50:15 +08:00
Harry Bomrah 59a2323760 Update feed.html.erb 2017-11-26 22:48:48 +08:00
Harry Bomrah c118a893e2 Update feed.html.erb 2017-11-26 22:43:23 +08:00
Harry Bomrah c6e4066fd4 Update edit.html.erb 2017-11-26 22:33:54 +08:00
Harry Bomrah 0fd3501f4c fix for announcement is pro 2017-08-24 20:31:51 +08:00
Harry Bomrah 7daf685f2b small fix for url for widgets 2017-08-17 15:16:26 +08:00
Harry Bomrah 3203b35722 changed font size 2017-06-29 16:43:57 +08:00
Harry Bomrah 0e1123396b added tag cloud widget 2017-06-29 16:03:39 +08:00
Harry Bomrah c06e87fb05 added external link option 2017-06-20 15:04:50 +08:00
tseng yen chi d6cb086a4a fix post_tag and if bulletin's rss2_sn is the same not insert 2017-02-03 17:12:37 +08:00
tseng yen chi 673afd2f5a import form wp xml now available 2017-01-26 14:30:59 +08:00
Keith e6852a91ad Added info of viewcount in datail 2017-01-17 13:43:58 +08:00
Harry Bomrah a4b587a86b fix for files 2017-01-16 15:23:26 +08:00
Harry Bomrah ea109b01ff added export to excel 2017-01-16 15:14:57 +08:00
Harry Bomrah 1569acc4ca added json feed link 2017-01-05 14:56:05 +08:00
Harry Bomrah e56b6f8971 datepicker date range added 2016-12-29 14:29:59 +08:00
Harry Bomrah 08059e2152 small fix for title empty 2016-11-23 19:03:34 +08:00
Harry Bomrah 33fabb2634 small fix for title empty 2016-11-23 18:59:01 +08:00
Harry Bomrah 6936f49825 fix of announcement dissapearing when going to next page. 2016-10-14 12:45:23 +05:30
Harry Bomrah cf61891dd5 fixed mailer language issue 2016-10-05 13:21:50 +05:30
Harry Bomrah 7c3f590b6b small fix for top bulletins if not approved 2016-09-12 14:11:21 +08:00
Harry Bomrah e4766f3ac3 confirmation added to form if no tags selected 2016-09-06 17:47:52 +08:00
Harry Bomrah edb7f2915c delete empty submanager 2016-09-02 10:45:05 +08:00
Harry Bomrah 2f0f080687 now approvers for the category only get the emails 2016-08-30 15:18:42 +08:00
Harry Bomrah 3f9446d545 small fix for settings for announcement pro feature 2016-08-08 19:14:00 +08:00
Harry Bomrah f8f70e0ebe added settings for approver election and also for sending emails 2016-08-05 20:00:34 +08:00
Harry Bomrah 239eca2f0d email template modified 2016-08-02 18:41:29 +08:00
Harry Bomrah 5e762fa542 changed emails to multilingual, url changed to open backend 2016-07-22 00:23:19 +08:00
Harry Bomrah 026fef47af rejection now included with email systems. 2016-07-20 20:35:23 +08:00
Harry Bomrah b67730775c fix for pro settings if settings are not enabled 2016-07-06 16:43:09 +08:00
Harry Bomrah bfbececdbf added pro version enabling in annoucment settings 2016-07-05 19:34:29 +08:00
Harry Bomrah b974cb771a fix for xls import for blank url and files descriptions 2016-06-29 18:37:03 +08:00
Harry Bomrah ec4f25170d small fix for bulletin link 2016-05-12 16:52:05 +08:00
Harry Bomrah 3d1e7a1ad0 added file selection for announcement 2016-05-09 18:11:18 +08:00
Harry Bomrah 1d4ddef575 small fix for tag filter 2016-05-05 16:32:43 +08:00
Harry Bomrah fc325dce2d now can import files and links with excel 2016-05-04 20:30:35 +08:00
Harry Bomrah 402562f743 small fix 2016-05-02 17:36:21 +08:00
Harry Bomrah 8490db6992 small fix 2016-04-27 19:28:30 +08:00
Harry Bomrah 8e9e1f1609 small fix 2016-04-27 19:05:10 +08:00
Harry Bomrah c319e600a3 small fix 2016-04-27 19:01:41 +08:00
Harry Bomrah 9e5d5cf095 small fix for top anns while filtering 2016-04-27 18:59:29 +08:00
Harry Bomrah e0b0ffcd09 added source filter 2016-04-27 18:55:14 +08:00
Harry Bomrah e0d0a2aaa6 added keywords filteration for index pages 2016-04-25 20:10:44 +08:00
Harry Bomrah 2983b2b691 added excel import for announcements 2016-04-22 01:28:37 +08:00
Harry Bomrah daa42b0ce2 fix for widget filter by tag 2016-04-21 15:53:58 +08:00
Harry Bomrah fb7ed0bb69 fix encoding 2016-04-12 18:14:17 +08:00
Harry Bomrah 755cb13028 added utf encoding 2016-04-12 18:02:29 +08:00
Harry Bomrah ef37c0dd27 small fix for remote 2016-04-12 17:55:50 +08:00
Harry Bomrah 73ad4a5eb4 small fix 2016-04-12 17:52:50 +08:00
Harry Bomrah 28937534fe small fix 2016-04-12 17:48:17 +08:00
Harry Bomrah 9938585a5a small fix for show page for remote anns 2016-04-12 17:38:16 +08:00
Harry Bomrah 10ed85e4fb small fix 2016-04-12 15:59:50 +08:00
Harry Bomrah 99b8776c27 remote files fixed 2016-04-12 15:56:29 +08:00
Harry Bomrah 4733a77afa reverted to non empty title 2016-04-11 16:40:23 +08:00
Harry Bomrah 140a8f0332 now feeds are sorted. major change in algo 2016-04-11 16:32:15 +08:00
Harry Bomrah 0d14ffa23e now without title wont show 2016-04-07 16:35:36 +08:00
Harry Bomrah 63e3e78dba fix empty files 2016-04-07 16:20:48 +08:00
Harry Bomrah ad76febf40 imporvised smart_converter method to parsse content better 2016-03-07 18:34:23 +08:00
Harry Bomrah 8171fddea6 small fix for feeds 2016-03-07 18:19:56 +08:00
Harry Bomrah 0b7dedcaa2 small fix for urls 2016-03-07 18:11:58 +08:00
Harry Bomrah a8b35baa6f added converter for images in feeds 2016-03-07 17:11:07 +08:00
Harry Bomrah 0f168e366e announcement_Setting fix 2015-12-22 19:52:35 +08:00
Harry Bomrah 4ae6d34216 update for expire time and also limit setting for user 2015-12-22 19:04:13 +08:00
Harry Bomrah 5ecd24c977 fix for tags 2015-12-16 16:01:09 +08:00
Harry Bomrah 7b0008c03a git added source to status by default 2015-11-11 17:54:10 +08:00
Harry Bomrah ea56724a59 removed source for non feed 2015-11-10 14:31:52 +08:00
Harry Bomrah 9fa1249232 small fix 2015-11-10 14:23:35 +08:00
Harry Bomrah cd5b06503e source site title and url added 2015-11-10 14:14:35 +08:00
Harry Bomrah fcce54b43d added class for feed source 2015-11-10 14:05:31 +08:00
Harry Bomrah 8074c24b67 fix for no tags 2015-11-10 02:30:44 +08:00
Harry Bomrah 6502df721c fix for source 2015-11-10 02:12:34 +08:00
Harry Bomrah 2e8bca12af added random annoucment picker method 2015-10-29 16:42:42 +08:00
Harry Bomrah 8cfc89abcc small fix for preview 2015-10-19 16:59:26 +08:00
Harry Bomrah 17a0e4b4ce fix for source 2015-10-18 02:02:22 +08:00
Harry Bomrah 8df55e816b some changes for feed widget 2015-10-18 01:51:20 +08:00
Harry Bomrah 9be45bcb51 small change for announcement feed 2015-10-18 01:28:48 +08:00
Harry Bomrah 172e7aba82 sort fixed for widget 2015-10-13 16:48:45 +08:00
Harry Bomrah 081513f400 small fix 2015-10-08 17:17:13 +08:00
Harry Bomrah e5067be77f removed postdate filter 2015-10-08 17:15:57 +08:00
Harry Bomrah ce15f93d22 small fix again 2015-10-08 17:10:58 +08:00
Harry Bomrah f962120207 small fix for order 2015-10-08 17:04:54 +08:00
Harry Bomrah 5a49d48e3c order of announcment fixed 2015-10-08 16:59:05 +08:00
Harry Bomrah d09391f887 sort fix for top 2015-10-01 18:36:21 +08:00
Harry Bomrah 8194b79d0a sort top fix 2015-10-01 18:22:27 +08:00
Ruling-Mac 8e0a539c04 modify widget display in announcement show page 2015-09-30 16:27:10 +08:00
Harry Bomrah dc4496fedd small fix for deleted tags 2015-09-16 14:03:33 +08:00
Harry Bomrah e21bbac441 url fix for announcements... 2015-09-14 20:04:56 +08:00
JiangRu 497dc63351 add category to export
json
2015-09-14 16:14:32 +08:00
Harry Bomrah 308370c4df added rss feeds 2015-09-11 20:28:41 +08:00
Harry Bomrah 1ff7b59123 feeds added for annoucnement 2015-07-08 18:11:25 +08:00
Harry Bomrah 77a804f925 small change for facebook meta tags 2015-07-03 19:53:24 +08:00
Harry Bomrah 69c0959b31 added image alternate text 2015-06-02 17:48:18 +08:00
Harry Bomrah 25919bef1a one more fix for empty title 2015-05-19 15:12:56 +08:00
Harry Bomrah 5b88d8373c fix not nil announcement 2015-05-19 14:57:18 +08:00
JiangRu a40b9af2d1 adjust json : {web_link}/admin/announcement.json 2015-03-17 18:17:01 +08:00
JiangRu d5e85823fe Fix PostDate && View Count Title 2015-03-16 16:56:53 +08:00
Harry Bomrah cd5de45183 fix for default image 2015-03-10 18:26:43 +08:00
Harry Bomrah d0e9ffbf39 changed ann default image name 2015-03-10 18:02:23 +08:00
Harry Bomrah 9745d09990 added indexing in intializer 2015-03-05 19:49:28 +08:00
JiangRu 2921aa62d4 if no data , hide title&table 2015-02-25 10:58:51 +08:00
JiangRu 05eb32cbd2 export son 2015-02-13 14:24:51 +08:00
Harry Bomrah 5cfea2946d fix for no announcement page in widget 2015-02-11 16:05:53 +05:30
JiangRu 4f9e75bc6a fix 2015-01-16 17:06:21 +08:00
JiangRu 66f0bd0895 fix table title 2015-01-16 17:03:02 +08:00
JiangRu 188050c6ab fix table table 2015-01-16 17:01:33 +08:00
JiangRu e88916bbfb add param files & links for index and widget 2015-01-16 16:44:23 +08:00
JiangRu 7412c2f928 restore code 2014-12-27 15:54:43 +08:00
JiangRu d40f8cfc80 fix tag & category 2014-12-27 15:37:29 +08:00
JiangRu 12a692d886 fix tag & category 2014-12-27 15:23:25 +08:00
JiangRu 4a257f7590 show page date fix to postdate 2014-12-27 11:20:50 +08:00
JiangRu 52c01d4af9 fix front tag 2014-12-25 10:54:58 +08:00
JiangRu 03908e402d fix languages for title 2014-12-23 15:11:13 +08:00
JiangRu b8144754b3 update announcement sort 2014-12-15 14:57:31 +08:00
Harry Bomrah 4123610d32 category fix 2014-12-11 17:41:42 +08:00
Harry Bomrah 7f511aee91 small fix 2014-12-03 18:07:52 +08:00
Harry Bomrah 1e74ee2a4c added main picture for widget 2014-12-03 18:02:47 +08:00
JiangRu 363fafaa98 update widget read more url for designer 2014-12-01 13:48:02 +08:00
JiangRu f0efa2344a fix announcement title language 2014-11-27 11:22:45 +08:00
Harry Bomrah c766bf76a2 small fix 2014-11-25 18:25:54 +08:00
Harry Bomrah 16df9ac38a added author for announcement widget and index 2014-11-25 18:09:53 +08:00
JiangRu 1cbe055361 update view_count 2014-11-19 17:50:08 +08:00
Harry Bomrah 0fd7e69981 authorization changes 2014-10-20 18:53:31 +08:00
Harry Bomrah b1c6bcbf9b rescue for empty username if imported 2014-10-15 20:35:53 +08:00
Harry Bomrah 56607ea35c removed approval from this module 2014-10-14 17:06:50 +08:00
Harry Bomrah fce7ca7a13 added description for images in announcement 2014-10-14 14:28:51 +08:00
Harry Bomrah a5b21637a3 fixed non title rescue 2014-10-06 17:59:40 +08:00
Harry Bomrah 649479b70c now only one date and also removed second widget method 2014-10-01 16:26:22 +08:00
Harry Bomrah 7552fdd6d0 added approve method to announcements 2014-09-22 16:32:30 +08:00
Harry Bomrah e1a67a2d6f some changes in frontend controller 2014-09-19 15:54:41 +08:00
Harry Bomrah b2788d099c added table field for widgets 2014-09-19 15:32:54 +08:00
Harry Bomrah 491ef9237c added table header for table layout 2014-09-19 15:28:17 +08:00
manson 18f9611d0a add more date format for index 2014-09-12 11:02:56 +08:00
manson cd2865c6b8 add new widget method 2014-08-12 11:40:06 +08:00