Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								bae1c0da7d
								
							
						 | 
						
							
							
								
								now only approved announcement can be viewed when backend is open
							
							
							
							
							
						 | 
						
							2013-11-05 20:50:02 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								1f3f9831ad
								
							
						 | 
						
							
							
								
								Fixed Openness Issue
							
							
							
							
							
						 | 
						
							2013-11-04 15:44:51 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								d636248073
								
							
						 | 
						
							
							
								
								Updated Sidebar, Application Controllers
							
							
							
							
							
						 | 
						
							2013-11-01 16:42:39 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								c541e84254
								
							
						 | 
						
							
							
								
								Remove include of ParserBackEnd
							
							
							
							
							
						 | 
						
							2013-10-31 16:17:51 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								e42cf8720e
								
							
						 | 
						
							
							
								
								Updated Site Preferences with language fix
							
							
							
							
							
						 | 
						
							2013-10-21 16:53:11 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								14fea3638f
								
							
						 | 
						
							
							
								
								Updated with some locale fixes in site preferences
							
							
							
							
							
						 | 
						
							2013-10-18 15:26:41 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								155039ac16
								
							
						 | 
						
							
							
								
								Updated fixes for site info - desktop openess, title always displayed
							
							
							
							
							
						 | 
						
							2013-10-16 18:33:57 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								fe1869199e
								
							
						 | 
						
							
							
								
								Fix typo, it wasn't executing the filtering on tags
							
							
							
							
							
						 | 
						
							2013-10-07 19:01:59 +08:00 | 
						
					
				
					
						
							
							
								 
								Manson Wang
							
						 | 
						
							
							
							
							
							
								
							
							
								831bd722b8
								
							
						 | 
						
							
							
								
								Fix site preference openness problem
							
							
							
							
							
						 | 
						
							2013-10-07 14:37:52 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								fa857cfeea
								
							
						 | 
						
							
							
								
								Default Locale
							
							
							
							
							
						 | 
						
							2013-09-06 18:00:36 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								da1d70efcb
								
							
						 | 
						
							
							
								
								Change authorization to accept other than category
							
							
							
							
							
						 | 
						
							2013-07-25 17:36:55 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								1ba1703e90
								
							
						 | 
						
							
							
								
								Fix get_viewable
							
							
							
							
							
						 | 
						
							2013-07-22 17:41:52 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								1db324d1a2
								
							
						 | 
						
							
							
								
								Fix get_sorted_and_filtered
							
							
							
							
							
						 | 
						
							2013-07-19 17:38:43 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								5190c1160a
								
							
						 | 
						
							
							
								
								Fix get_sorted_and_filtered, accepts 3 arguments and works for category
							
							
							
							
							
						 | 
						
							2013-07-16 14:43:56 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								856898016b
								
							
						 | 
						
							
							
								
								New UI changes(tags, categories, authorisations, module index…)
							
							
							
							
							
							
							
							To run:
  - ruby lib/remove_old_tags.rb DB_NAME
  - rake new_ui:migrate_tags
  - rake new_ui:migrate_categories['APP_KEY,''MODEL_NAME'] (check new_ui.rake for more details) 
							
						 | 
						
							2013-07-02 16:46:44 +08:00 | 
						
					
				
					
						
							
							
								 
								iCross
							
						 | 
						
							
							
							
							
							
								
							
							
								c63ac751ea
								
							
						 | 
						
							
							
								
								archive module: sort for backend/frontend. move get_sorted_and_filtered from orbit_backend_controller.rb to application_controller.rb
							
							
							
							
							
						 | 
						
							2013-06-06 19:20:21 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								7729161123
								
							
						 | 
						
							
							
								
								fix for passing args. code in complete,fronted controller need to take care params,too. backend parser need to catch up.
							
							
							
							
							
						 | 
						
							2013-06-06 17:38:17 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								c0f1614cb9
								
							
						 | 
						
							
							
								
								fix uploading error due to user action decoder can not handle uploading file
							
							
							
							
							
						 | 
						
							2013-05-30 10:17:28 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								37aa950028
								
							
						 | 
						
							
							
								
								user action
							
							
							
							
							
						 | 
						
							2013-05-23 11:55:57 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								1096db79b6
								
							
						 | 
						
							
							
								
								blank site now can be start from rake site:build
							
							
							
							
							
						 | 
						
							2013-05-14 10:32:53 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								5ff7dfbac6
								
							
						 | 
						
							
							
								
								fronted open switch and backend openness
							
							
							
							
							
						 | 
						
							2013-04-23 18:48:18 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								3098496083
								
							
						 | 
						
							
							
								
								widget link followed by setting
							
							
							
							
							
						 | 
						
							2013-04-17 14:19:32 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								8e98cb3ec9
								
							
						 | 
						
							
							
								
								put add admin pages using orbit back end controller
							
							
							
							
							
						 | 
						
							2013-04-17 10:54:38 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								8374bc8d12
								
							
						 | 
						
							
							
								
								Set I18n from browser
							
							
							
							
							
						 | 
						
							2013-03-19 23:43:31 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								dc3966be81
								
							
						 | 
						
							
							
								
								fix cates and tags
							
							
							
							
							
						 | 
						
							2013-03-05 18:34:41 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								91830f86aa
								
							
						 | 
						
							
							
								
								Fix bug for mobile app routes
							
							
							
							
							
						 | 
						
							2013-01-16 08:14:42 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								282604d1fa
								
							
						 | 
						
							
							
								
								Merge branch 'back' of github.com:Rulingcom/orbit into back
							
							
							
							
							
							
							
							Conflicts:
	app/assets/javascripts/mobile/orbit.mobile.js.erb
	app/assets/stylesheets/mobile.css
	app/assets/stylesheets/mobile/orbit-mobile.css.erb
	app/controllers/application_controller.rb
	app/controllers/mobile_controller.rb
	app/views/layouts/mobile.mobile.erb
	app/views/mobile/_footer.mobile.erb
	app/views/mobile/_header.mobile.erb
	app/views/mobile/_menu.mobile.erb
	app/views/mobile/index.mobile.erb
	config/routes.rb 
							
						 | 
						
							2013-01-14 17:46:27 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								41dff814fb
								
							
						 | 
						
							
							
								
								Change icons
							
							
							
							
							
						 | 
						
							2013-01-09 21:17:50 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								fac4faad6c
								
							
						 | 
						
							
							
								
								Change date picker
							
							
							
							
							
						 | 
						
							2013-01-09 05:18:16 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								6c6bda988d
								
							
						 | 
						
							
							
								
								Add mobile version in site settings
							
							
							
							
							
						 | 
						
							2013-01-07 03:57:36 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								37740adb24
								
							
						 | 
						
							
							
								
								Add mobile but remove news in it
							
							
							
							
							
						 | 
						
							2013-01-07 03:03:38 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								6da528ef98
								
							
						 | 
						
							
							
								
								show error message when trying to show a not existed page
							
							
							
							
							
						 | 
						
							2013-01-03 13:50:27 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								5d6279a9ea
								
							
						 | 
						
							
							
								
								fix calendar broken
							
							
							
							
							
						 | 
						
							2013-01-03 10:58:52 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								32c6f17613
								
							
						 | 
						
							
							
								
								fix object auth. show error message if user try to do object auth in a wrong way.
							
							
							
							
							
						 | 
						
							2013-01-02 14:34:34 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								3a9106c10d
								
							
						 | 
						
							
							
								
								Add mobile but remove news in it
							
							
							
							
							
						 | 
						
							2012-12-20 03:21:50 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								fcbba6660b
								
							
						 | 
						
							
							
								
								Only one parser for front end
							
							
							
							
							
							
							
							Separate site map for i18n 
							
						 | 
						
							2012-12-19 17:15:31 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								17988f2fb2
								
							
						 | 
						
							
							
								
								address field and text field convert
							
							
							
							
							
						 | 
						
							2012-11-20 09:53:37 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								65ac6980c4
								
							
						 | 
						
							
							
								
								Merge branch 'various_bugs' into nccu_master
							
							
							
							
							
							
							
							Conflicts:
	Gemfile.lock
	app/assets/javascripts/ajax_form.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/application_controller.rb
	app/controllers/sessions_controller.rb
	app/helpers/admin/web_link_helper.rb
	app/views/admin/attributes/_attribute_field.html.erb
	app/views/admin/designs/_form.html.erb
	app/views/admin/pages/_form.html.erb
	app/views/admin/sites/_side_bar.html.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	config/locales/en.yml
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	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/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
	vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb 
							
						 | 
						
							2012-10-29 16:10:07 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								189fa553c5
								
							
						 | 
						
							
							
								
								Changes for helpers, not including all by default
							
							
							
							
							
						 | 
						
							2012-10-09 14:47:16 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								bdd5a1a047
								
							
						 | 
						
							
							
								
								Changes for i18n yml
							
							
							
							
							
						 | 
						
							2012-09-24 09:02:45 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								8b68387199
								
							
						 | 
						
							
							
								
								fix share loading failed
							
							
							
							
							
						 | 
						
							2012-09-19 15:09:08 +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 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								2e9af5d1a8
								
							
						 | 
						
							
							
								
								fix commit bugs
							
							
							
							
							
						 | 
						
							2012-09-13 15:53:36 +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 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								42cfe5ac91
								
							
						 | 
						
							
							
								
								first version for new member html
							
							
							
							
							
						 | 
						
							2012-09-11 10:52:27 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								41930eb693
								
							
						 | 
						
							
							
								
								RSS first page
							
							
							
							
							
						 | 
						
							2012-08-08 17:41:48 +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 |