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 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								6efef253a6
								
							
						 | 
						
							
							
								
								add conditions for making multi cates and tags more stable
							
							
							
							
							
						 | 
						
							2013-04-17 11:08:57 +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 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								323fadc210
								
							
						 | 
						
							
							
								
								tinyscrollbar pagination fixed
							
							
							
							
							
						 | 
						
							2013-04-17 11:05:57 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								69a49a69aa
								
							
						 | 
						
							
							
								
								style for front end
							
							
							
							
							
						 | 
						
							2013-04-17 11:05:57 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								625f2e9ad6
								
							
						 | 
						
							
							
								
								have done conference author filter, journal haven't been done, yet
							
							
							
							
							
						 | 
						
							2013-04-17 11:04:52 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								d840b82fa9
								
							
						 | 
						
							
							
								
								insert and remove columns
							
							
							
							
							
						 | 
						
							2013-04-17 10:56:15 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								84dfb44e78
								
							
						 | 
						
							
							
								
								tinyscrollbar css minor update
							
							
							
							
							
						 | 
						
							2013-04-17 10:56:15 +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 | 
						
					
				
					
						
							
							
								
									
								
								 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 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								0189d1c2c0
								
							
						 | 
						
							
							
								
								all none fixed
							
							
							
							
							
						 | 
						
							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 | 
						
					
				
					
						
							
							
								 
								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
							
						 | 
						
							
							
							
							
							
								
							
							
								147b7b9292
								
							
						 | 
						
							
							
								
								Fix update when no tag or category
							
							
							
							
							
						 | 
						
							2013-03-07 17:30:49 +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 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								dc3966be81
								
							
						 | 
						
							
							
								
								fix cates and tags
							
							
							
							
							
						 | 
						
							2013-03-05 18:34:41 +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 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								626b2a7bca
								
							
						 | 
						
							
							
								
								fix default failed when cate or tags  set to empty
							
							
							
							
							
						 | 
						
							2013-03-05 11:48:20 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								285119a5f3
								
							
						 | 
						
							
							
								
								fix for multi select cates and tags
							
							
							
							
							
						 | 
						
							2013-03-04 19:29:45 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								b5abbc9ef0
								
							
						 | 
						
							
							
								
								highlighting fixed…
							
							
							
							
							
						 | 
						
							2013-03-04 17:57:32 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								15b9839b76
								
							
						 | 
						
							
							
								
								fix archive category
							
							
							
							
							
							
							
							fix page adding failed 
							
						 | 
						
							2013-03-04 14:40:29 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								e69679d3fe
								
							
						 | 
						
							
							
								
								tinyscrollbar_bug fixed
							
							
							
							
							
						 | 
						
							2013-03-04 12:37:29 +08:00 |