Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								6b8b749b0f
								
							
						 | 
						
							
							
								
								fix chris tag cloud
							
							
							
							
							
						 | 
						
							2013-06-06 17:18:42 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								253cca06cc
								
							
						 | 
						
							
							
								
								New widget for tag cloud
							
							
							
							
							
						 | 
						
							2013-06-06 17:17:45 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								30824d1620
								
							
						 | 
						
							
							
								
								add search to archive
							
							
							
							
							
						 | 
						
							2013-06-05 18:03:09 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								06fd305bf9
								
							
						 | 
						
							
							
								
								default widget show search
							
							
							
							
							
						 | 
						
							2013-06-05 13:00:21 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								3e0b7d81ae
								
							
						 | 
						
							
							
								
								clean 403 404 500
							
							
							
							
							
						 | 
						
							2013-05-27 16:46:49 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								37aa950028
								
							
						 | 
						
							
							
								
								user action
							
							
							
							
							
						 | 
						
							2013-05-23 11:55:57 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								3e6c2b1ec2
								
							
						 | 
						
							
							
								
								fix member error with blank database
							
							
							
							
							
						 | 
						
							2013-05-14 11:48:13 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								ef2c732d2e
								
							
						 | 
						
							
							
								
								make blank site working better
							
							
							
							
							
						 | 
						
							2013-05-14 11:26:35 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								7d077a92a5
								
							
						 | 
						
							
							
								
								system preference
							
							
							
							
							
						 | 
						
							2013-04-29 15:23:15 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								3e567223e3
								
							
						 | 
						
							
							
								
								fix for Spen's translation and Chris's tag error
							
							
							
							
							
						 | 
						
							2013-04-26 15:37:27 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								79ef86f2c9
								
							
						 | 
						
							
							
								
								member translation fix
							
							
							
							
							
						 | 
						
							2013-04-26 11:26:11 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								d047a3d62a
								
							
						 | 
						
							
							
								
								chris tags update
							
							
							
							
							
						 | 
						
							2013-04-26 11:26:10 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								697944a029
								
							
						 | 
						
							
							
								
								user id set & user fields set & role set & member frontend list & user translation & create new member bug fix
							
							
							
							
							
						 | 
						
							2013-04-25 19:59:59 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								b198b1a17b
								
							
						 | 
						
							
							
								
								system preference
							
							
							
							
							
						 | 
						
							2013-04-24 19:21:11 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								62fa589e8a
								
							
						 | 
						
							
							
								
								add msg when user session expired at page admin
							
							
							
							
							
						 | 
						
							2013-04-24 11:58:48 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								5ff7dfbac6
								
							
						 | 
						
							
							
								
								fronted open switch and backend openness
							
							
							
							
							
						 | 
						
							2013-04-23 18:48:18 +08:00 | 
						
					
				
					
						
							
							
								 
								devin chen
							
						 | 
						
							
							
							
							
							
								
							
							
								989e5aa974
								
							
						 | 
						
							
							
								
								minor update
							
							
							
							
							
						 | 
						
							2013-04-17 14:29:56 +08:00 | 
						
					
				
					
						
							
							
								 
								devin chen
							
						 | 
						
							
							
							
							
							
								
							
							
								055d758769
								
							
						 | 
						
							
							
								
								Page Loading Effect
							
							
							
							
							
							
							
							tinyscrollbar has problem 
							
						 | 
						
							2013-04-17 14:27:18 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								3de4591413
								
							
						 | 
						
							
							
								
								fix frontend ajax respond 404 due to javascript overwritten after assets precompile
							
							
							
							
							
						 | 
						
							2013-04-17 14:19:32 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								c6868bf2e0
								
							
						 | 
						
							
							
								
								small fix in select2.js
							
							
							
							
							
						 | 
						
							2013-04-17 14:18:49 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								425a320c02
								
							
						 | 
						
							
							
								
								fix widget and fronted setting interface. checked with Spen
							
							
							
							
							
						 | 
						
							2013-04-17 14:16:24 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								0781779ac0
								
							
						 | 
						
							
							
								
								solved conflicts
							
							
							
							
							
						 | 
						
							2013-04-17 14:14:24 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								e7bffe4c0f
								
							
						 | 
						
							
							
								
								devin's new branch
							
							
							
							
							
						 | 
						
							2013-04-17 14:14:24 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								793d739726
								
							
						 | 
						
							
							
								
								features and widgets added
							
							
							
							
							
							
							
							Conflicts:
	app/assets/javascripts/orbitdesktop.js 
							
						 | 
						
							2013-04-17 14:14:23 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								c8aa50ee87
								
							
						 | 
						
							
							
								
								Lots of Update
							
							
							
							
							
							
							
							1. CSS to SCSS
2. Journal Paper update
Conflicts:
	Gemfile.lock
	app/assets/javascripts/orbitdesktop.js
	app/assets/stylesheets/desktop/desktop-main.css
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb 
							
						 | 
						
							2013-04-17 14:14:23 +08:00 | 
						
					
				
					
						
							
							
								 
								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 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								dae3f069ff
								
							
						 | 
						
							
							
								
								app manager changed plus some changes
							
							
							
							
							
						 | 
						
							2013-04-17 11:09:56 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								b1d7d5345e
								
							
						 | 
						
							
							
								
								section page fixed..
							
							
							
							
							
						 | 
						
							2013-04-17 11:08:58 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								0d5ab20efa
								
							
						 | 
						
							
							
								
								add browser compatibility page
							
							
							
							
							
						 | 
						
							2013-04-17 11:07:45 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								9815950083
								
							
						 | 
						
							
							
								
								now default options can be chosen by developer at init
							
							
							
							
							
						 | 
						
							2013-04-17 11:07:45 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								b8ee2fd559
								
							
						 | 
						
							
							
								
								compatibility page added and tinyscrollbar drag event fixed..
							
							
							
							
							
						 | 
						
							2013-04-17 11:07:20 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								69a49a69aa
								
							
						 | 
						
							
							
								
								style for front end
							
							
							
							
							
						 | 
						
							2013-04-17 11:05:57 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								1d06bcaae7
								
							
						 | 
						
							
							
								
								Major tinyscrollbar update
							
							
							
							
							
						 | 
						
							2013-04-17 10:54:38 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								8e98cb3ec9
								
							
						 | 
						
							
							
								
								put add admin pages using orbit back end controller
							
							
							
							
							
						 | 
						
							2013-04-17 10:54:38 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								b864cc0268
								
							
						 | 
						
							
							
								
								Changes in I18n (except personal_conference and personal_journal)
							
							
							
							
							
						 | 
						
							2013-03-12 18:13:48 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								73e9a60212
								
							
						 | 
						
							
							
								
								Pagination or more link for default widget
							
							
							
							
							
						 | 
						
							2013-03-07 21:21:48 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								d7d480ac12
								
							
						 | 
						
							
							
								
								archive edit & plugins edit
							
							
							
							
							
						 | 
						
							2013-03-07 21:12:31 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								27686a5d04
								
							
						 | 
						
							
							
								
								Merge branch 'development' into desktop
							
							
							
							
							
						 | 
						
							2013-03-05 19:07:58 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								a9bf400fac
								
							
						 | 
						
							
							
								
								Merge branch 'desktop_work_devin' into desktop
							
							
							
							
							
							
							
							* desktop_work_devin:
  tinyscrollbar minor update
  desktop CSS update
  tinyscrollbar minor update
  desktop CSS update
Conflicts:
	app/views/desktop/index.html.erb
	vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_form.html.erb
	vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/index.html.erb
	vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/_form.html.erb
	vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb
	vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb
	vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_window.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_form.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/_form.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_window.html.erb 
							
						 | 
						
							2013-03-05 18:48:12 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								d5f1d13670
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/desktop_work' into desktop
							
							
							
							
							
							
							
							* origin/desktop_work:
  simple layout tinyscrollbar fixed
  highlighting fixed…
  fixed adding.
  layout fix
  tinyscrollbar_bug fixed
  url handling modified.. tinyscrollbar modified… star checkbox fixed..
  tinyscrollbar fixed
  some changes for gridster
  Lot of changes in gridster
Conflicts:
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb 
							
						 | 
						
							2013-03-05 17:34:28 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								806ffe0a1e
								
							
						 | 
						
							
							
								
								fixed desktop several bug
							
							
							
							
							
						 | 
						
							2013-03-05 17:31:57 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								db2b371744
								
							
						 | 
						
							
							
								
								tinyscrollbar minor update
							
							
							
							
							
						 | 
						
							2013-03-05 17:22:53 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								3182f5c9a8
								
							
						 | 
						
							
							
								
								merging
							
							
							
							
							
						 | 
						
							2013-03-05 11:20:01 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								dc92ef9f42
								
							
						 | 
						
							
							
								
								simple layout tinyscrollbar fixed
							
							
							
							
							
						 | 
						
							2013-03-05 11:04:18 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								4e24223c78
								
							
						 | 
						
							
							
								
								desktop CSS update
							
							
							
							
							
						 | 
						
							2013-03-05 09:39:01 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								15b9839b76
								
							
						 | 
						
							
							
								
								fix archive category
							
							
							
							
							
							
							
							fix page adding failed 
							
						 | 
						
							2013-03-04 14:40:29 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								23c8c28b52
								
							
						 | 
						
							
							
								
								tinyscrollbar fixed
							
							
							
							
							
						 | 
						
							2013-03-04 12:37:29 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								c82e9a646d
								
							
						 | 
						
							
							
								
								tinyscrollbar fixed
							
							
							
							
							
						 | 
						
							2013-02-27 18:55:26 +08:00 |