|  Matt K. Fu | 0f6f5aafce | fix for both part and page part settings Conflicts:
	app/helpers/admin/page_parts_helper.rb
	app/views/admin/pages/reload_front_end_setting.js.erb
	app/views/admin/pages/reload_frontend_pages.js.erb | 2013-04-17 14:12:52 +08:00 | 
				
					
						|  Fu Matthew | f6b600df59 | deliver API | 2013-04-17 14:09:01 +08:00 | 
				
					
						|  chris | 6af375efa4 | Fix bug in setup_app_frontend_and_style | 2013-04-17 14:09:00 +08:00 | 
				
					
						|  Fu Matthew | 1709773b0a | style for front end | 2013-04-17 14:08:01 +08:00 | 
				
					
						|  Fu Matthew | 6efef253a6 | add conditions for making multi cates and tags more stable | 2013-04-17 11:08:57 +08:00 | 
				
					
						|  Harry Bomrah | b8ee2fd559 | compatibility page added and tinyscrollbar drag event fixed.. | 2013-04-17 11:07:20 +08:00 | 
				
					
						|  Fu Matthew | 4a08a1992b | 1.make module app forbid unearthed access except from admin 2.override sidebar link when it's object_auth or app_auth. | 2013-04-17 10:56:15 +08:00 | 
				
					
						|  Fu Matthew | 8e98cb3ec9 | put add admin pages using orbit back end controller | 2013-04-17 10:54:38 +08:00 | 
				
					
						|  chris | 3e96cfe514 | Changes for FAQ to work with not latest but stable code | 2013-03-28 15:05:52 +08:00 | 
				
					
						|  chris | da8a5123c2 | Change in announcement init for query Change in default widget query | 2013-03-27 16:31:42 +08:00 | 
				
					
						|  chris | d01968dcd0 | Changes in query for default widget | 2013-03-21 02:29:56 +08:00 | 
				
					
						|  chris | 617ebfd43a | Revert "Fix query for top in bulletin" This reverts commit 332481f9f1a5802ae652bb401d0dd409196ab00f. | 2013-03-19 23:44:02 +08:00 | 
				
					
						|  chris | b55988af33 | Fix query for top in bulletin | 2013-03-19 23:44:02 +08:00 | 
				
					
						|  chris | 9684189258 | Fix query for date in bulletin | 2013-03-19 23:43:59 +08:00 | 
				
					
						|  chris | 8374bc8d12 | Set I18n from browser | 2013-03-19 23:43:31 +08:00 | 
				
					
						|  chris | 9cf8c2b72b | Revert "Page front end stay in the same page when a link is clicked (category)" This reverts commit 14d856b4d6. | 2013-03-19 20:00:16 +08:00 | 
				
					
						|  chris | 14d856b4d6 | Page front end stay in the same page when a link is clicked (category) | 2013-03-19 19:44:04 +08:00 | 
				
					
						|  chris | 37a38369e7 | Fix typo in default widget not showing objects in front end | 2013-03-19 18:41:03 +08:00 | 
				
					
						|  chris | ff30b3d05e | Fix link not showing for default front end | 2013-03-19 18:23:35 +08:00 | 
				
					
						|  chris | f3c809fd58 | Fix link switch not showing for default front end | 2013-03-19 17:49:46 +08:00 | 
				
					
						|  chris | 5e4e3ac560 | Fix link for default widget Convert single id to array to find item | 2013-03-19 17:14:01 +08:00 | 
				
					
						|  chris | 7dcea95dd4 | Fix query for multi categories and tags (empty array) | 2013-03-19 15:10:31 +08:00 | 
				
					
						|  chris | ef2a32be4c | Fix query for multi categories and tags | 2013-03-18 22:01:08 +08:00 | 
				
					
						|  chris | 157935e7eb | Page front end stay in the same page when a link is clicked (title or pagination) | 2013-03-18 21:54:06 +08:00 | 
				
					
						|  chris | e208e99a73 | Fix page part update when no tag or category | 2013-03-13 15:45:30 +08:00 | 
				
					
						|  Spen | d7d480ac12 | archive edit & plugins edit | 2013-03-07 21:12:31 +08:00 | 
				
					
						|  chris | 147b7b9292 | Fix update when no tag or category | 2013-03-07 17:30:49 +08:00 | 
				
					
						|  Fu Matthew | dc3966be81 | fix cates and tags | 2013-03-05 18:34:41 +08:00 | 
				
					
						|  Fu Matthew | 626b2a7bca | fix default failed when cate or tags  set to empty | 2013-03-05 11:48:20 +08:00 | 
				
					
						|  Fu Matthew | 285119a5f3 | fix for multi select cates and tags | 2013-03-04 19:29:45 +08:00 | 
				
					
						|  chris | ca946fc881 | Merge branch 'development' of github.com:Rulingcom/orbit into development Conflicts:
	lib/tasks/migrate.rake | 2013-02-27 11:03:52 +08:00 | 
				
					
						|  Fu Matthew | 0dabd5b95f | fix widget field reload | 2013-02-27 10:51:41 +08:00 | 
				
					
						|  Fu Matthew | 8a8bfcb8fb | fix default widget link | 2013-02-27 10:50:47 +08:00 | 
				
					
						|  Fu Matthew | 99e67c8719 | first version of multi categories and tags | 2013-02-27 10:49:48 +08:00 | 
				
					
						|  Fu Matthew | 5f832a17d4 | fix widget field reload | 2013-02-25 12:49:06 +08:00 | 
				
					
						|  Harry Bomrah | 9f362d9ae6 | gridster, url code fixed, views removed. | 2013-02-25 11:08:56 +08:00 | 
				
					
						|  chris | 5b0b8e6c79 | Fix bug in widget selection | 2013-02-23 17:25:07 +08:00 | 
				
					
						|  chris | caac9191ce | Fix public_r_tag selection | 2013-02-23 16:52:37 +08:00 | 
				
					
						|  Fu Matthew | 73bca03b33 | fix default widget link | 2013-02-23 15:19:51 +08:00 | 
				
					
						|  Fu Matthew | 9fec7beb47 | Merge branch 'development' of github.com:Rulingcom/orbit into development Conflicts:
	app/controllers/default_widget_controller.rb
	lib/tasks/migrate.rake | 2013-02-22 17:53:49 +08:00 | 
				
					
						|  Fu Matthew | b315215bed | first version of multi categories and tags | 2013-02-22 16:32:05 +08:00 | 
				
					
						|  chris | 680d7908b9 | member plugin init edit | 2013-02-21 17:53:08 +08:00 | 
				
					
						|  unknown | d46abd7caf | member list edit | 2013-02-21 14:13:46 +08:00 | 
				
					
						|  unknown | f59da3ce81 | member plugin init edit | 2013-02-20 18:05:09 +08:00 | 
				
					
						|  unknown | bc44d38948 | member plugin edit | 2013-02-20 17:25:20 +08:00 | 
				
					
						|  unknown | a7bc19768e | member list edit | 2013-02-20 11:12:08 +08:00 | 
				
					
						|  chris | 39c6660c67 | Remove useless code not removed in merge Fix argument bug in link_to_field | 2013-02-19 20:42:46 +08:00 | 
				
					
						|  chris | 9e9620c04a | Fix item looking for widget when no front end | 2013-02-19 18:09:54 +08:00 | 
				
					
						|  chris | 6d1f919bb7 | Fix links in default widget | 2013-02-19 18:09:50 +08:00 | 
				
					
						|  chris | 3e79b787bb | Set default widget sort to created_at Don't use page category when home | 2013-02-19 17:49:23 +08:00 |