Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								0671d0b126
								
							
						 | 
						
							
							
								
								filemanger authentication changes and also announcement preview fixed and also text search for files
							
							
							
							
							
							
							
							Conflicts:
	app/views/admin/assets/index.html.erb 
							
						 | 
						
							2013-12-11 18:49:54 +08:00 | 
						
					
				
					
						
							
							
								 
								Manson Wang
							
						 | 
						
							
							
							
							
							
								
							
							
								1febd0bdac
								
							
						 | 
						
							
							
								
								Fix front_end member plugin urls
							
							
							
							
							
						 | 
						
							2013-11-21 16:32:04 +08:00 | 
						
					
				
					
						
							
							
								 
								Manson Wang
							
						 | 
						
							
							
							
							
							
								
							
							
								26124e9138
								
							
						 | 
						
							
							
								
								Fix 'Missing Frontend Page' when page is a subpage
							
							
							
							
							
						 | 
						
							2013-11-21 14:33:16 +08:00 | 
						
					
				
					
						
							
							
								 
								Manson Wang
							
						 | 
						
							
							
							
							
							
								
							
							
								3bac21647e
								
							
						 | 
						
							
							
								
								Fix user plugin front_end
							
							
							
							
							
						 | 
						
							2013-11-20 11:27:20 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								9178ebd793
								
							
						 | 
						
							
							
								
								Rescue condition for model nil
							
							
							
							
							
						 | 
						
							2013-11-19 17:13:27 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								91d5ab6352
								
							
						 | 
						
							
							
								
								gallery versioning added.. and also the models changed for gallery now more R4 compatible. urls for gallery working fine now..
							
							
							
							
							
						 | 
						
							2013-11-19 09:32:08 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								16b695200a
								
							
						 | 
						
							
							
								
								gallery_album to album
							
							
							
							
							
						 | 
						
							2013-11-19 09:31:49 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								369bbe4d72
								
							
						 | 
						
							
							
								
								category click, event click and more button fix
							
							
							
							
							
						 | 
						
							2013-11-18 17:15:36 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								4888195566
								
							
						 | 
						
							
							
								
								more button works according to categories
							
							
							
							
							
						 | 
						
							2013-11-15 22:35:20 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								a38cf6304e
								
							
						 | 
						
							
							
								
								Fix for More link
							
							
							
							
							
						 | 
						
							2013-11-15 17:32:00 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								ce8e9c0a5f
								
							
						 | 
						
							
							
								
								Revert "more button fix and also new way to select more page."
							
							
							
							
							
							
							
							This reverts commit e129b25554. 
							
						 | 
						
							2013-11-15 16:58:27 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								e129b25554
								
							
						 | 
						
							
							
								
								more button fix and also new way to select more page.
							
							
							
							
							
						 | 
						
							2013-11-15 15:13:58 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								1f3f9831ad
								
							
						 | 
						
							
							
								
								Fixed Openness Issue
							
							
							
							
							
						 | 
						
							2013-11-04 15:44:51 +08:00 | 
						
					
				
					
						
							
							
								 
								Manson Wang
							
						 | 
						
							
							
							
							
							
								
							
							
								a885313e75
								
							
						 | 
						
							
							
								
								Dashboard with HighChart
							
							
							
							
							
						 | 
						
							2013-10-30 18:23:46 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								94c1d7d5a0
								
							
						 | 
						
							
							
								
								Fix homepage in structure, ajaxStop for structure edit, setForm in pageslide.js
							
							
							
							
							
						 | 
						
							2013-10-23 18:39:21 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								2530dace02
								
							
						 | 
						
							
							
								
								Change the parser_front_end to be used in the structure for page edit, new_ui:save_pages must be run
							
							
							
							
							
						 | 
						
							2013-10-20 18:44:04 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								4120be6f8e
								
							
						 | 
						
							
							
								
								fixes in sitemap, site preference
							
							
							
							
							
						 | 
						
							2013-10-14 16:48:50 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								55fa1cef4f
								
							
						 | 
						
							
							
								
								Added Enable and disable terms of use, sitemap
							
							
							
							
							
						 | 
						
							2013-10-11 13:14:37 +00:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								cce68beff1
								
							
						 | 
						
							
							
								
								Quick fix for front end reloading
							
							
							
							
							
						 | 
						
							2013-10-08 14:52:24 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								af98f8efce
								
							
						 | 
						
							
							
								
								Fix orbit bar language change
							
							
							
							
							
						 | 
						
							2013-07-29 19:49:07 +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 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								5c94200b77
								
							
						 | 
						
							
							
								
								fix argument passing problem for more link and tag cloud, incomplete code.
							
							
							
							
							
						 | 
						
							2013-06-06 17:21:27 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								54a35b30be
								
							
						 | 
						
							
							
								
								fix design index bug when start start from blank DB.
							
							
							
							
							
							
							
							add delay impressionist.
add several i18n vars 
							
						 | 
						
							2013-05-23 12:07:43 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								ef2c732d2e
								
							
						 | 
						
							
							
								
								make blank site working better
							
							
							
							
							
						 | 
						
							2013-05-14 11:26:35 +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 | 
						
					
				
					
						
							
							
								 
								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
							
						 | 
						
							
							
							
							
							
								
							
							
								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
							
						 | 
						
							
							
							
							
							
								
							
							
								6d1f919bb7
								
							
						 | 
						
							
							
								
								Fix links in default widget
							
							
							
							
							
						 | 
						
							2013-02-19 18:09:50 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								a9fecec985
								
							
						 | 
						
							
							
								
								Add pagination to default widget for front end page
							
							
							
							
							
						 | 
						
							2013-02-19 17:41:01 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								29b8fec89a
								
							
						 | 
						
							
							
								
								Temporary fix: show for default widget
							
							
							
							
							
							
							
							- the task migrate:recreate_page_parts must be run
	- "create_parts" in page.rb must be unprotected 
							
						 | 
						
							2013-02-19 17:39:34 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								5ab4bbd367
								
							
						 | 
						
							
							
								
								add ad_banner inner page,pic title.
							
							
							
							
							
						 | 
						
							2013-01-09 16:54:33 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								1856d2395d
								
							
						 | 
						
							
							
								
								complete page error handler logic
							
							
							
							
							
						 | 
						
							2013-01-03 15:35:14 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								2c632551e5
								
							
						 | 
						
							
							
								
								fix preview filed after ad_banner created.
							
							
							
							
							
						 | 
						
							2013-01-02 17:51:53 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								fcbba6660b
								
							
						 | 
						
							
							
								
								Only one parser for front end
							
							
							
							
							
							
							
							Separate site map for i18n 
							
						 | 
						
							2012-12-19 17:15:31 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								dc3be3c9a1
								
							
						 | 
						
							
							
								
								Translation changes
							
							
							
							
							
						 | 
						
							2012-12-03 23:00:04 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								4818e3f444
								
							
						 | 
						
							
							
								
								first version for new member html
							
							
							
							
							
						 | 
						
							2012-09-14 00:02:21 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								3432d1359b
								
							
						 | 
						
							
							
								
								Fix bug in show_from_link
							
							
							
							
							
						 | 
						
							2012-09-12 16:46:03 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								3749e919cb
								
							
						 | 
						
							
							
								
								front ends updates
							
							
							
							
							
						 | 
						
							2012-09-12 02:12:15 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								b726c10857
								
							
						 | 
						
							
							
								
								front ends updates
							
							
							
							
							
						 | 
						
							2012-09-04 21:30:17 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								43bc704468
								
							
						 | 
						
							
							
								
								Error popup only shows on flash[:error]
							
							
							
							
							
						 | 
						
							2012-08-15 15:55:29 +08:00 |