Commit Graph

405 Commits

Author SHA1 Message Date
Matthew K. Fu JuYuan 19db9d0037 basic function 2012-09-17 13:32:52 +08:00
unknown 42d50ae534 Plugins 2012-09-14 00:05:31 +08:00
Christophe Vilayphiou 03b5827392 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
Conflicts:
	app/controllers/application_controller.rb
	app/views/layouts/_side_bar.html.erb
2012-09-14 00:03:52 +08:00
Matthew K. Fu JuYuan 3e5978c8fd users new interface controller 2012-09-14 00:02:21 +08:00
Matthew K. Fu JuYuan 4818e3f444 first version for new member html 2012-09-14 00:02:21 +08:00
Christophe Vilayphiou 2e9af5d1a8 fix commit bugs 2012-09-13 15:53:36 +08:00
Christophe Vilayphiou 3432d1359b Fix bug in show_from_link 2012-09-12 16:46:03 +08:00
Matthew K. Fu JuYuan 98e8f5f607 complete visitor dashbroad 2012-09-12 16:20:15 +08:00
Matthew K. Fu JuYuan 45ef7fd302 guest user 2012-09-12 16:20:15 +08:00
Christophe Vilayphiou e88b09cf72 Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
Conflicts:
	app/controllers/pages_controller.rb
	app/views/layouts/_side_bar.html.erb
	lib/parsers/parser_common.rb
	vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css
	vendor/built_in_modules/gallery/config/locales/en.yml
	vendor/built_in_modules/gallery/config/locales/zh_tw.yml
2012-09-12 02:21:18 +08:00
Harry Bomrah 8dd69a140f frontend commits 2012-09-12 02:12:15 +08:00
Harry Bomrah 3749e919cb front ends updates 2012-09-12 02:12:15 +08:00
Harry Bomrah 04877b9945 design update 2012-09-12 01:58:23 +08:00
Matthew K. Fu JuYuan 01a8a9b5b6 users new interface controller 2012-09-11 10:53:05 +08:00
Matthew K. Fu JuYuan 42cfe5ac91 first version for new member html 2012-09-11 10:52:27 +08:00
Harry Bomrah 8295286c6e frontend commits 2012-09-05 19:08:48 +08:00
Harry Bomrah b726c10857 front ends updates 2012-09-04 21:30:17 +08:00
unknown 0cb573946e update item page 2012-08-30 15:17:39 +08:00
unknown a1560ebcf5 update archive 2012-08-30 15:17:39 +08:00
Harry Bomrah 94ee16ae01 design update 2012-08-23 01:36:55 +08:00
chris 7d5531bf01 Merge branch 'nccu_master' into demo_site
Conflicts:
	Gemfile
	app/assets/javascripts/tinymce_orbit.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/admin/assets_controller.rb
	app/controllers/admin/module_apps_new_interface_controller.rb
	app/controllers/admin/page_parts_controller.rb
	app/jobs/sync_db.rb
	app/models/page.rb
	app/models/page_part.rb
	app/models/user/user.rb
	app/uploaders/image_uploader.rb
	app/views/admin/assets/create.js.erb
	app/views/admin/module_apps/reload_frontend_pages.js.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	app/views/layouts/_users_checkbox_ary.html.erb
	app/views/shared/_privilege_user.html.erb
	config/mongoid.yml
	lib/parsers/parser_common.rb
	vendor/built_in_modules/announcement/announcement.json
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
2012-08-22 18:07:49 +08:00
Harry Bomrah faf2d914b6 Page added for desktop 2012-08-20 23:17:31 +08:00
Harry Bomrah 263cf130e2 tp 2012-08-20 23:16:54 +08:00
Harry Bomrah 1ba87982ba Multi language and side bar update 2012-08-20 23:14:11 +08:00
Harry Bomrah 1daf405b3d Gallery started. 2012-08-20 23:14:10 +08:00
Christophe Vilayphiou 43bc704468 Error popup only shows on flash[:error] 2012-08-15 15:55:29 +08:00
Christophe Vilayphiou c32b0dd4b4 Move delete checkboxes to js 2012-08-14 00:59:01 +08:00
Christophe Vilayphiou c2f3f45196 Fix for link in nccu widget 2012-08-13 11:34:14 +08:00
Matthew K. Fu JuYuan 080974b563 Merge branch 'new_rss'
Conflicts:
	vendor/built_in_modules/announcement/app/models/bulletin.rb
2012-08-12 23:32:28 +08:00
Matthew K. Fu JuYuan f1b4d9e204 Add authorization for rescue interface
Change logic for NCCU site for status panel.
2012-08-12 23:29:13 +08:00
Christophe Vilayphiou 5281464af4 Fix bug for sorting when there's only one category with elements 2012-08-11 16:56:28 +08:00
unknown d5c55c9697 widget & frontend field 2012-08-09 15:25:30 +08:00
Christophe Vilayphiou 41930eb693 RSS first page 2012-08-08 17:41:48 +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
Christophe Vilayphiou 05e61b63bb Fix fb share, redirect with js when the page is not requested by fb but by user 2012-08-08 11:04:19 +08:00
Christophe Vilayphiou a03d1ad10b Change for getting url from key 2012-08-08 11:04:19 +08:00
Christophe Vilayphiou 6cfdf0f25a Change the way the orig_url is passed to fb 2012-08-08 11:04:19 +08:00
Christophe Vilayphiou 4bed925e0f Try fb from override and generated page 2012-08-08 11:04:19 +08:00
Harry Bomrah 4660c26b7a fix for ie8,9 for tinymce 2012-08-07 20:55:18 +08:00
Christophe Vilayphiou 8ea7bf75cd Fix uploader, ie9 ok, not ie8 2012-08-07 17:32:15 +08:00
Christophe Vilayphiou 6a94d4f550 Put back impressionist where it was commented out 2012-08-04 15:42:53 +08:00
Christophe Vilayphiou 50b313976e Fix page: take category and tag at the same time 2012-08-03 17:12:54 +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 25a911b4f8 Change for page: take category and tag at the same time 2012-08-01 16:33:46 +08:00
Christophe Vilayphiou 39b63a970c Fix .class to .class.to_s 2012-07-30 18:34:54 +08:00
Christophe Vilayphiou 7440727acd Fix: "._type" to ".class" 2012-07-30 17:21:37 +08:00
Matthew K. Fu JuYuan a657a7d615 remove cache 2012-07-27 19:14:24 +08:00
Christophe Vilayphiou a8cc581279 Sitemap done for backend and fronted 2012-07-27 19:13:40 +08:00
Christophe Vilayphiou 934b515914 Sitemap with main 2012-07-27 19:13:39 +08:00
Christophe Vilayphiou 38804bd118 Add disable for main title 2012-07-27 19:13:39 +08:00