unknown
d5c55c9697
widget & frontend field
2012-08-09 15:25:30 +08:00
Matthew K. Fu JuYuan
e8317e0a4b
1.Remove category column when category is specified
...
2.Showing category if not in category browsing
3.Redirect to home and show error if app page is not available for user language
4.Showing no context to display if object has no language for it.
5.Browse new and announcement by unit is now applicable.
2012-08-08 14:46:08 +08:00
Matthew K. Fu JuYuan
06919e76ed
fix approval at news and announcement for abnormal flags that causing search result fault.
2012-08-08 11:01:50 +08:00
Matthew K. Fu JuYuan
1cdc0e24bd
First version of Solr search.
2012-08-08 10:59:55 +08:00
Christophe Vilayphiou
cd4c9306da
Revert useless changes
2012-08-08 10:24:44 +08:00
Harry Bomrah
4660c26b7a
fix for ie8,9 for tinymce
2012-08-07 20:55:18 +08:00
Christophe Vilayphiou
73b2cd1035
Fix typo and title in news and announcement frontend
2012-08-05 15:04:52 +08:00
Christophe Vilayphiou
6a94d4f550
Put back impressionist where it was commented out
2012-08-04 15:42:53 +08:00
Christophe Vilayphiou
2d2e01115b
Fix page: take category and tag at the same time
...
With news and announcement views
2012-08-03 01:44:06 +08:00
Christophe Vilayphiou
4127d7f2eb
Fix tags
2012-08-03 01:35:41 +08:00
Matthew K. Fu JuYuan
acebec8904
don't dislay web links if no eng. lists in widget is now sorted.
2012-08-01 15:24:55 +08:00
Matthew K. Fu JuYuan
b989f458d3
Do not show news/anc if no context.
2012-07-31 18:22:40 +08:00
Matthew K. Fu JuYuan
4dea025c8a
fix for
...
1.Announcement 15 per page
2.Search keywords.
3.Redis search index with new code.
2012-07-31 10:59:48 +08:00
Matthew K. Fu JuYuan
bb154f5be6
fix error when creating bulletin and news
2012-07-30 16:38:02 +08:00
Matthew K. Fu JuYuan
effad63c92
make sure no pending news or announcement will be searched out
2012-07-30 14:39:40 +08:00
Christophe Vilayphiou
e2ebd48b22
Remove i18n_variable for announcement
2012-07-27 19:12:58 +08:00
unknown
c0cac812c5
demo site widget
2012-07-26 16:39:29 +08:00
Matthew K. Fu JuYuan
fb1f08327d
fix redis search limit for 10 items
2012-07-26 12:12:43 +08:00
Matthew K. Fu JuYuan
4768da3c7a
fix announcement loading failed caused by impression. disable pinyin search.
2012-07-25 18:26:05 +08:00
Matthew K. Fu JuYuan
397b444390
fix for bugs
2012-07-24 20:58:34 +08:00
Matthew K. Fu JuYuan
f9bdb4a327
New and Announcement search. Disabled impression.
2012-07-20 15:47:40 +08:00
unknown
10731dc211
demo widget
2012-07-18 18:07:45 +08:00
Matthew K. Fu JuYuan
033667f99b
fix for missing disable category at frontend and widget
2012-07-17 11:26:50 +08:00
Matthew K. Fu JuYuan
a4b1681d39
fix rejection for announcement and news.
2012-07-17 10:21:46 +08:00
Matthew K. Fu JuYuan
4daf36908c
working cache
2012-07-13 15:36:10 +08:00
Matthew K. Fu JuYuan
85d6bbe1c9
add i18n variable. fix web_links for disable category
2012-07-11 17:56:31 +08:00
Matthew K. Fu JuYuan
ca2c056a07
fix for not displaying bulletin at fronted when it's parent category is disable
2012-07-11 17:17:44 +08:00
unknown
1d8e386bde
demo website widget
2012-07-09 16:28:03 +08:00
Matthew K. Fu JuYuan
49862e70f9
hide category at front end
2012-07-09 12:05:21 +08:00
Matthew K. Fu JuYuan
56caf4b34e
category disable for backend
2012-07-06 18:11:55 +08:00
Matthew K. Fu JuYuan
c5fdff764e
orbit disable object for categories
2012-07-05 16:00:45 +08:00
Matthew K. Fu JuYuan
ae2cbb728e
archive for announcement
2012-07-04 17:36:51 +08:00
Matthew K. Fu JuYuan
4fe92b844e
Add sorting order for NCCU request
2012-07-03 15:47:28 +08:00
Matthew K. Fu JuYuan
c0b3798bad
fix for date for qu menu
2012-06-29 11:41:06 +08:00
Matthew K. Fu JuYuan
f66c3d9c0c
fix bugs.
2012-06-29 11:17:35 +08:00
Matthew K. Fu JuYuan
6c4c1046bc
fix date select cause error back to the time of Jesus
2012-06-28 15:19:51 +08:00
Matthew K. Fu JuYuan
11247ce84c
Clean up code , cache other auths. Fix sidebar
2012-05-29 17:17:26 +08:00
Matthew K. Fu JuYuan
4f484599b7
Clean up code , cache other auths. Fix sidebar
2012-05-29 15:23:50 +08:00
Christophe Vilayphiou
a663231c8c
Merge branch 'design_team' into ldap
2012-05-25 10:01:41 +08:00
Christophe Vilayphiou
75b67dddf5
Fix date bugs
2012-05-25 09:59:39 +08:00
Christophe Vilayphiou
c062b43069
Merge branch 'design_team' into ldap
2012-05-23 12:11:38 +08:00
Christophe Vilayphiou
7c44e94285
Order list by created_at desc
...
Add best image size in news new
2012-05-23 11:46:19 +08:00
Christophe Vilayphiou
f1c8bed29d
Merge branch 'design_team' into ldap
...
Conflicts:
vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
2012-05-22 20:33:07 +08:00
Matthew K. Fu JuYuan
e0260542d3
fix code
2012-05-22 16:11:52 +08:00
Matthew K. Fu JuYuan
79f67208fa
js for preventing user do stupid things durning ajax
2012-05-22 14:59:54 +08:00
Christophe Vilayphiou
815e6a8361
Fix matt's code and add it to filters
2012-05-19 03:19:55 +08:00
Matthew K. Fu JuYuan
661fcafe70
Merge branch 'design_team' of https://github.com/Rulingcom/orbit into design_team
...
Conflicts:
vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb
2012-05-18 18:50:10 +08:00
Matthew K. Fu JuYuan
6ce6577e83
fix news approve and preview
2012-05-18 18:47:18 +08:00
Christophe Vilayphiou
f72d0bc7e0
Merge branch 'design_team' into ldap
2012-05-18 10:51:20 +08:00
Christophe Vilayphiou
d9c12ea5a4
Proof authed_users for case when no category
2012-05-18 10:50:51 +08:00
Christophe Vilayphiou
a4afd5c1d3
Merge branch 'design_team' into ldap
2012-05-18 10:36:32 +08:00
Christophe Vilayphiou
8ad7f70822
Proof i18n_variable for categories
2012-05-18 10:28:28 +08:00
Christophe Vilayphiou
f950f77f36
Merge branch 'design_team' into ldap
...
Conflicts:
Gemfile
app/models/ad_banner.rb
2012-05-15 23:02:22 +08:00
Christophe Vilayphiou
e54f4409fb
Add impressionist
2012-05-15 21:26:09 +08:00
Christophe Vilayphiou
ebc8dd33ec
Merge branch 'design_team' into ldap
...
Conflicts:
Gemfile.lock
app/controllers/admin/module_apps_controller.rb
app/controllers/application_controller.rb
vendor/built_in_modules/web_resource/web_resource.json
2012-05-14 00:57:17 +08:00
Matthew K. Fu JuYuan
b804ba4d96
Fix for manager and admin can see all post in announcement. Haven't applied to news
2012-05-14 00:50:36 +08:00
Matthew K. Fu JuYuan
7a6d30ad62
Remove unless files and change routes.
2012-05-14 00:50:36 +08:00
Matthew K. Fu JuYuan
8b42c595b3
Don't display admin in any premission select. Fix not necessary header for UT data
2012-05-14 00:49:22 +08:00
Christophe Vilayphiou
62e9a772f6
Fix titles for widgets
...
Add translations
2012-05-13 23:09:48 +08:00
Christophe Vilayphiou
4ae8299949
Add custom title to widgets
...
Fix pagination conflict with main_content and widgets
2012-05-13 22:35:00 +08:00
Christophe Vilayphiou
281cfa6518
Changes for widgets
2012-05-13 21:55:39 +08:00
Christophe Vilayphiou
87449ec6a8
Merge branch 'design_team' into ldap
2012-05-10 10:34:28 +08:00
Matthew K. Fu JuYuan
07815eee8f
fix display for announcement and remove ut field
2012-05-10 10:29:18 +08:00
Christophe Vilayphiou
de739d7d20
Merge branch 'design_team' into ldap
...
Conflicts:
vendor/built_in_modules/web_resource/web_resource.json
2012-05-10 00:34:23 +08:00
Christophe Vilayphiou
13587306bc
Add list widgets for announcement, news and links with categories and tags
2012-05-10 00:25:30 +08:00
Matthew K. Fu JuYuan
c82d701b55
Permission setting for announcement for bulletin cate
2012-05-09 15:28:02 +08:00
Christophe Vilayphiou
d88d4e58dc
Merge branch 'design_team' into ldap
...
Conflicts:
config/environments/development.rb
2012-05-09 13:51:00 +08:00
Christophe Vilayphiou
41424d2829
Fix error in front-end announcement index
2012-05-08 17:40:14 +08:00
Christophe Vilayphiou
55bfaea43e
Can show announcement and news list by tag's key
2012-05-08 17:27:42 +08:00
Christophe Vilayphiou
2b9190a49e
Merge branch 'design_team' into ldap
...
Conflicts:
config/locales/zh_tw.yml
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
2012-05-08 11:40:38 +08:00
Christophe Vilayphiou
f190ce18ee
Put sorting in web_link, page_context and design
2012-05-05 21:20:20 +08:00
Matthew K. Fu JuYuan
119d8ff13a
add field called unit_list_for_anc and data from nccu(0224). Now can run "rake nccu_data:setup_ut_list" to setup NCCU data.
2012-05-04 15:50:45 +08:00
Matthew K. Fu JuYuan
453cb21066
Announcement preivew
2012-05-04 15:50:45 +08:00
Matthew K. Fu JuYuan
f427c3803f
clean up useless flash msgs. add i18n vars for app auth and object auth
2012-05-04 15:40:43 +08:00
Matthew K. Fu JuYuan
05ded8de03
Fix for NCCU 0430 all functions ok with two submanagers but different behavors
2012-05-04 15:38:18 +08:00
Christophe Vilayphiou
20504b2205
Merge branch 'design_team' into ldap
...
Conflicts:
app/controllers/admin/page_parts_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
2012-04-30 07:57:20 +08:00
Christophe Vilayphiou
b8f52fa1ec
Separate announcement and news
2012-04-30 06:31:46 +08:00
Christophe Vilayphiou
32faef0c70
DRY code for sorting
2012-04-30 06:30:52 +08:00
Matthew K. Fu JuYuan
c4db7e2157
Fix approval setting ajax problem
2012-04-30 00:24:11 +08:00
Matthew K. Fu JuYuan
94d61abf83
A modal view for approval user
2012-04-30 00:24:10 +08:00
Christophe Vilayphiou
1f4fe65430
Merge branch 'design_team' into ldap
...
Conflicts:
app/views/devise/sessions/new.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
2012-04-25 16:45:04 +08:00
Matthew K. Fu JuYuan
a704a054cc
Remove useless files
2012-04-25 16:10:11 +08:00
Christophe Vilayphiou
0c4f1d91f7
Merge branch 'ad_banner' into ldap
2012-04-24 16:46:04 +08:00
Matthew K. Fu JuYuan
db46803cda
R4-Billingual
2012-04-24 16:43:45 +08:00
Christophe Vilayphiou
70f6c7b540
Merge branch 'design_team' into ldap
...
Conflicts:
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
2012-04-24 15:28:52 +08:00
Christophe Vilayphiou
d247f05d2e
Add missing translations in announcement and change announcement behavior for passed and rejected
2012-04-24 15:27:46 +08:00
Christophe Vilayphiou
d4aea664e2
Merge branch 'design_team' into ldap
...
Conflicts:
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
2012-04-24 02:37:03 +08:00
Christophe Vilayphiou
db1b84e962
Fix bug where an rejected announcement could still be edited by url
2012-04-24 00:58:56 +08:00
Christophe Vilayphiou
b502bedd0f
Fix filter and sort for status in announcement
2012-04-24 00:46:34 +08:00
Christophe Vilayphiou
5a423178e3
Merge branch 'design_team' into ldap
...
Conflicts:
app/assets/stylesheets/new_admin.css.erb
app/assets/stylesheets/widget.css
2012-04-23 15:16:50 +08:00
Christophe Vilayphiou
1ebf460f7e
Fix 'loading fail' in front-end for announcement
...
The show action was returning an array instead of a bulletin
2012-04-23 14:47:33 +08:00
Matthew K. Fu JuYuan
f55b3a4374
Merge branch 'master' of https://github.com/Rulingcom/orbit into ldap
...
Conflicts:
Gemfile
Gemfile.lock
app/views/admin/attributes/_app_selector.html.erb
app/views/admin/module_apps/_app_selector.html.erb
app/views/admin/pages/_app_selector.html.erb
config/application.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb
vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
2012-04-19 14:06:00 +08:00
Christophe Vilayphiou
486845460c
Filter and delete for bulletins
2012-04-12 06:50:36 +08:00
Christophe Vilayphiou
963a0cb604
Change filter to js with history for bulletins
2012-04-07 00:20:52 +08:00
Christophe Vilayphiou
4da03026a4
Fix pagination bug in bulletins
2012-04-05 15:28:43 +08:00
unknown
d45725cf3b
fix announcement & add lang tab
2012-04-05 15:23:20 +08:00
Christophe Vilayphiou
9c1c70b598
Fix sorting in annoucement
2012-04-02 02:55:36 +08:00
Christophe Vilayphiou
6c50aa5243
Add pagination to bulletin index and remove ajax to make it simple
2012-04-02 02:55:36 +08:00
Christophe Vilayphiou
172d3d7847
Remove bad references to NewBlog
2012-03-27 19:42:07 +08:00
Christophe Vilayphiou
b587b7ca6b
Remove limit(1) to bulletins index action
2012-03-27 19:22:50 +08:00