|  Fu Matthew | 5d6279a9ea | fix calendar broken | 2013-01-03 10:58:52 +08:00 | 
				
					
						|  Rueshyna | f67664df29 | custom icon for msoffice | 2013-01-02 17:35:21 +08:00 | 
				
					
						|  Rueshyna | 5f7453c3fb | generalization file type | 2013-01-02 16:58:48 +08:00 | 
				
					
						|  Rueshyna | f4692182c0 | when mouse move to button of announcement file : image => preview pic, file => type | 2013-01-02 16:34:38 +08:00 | 
				
					
						|  Rueshyna | 8a6f92b87b | fixed announcement controller syntax error | 2013-01-02 10:19:56 +08:00 | 
				
					
						|  chris | 9937b4ac9b | Fix deleting links and files in bulletin | 2012-12-31 18:03:13 +08:00 | 
				
					
						|  chris | 2d8400d1cc | Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu | 2012-12-28 15:34:24 +08:00 | 
				
					
						|  chris | 61b0f94c04 | Remove I18n.locale for announcement front-end Fix counter in back-end edit | 2012-12-28 15:34:04 +08:00 | 
				
					
						|  Fu Matthew | 5587e83419 | Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu | 2012-12-28 15:31:32 +08:00 | 
				
					
						|  Fu Matthew | baf1240b76 | gallery options | 2012-12-28 15:30:46 +08:00 | 
				
					
						|  chris | e8e7c38221 | Changes for announcement widget style 1 and categories | 2012-12-28 14:01:04 +08:00 | 
				
					
						|  chris | 455a27437d | Changes for announcement widget style 2 | 2012-12-28 13:47:30 +08:00 | 
				
					
						|  chris | 17d93409b3 | Remove extra double quote in sub_menu Fix web link widget pagination | 2012-12-28 11:10:33 +08:00 | 
				
					
						|  Rueshyna | c219792a13 | fixed delete function of archive file | 2012-12-28 10:02:16 +08:00 | 
				
					
						|  chris | 751d3b1220 | Announcement widget: remove I18n.locale Add part_id in url | 2012-12-27 16:52:58 +08:00 | 
				
					
						|  chris | e9815c3d9b | Fix css bug when precompiling assets | 2012-12-20 14:34:02 +08:00 | 
				
					
						|  Rueshyna | b4633a2ccb | .not_guest_user | 2012-12-19 19:48:13 +08:00 | 
				
					
						|  chris | fcbba6660b | Only one parser for front end Separate site map for i18n | 2012-12-19 17:15:31 +08:00 | 
				
					
						|  OrbitServer | fbed496034 | Harry's changes in i18n | 2012-12-06 23:08:13 +08:00 | 
				
					
						|  Rueshyna | 4a8878132e | add content for announcement rss | 2012-12-06 07:59:42 +08:00 | 
				
					
						|  chris | 2983b181e6 | Fix some translations | 2012-12-04 01:03:28 +08:00 | 
				
					
						|  Rueshyna | eb97d417bd | if coauthor not in coauthor db then it will be add in db | 2012-12-04 00:31:06 +08:00 | 
				
					
						|  chris | dc3be3c9a1 | Translation changes | 2012-12-03 23:00:04 +08:00 | 
				
					
						|  chris | 390da0e49a | Change icons | 2012-11-29 00:49:53 +08:00 | 
				
					
						|  Rueshyna | 114ca5493a | replace rss format with json in announcement | 2012-11-28 13:43:48 +08:00 | 
				
					
						|  chris | 6a12aec67c | Fix album images display | 2012-11-22 20:01:10 +08:00 | 
				
					
						|  chris | 475642d375 | Remove news and fix default_url in ImageUploader | 2012-11-22 09:30:25 +08:00 | 
				
					
						|  devin | 25a9987f13 | calendar js minor update | 2012-11-21 19:02:54 +08:00 | 
				
					
						|  chris | 2d0e8b37b2 | Fix: - Widgets for announcement
  - Facebook link
  - AdBanner nav | 2012-11-21 18:42:14 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | ec0ec46303 | visitor now can browse gallery | 2012-11-21 18:39:28 +08:00 | 
				
					
						|  chris | 0aaadbc82d | Merge branch 'openness' of github.com:Rulingcom/orbit into openness Conflicts:
	vendor/built_in_modules/calendar/app/assets/javascripts/calendarAPI.js.erb | 2012-11-21 18:33:04 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 1279af0c11 | fix and hide for visitors,except for album | 2012-11-21 18:31:57 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 1f8f58e930 | album and gallery is now opened | 2012-11-21 17:52:25 +08:00 | 
				
					
						|  Harry Bomrah | ef3fddd863 | fixed sutpid bug for calendar | 2012-11-21 16:55:18 +08:00 | 
				
					
						|  Harry Bomrah | 9fc8ec8e16 | back button fix for frontend | 2012-11-21 15:00:07 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | fda7c43efc | Merge branch 'master' of github.com:Rulingcom/orbit into openness | 2012-11-21 11:46:44 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | ee053cd8ac | fix and hide for visitors,except for album | 2012-11-21 11:46:06 +08:00 | 
				
					
						|  Rueshyna | b359d5d566 | some bugs | 2012-11-21 07:37:44 +08:00 | 
				
					
						|  Rueshyna | d7599f1ccf | add edit function | 2012-11-21 07:37:43 +08:00 | 
				
					
						|  Rueshyna | 5eb8cc4063 | finished some method of list and journal | 2012-11-21 07:37:43 +08:00 | 
				
					
						|  devin | f2e76d27b8 | minor update for gallery and calendar backend | 2012-11-21 07:36:59 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 96fe482d50 | for openness | 2012-11-20 20:20:59 +08:00 | 
				
					
						|  chris | df58d4c5f3 | Merge branch 'modified_json_format' of github.com:Rulingcom/orbit into modified_json_format Conflicts:
	vendor/built_in_modules/gallery/config/routes.rb | 2012-11-20 12:14:53 +08:00 | 
				
					
						|  Rueshyna | 47075944e7 | make gallery json format to two layer | 2012-11-20 12:13:18 +08:00 | 
				
					
						|  Rueshyna | 81f67fc08a | make announcement json format to two layer | 2012-11-20 12:11:35 +08:00 | 
				
					
						|  Rueshyna | bfef1a8e7c | tmp | 2012-11-20 12:11:35 +08:00 | 
				
					
						|  Rueshyna | bd7518093f | about route url link bug | 2012-11-20 12:11:35 +08:00 | 
				
					
						|  Rueshyna | 310d7523bd | modified gallery json format but it have some bugs... | 2012-11-20 12:11:35 +08:00 | 
				
					
						|  Rueshyna | 36b4cb1ec1 | modified announcement json format but it have some bugs... | 2012-11-20 12:09:58 +08:00 | 
				
					
						|  chris | 747b0d4620 | Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit Conflicts:
	vendor/built_in_modules/gallery/config/routes.rb | 2012-11-20 10:11:59 +08:00 |