|  Christophe Vilayphiou | 4fb35b00f2 | Add missing translations | 2012-09-24 09:02:46 +08:00 | 
				
					
						|  Christophe Vilayphiou | bdd5a1a047 | Changes for i18n yml | 2012-09-24 09:02:45 +08:00 | 
				
					
						|  Christophe Vilayphiou | a04e1fd10b | Hot or top for news home banner | 2012-09-24 08:43:10 +08:00 | 
				
					
						|  Christophe Vilayphiou | 88d562450a | Fix home banner for hot news | 2012-09-21 15:34:18 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | a32027b64b | ray's fix | 2012-09-19 16:34:43 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 8b68387199 | fix share loading failed | 2012-09-19 15:09:08 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | c813a6143b | fb share for iNCCU | 2012-09-18 17:31:51 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 2321116597 | Merge commit '43ecebf93482cf94c73b78564509d1a352c2bcd2' into app_config | 2012-09-18 16:30:34 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 6da3928626 | change for NCCU ask | 2012-09-18 15:49:05 +08:00 | 
				
					
						|  Christophe Vilayphiou | 42c62ebca0 | Fix preview for announcement (was retuning js instead of html) | 2012-09-18 14:31:50 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | ce47109d33 | change link for rss | 2012-09-18 12:04:45 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 0ecb4eca46 | change for NCCU entry site | 2012-09-18 10:54:11 +08:00 | 
				
					
						|  unknown | 9eed9ec7b6 | demo site plugin | 2012-09-17 13:32:52 +08:00 | 
				
					
						|  Harry Bomrah | c5743a50bb | event bug fixed | 2012-09-17 13:28:11 +08:00 | 
				
					
						|  Harry Bomrah | 221ffc08dd | Some calendar updates | 2012-09-17 04:34:03 +08:00 | 
				
					
						|  Harry Bomrah | 9491945fd4 | calendar month view update | 2012-09-16 05:59:20 +08:00 | 
				
					
						|  Harry Bomrah | b09b1cf2f5 | commit for calendar | 2012-09-14 21:59:20 +08:00 | 
				
					
						|  Harry Bomrah | 0cf2f1b9a1 | final commit for calendar | 2012-09-14 16:10:40 +08:00 | 
				
					
						|  Christophe Vilayphiou | 619ae7e260 | Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit Conflicts:
	Gemfile.lock
	vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css
	vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/month_view.html.erb
	vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/week_view.html.erb | 2012-09-14 16:05:04 +08:00 | 
				
					
						|  devin | af19f11668 | calendar update - delete unwanted style in bootstrap-responsive.css
- yet start repeat panel
- please just refer how google works (functionality) | 2012-09-14 15:57:44 +08:00 | 
				
					
						|  devin | f1485556bd | calendar update | 2012-09-14 15:55:57 +08:00 | 
				
					
						|  Harry Bomrah | 6b791539f5 | final calendar change... | 2012-09-14 15:35:12 +08:00 | 
				
					
						|  Harry Bomrah | 3d9fb548e1 | calendar fixed | 2012-09-14 15:20:01 +08:00 | 
				
					
						|  devin | 17768867a5 | calendar update - delete unwanted style in bootstrap-responsive.css
- yet start repeat panel
- please just refer how google works (functionality) | 2012-09-14 00:27:35 +08:00 | 
				
					
						|  unknown | 42d50ae534 | Plugins | 2012-09-14 00:05:31 +08:00 | 
				
					
						|  Harry Bomrah | 73d5074037 | minor shit updates | 2012-09-13 23:57:48 +08:00 | 
				
					
						|  Harry Bomrah | 29ea95b4c6 | event_calendar testing | 2012-09-13 23:57:47 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | f009a1c942 | startup for config | 2012-09-13 18:31:44 +08:00 | 
				
					
						|  devin | 3e3699c873 | calendar update | 2012-09-13 18:06:18 +08:00 | 
				
					
						|  Christophe Vilayphiou | 90ae361dc3 | Class change for filter button | 2012-09-13 17:37:17 +08:00 | 
				
					
						|  Christophe Vilayphiou | 2e9af5d1a8 | fix commit bugs | 2012-09-13 15:53:36 +08:00 | 
				
					
						|  Christophe Vilayphiou | 8b2bc207de | Changes for i18n yml | 2012-09-12 19:12:50 +08:00 | 
				
					
						|  Christophe Vilayphiou | 45ccc315c7 | Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit | 2012-09-12 17:53:47 +08:00 | 
				
					
						|  Christophe Vilayphiou | 4dff15cffb | Add before_filter in gallery | 2012-09-12 17:52:24 +08:00 | 
				
					
						|  Harry Bomrah | 5443aba43e | with gallery json | 2012-09-12 16:50:59 +08:00 | 
				
					
						|  Harry Bomrah | f88176ee1f | Merge branch 'gallery_orbit' of https://github.com/Rulingcom/orbit into gallery_orbit | 2012-09-12 16:48:33 +08:00 | 
				
					
						|  Christophe Vilayphiou | 46177000e0 | Merge branch 'visitor_dsahbroad' of github.com:Rulingcom/orbit into visitor_dsahbroad Conflicts:
	Gemfile.lock
	app/controllers/application_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletin_categorys_controller.rb
	vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_bulletins_controller.rb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb | 2012-09-12 16:32:40 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 98e8f5f607 | complete visitor dashbroad | 2012-09-12 16:20:15 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 45ef7fd302 | guest user | 2012-09-12 16:20:15 +08:00 | 
				
					
						|  Harry Bomrah | 17f3104c8d | Merge branch 'gallery_orbit' into desktop_devin | 2012-09-12 16:18:13 +08:00 | 
				
					
						|  devin | e96ebefe9c | calendar update | 2012-09-12 16:16:01 +08:00 | 
				
					
						|  Harry Bomrah | 4ea0c0ec9c | minor fix for sidebar | 2012-09-12 02:14:50 +08:00 | 
				
					
						|  Harry Bomrah | 8a71bd530f | page added... | 2012-09-12 02:14:50 +08:00 | 
				
					
						|  Harry Bomrah | 8dd69a140f | frontend commits | 2012-09-12 02:12:15 +08:00 | 
				
					
						|  Harry Bomrah | 3749e919cb | front ends updates | 2012-09-12 02:12:15 +08:00 | 
				
					
						|  Harry Bomrah | a42a651f90 | frontend updates | 2012-09-12 02:08:02 +08:00 | 
				
					
						|  Harry Bomrah | 199839a42a | frontend update | 2012-09-12 02:08:02 +08:00 | 
				
					
						|  Harry Bomrah | 3fc07b9ff1 | one more modification | 2012-09-12 02:07:40 +08:00 | 
				
					
						|  Harry Bomrah | 2a66b89d33 | Modifications in ruby | 2012-09-12 02:07:40 +08:00 | 
				
					
						|  Harry Bomrah | 7ae1dcd8e0 | Calendar Module | 2012-09-12 02:06:22 +08:00 | 
				
					
						|  devin | a05fff98ac | front update | 2012-09-12 02:05:10 +08:00 | 
				
					
						|  devin | 4e662c744a | backend update | 2012-09-12 02:05:10 +08:00 | 
				
					
						|  Harry Bomrah | 97923a4d31 | resize thumbnails | 2012-09-12 02:05:10 +08:00 | 
				
					
						|  Harry Bomrah | 7903d2ae36 | ruby update for form and edit tagging | 2012-09-12 02:05:10 +08:00 | 
				
					
						|  devin | 789c2df7fd | gallery frontend update | 2012-09-12 02:05:10 +08:00 | 
				
					
						|  Harry Bomrah | 8259dee4a3 | Ruby update | 2012-09-12 02:05:10 +08:00 | 
				
					
						|  devin | cc6986cb16 | language fix | 2012-09-12 02:05:10 +08:00 | 
				
					
						|  devin | 0be494c62b | front end added | 2012-09-12 02:05:09 +08:00 | 
				
					
						|  Harry Bomrah | 6a23e29f33 | Ruby structure implementation | 2012-09-12 02:05:09 +08:00 | 
				
					
						|  Harry Bomrah | 26ff2af078 | View only update | 2012-09-12 02:04:36 +08:00 | 
				
					
						|  Harry Bomrah | f62eba182e | Commit for view only | 2012-09-12 02:04:36 +08:00 | 
				
					
						|  Harry Bomrah | f4dde67344 | frontend fixes | 2012-09-12 02:04:36 +08:00 | 
				
					
						|  Harry Bomrah | 8caa798c08 | frontend updates | 2012-09-12 02:04:36 +08:00 | 
				
					
						|  devin | 29c5126455 | gallery update | 2012-09-12 02:04:36 +08:00 | 
				
					
						|  devin | 4b6eebba7c | gallery update | 2012-09-12 02:04:08 +08:00 | 
				
					
						|  devin | b6f10951b8 | gallery update especially upload panel | 2012-09-12 02:04:07 +08:00 | 
				
					
						|  Harry Bomrah | 6e6d441b26 | code merged … ui updated | 2012-09-12 02:03:02 +08:00 | 
				
					
						|  devin | 2274df4111 | gallery update | 2012-09-12 02:02:29 +08:00 | 
				
					
						|  devin | 584d1eb0e0 | gallery update | 2012-09-12 02:02:01 +08:00 | 
				
					
						|  devin | ede9727a18 | gallery update | 2012-09-12 02:02:00 +08:00 | 
				
					
						|  devin | 0e5a305f39 | gallery update | 2012-09-12 01:58:23 +08:00 | 
				
					
						|  devin | 0c624794d5 | gallery update | 2012-09-12 01:58:23 +08:00 | 
				
					
						|  devin | 887b2d528d | gallery update especially upload panel | 2012-09-12 01:58:23 +08:00 | 
				
					
						|  Harry Bomrah | ad431b1d06 | Minor update | 2012-09-12 01:58:23 +08:00 | 
				
					
						|  Harry Bomrah | 91d45b64da | code merged … ui updated | 2012-09-12 01:58:23 +08:00 | 
				
					
						|  devin | 17c4b9a1bf | gallery update | 2012-09-12 01:58:22 +08:00 | 
				
					
						|  devin | 01eae75ad0 | gallery update | 2012-09-12 01:58:22 +08:00 | 
				
					
						|  devin | a2ed9e3350 | gallery update | 2012-09-12 01:58:22 +08:00 | 
				
					
						|  Christophe Vilayphiou | a579e16109 | Change rows for news textarea | 2012-09-11 16:41:35 +08:00 | 
				
					
						|  Christophe Vilayphiou | 73e48aebc6 | Change news subtitle to textarea, no tinymce | 2012-09-11 15:40:27 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | e486ac5d25 | complete visitor dashbroad | 2012-09-11 11:30:58 +08:00 | 
				
					
						|  Matt | 71021b8c69 | Changes for empty file and link in create and edit for news and announcement + partially fix tinymce | 2012-09-11 00:41:52 +08:00 | 
				
					
						|  Christophe Vilayphiou | b110b22daa | Change 熱門 to 頭版 for news | 2012-09-10 15:55:06 +08:00 | 
				
					
						|  Christophe Vilayphiou | 4dfe3e7b3b | Change 熱門 to 頭版 for news | 2012-09-10 15:19:29 +08:00 | 
				
					
						|  Harry Bomrah | 7bab8bf8ad | page added... | 2012-09-10 14:44:21 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | e12701b34b | preview for association  object | 2012-09-10 14:19:39 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | a20db344f1 | preview for update | 2012-09-10 11:53:59 +08:00 | 
				
					
						|  Fu Matthew | 6044857fea | complete preview for both new and announcement | 2012-09-07 17:55:59 +08:00 | 
				
					
						|  Harry Bomrah | 8295286c6e | frontend commits | 2012-09-05 19:08:48 +08:00 | 
				
					
						|  Harry Bomrah | b726c10857 | front ends updates | 2012-09-04 21:30:17 +08:00 | 
				
					
						|  Harry Bomrah | a080667615 | frontend updates | 2012-09-04 17:17:18 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 671f86b612 | First version of new preview. Only plain text | 2012-09-04 12:31:27 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | ae1595a008 | view for preview | 2012-09-04 09:24:12 +08:00 | 
				
					
						|  Harry Bomrah | 4a12c9d6fb | frontend update | 2012-09-03 21:49:35 +08:00 | 
				
					
						|  Harry Bomrah | 202d736a5d | one more modification | 2012-08-31 22:02:06 +08:00 | 
				
					
						|  Harry Bomrah | 4d6a9a8e87 | Modifications in ruby | 2012-08-31 22:01:19 +08:00 | 
				
					
						|  chris | dcdd730a01 | Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard Conflicts:
	app/assets/javascripts/bulletin_form.js.erb
	app/views/layouts/_side_bar.html.erb
	vendor/built_in_modules/archive/app/models/archive_file.rb
	vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb
	vendor/built_in_modules/page_content/app/controllers/panel/page_content/back_end/page_contexts_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb | 2012-08-31 14:31:54 +08:00 | 
				
					
						|  unknown | a1560ebcf5 | update archive | 2012-08-30 15:17:39 +08:00 | 
				
					
						|  unknown | bc5235aa9f | archive checkbox | 2012-08-30 14:49:31 +08:00 | 
				
					
						|  unknown | c739ab3984 | new archive | 2012-08-30 14:49:31 +08:00 | 
				
					
						|  unknown | 2a4c737cdd | archive checkbox | 2012-08-30 14:48:42 +08:00 | 
				
					
						|  unknown | eb7e73b393 | new archive | 2012-08-30 14:44:55 +08:00 | 
				
					
						|  unknown | c74ebb91b8 | archive checkbox | 2012-08-30 14:37:56 +08:00 | 
				
					
						|  unknown | 8a5519073b | new archive | 2012-08-30 14:32:32 +08:00 | 
				
					
						|  unknown | 10d9253399 | announcement edit to view file | 2012-08-30 14:25:51 +08:00 | 
				
					
						|  unknown | 29bcfa3139 | archive checkbox | 2012-08-30 14:19:51 +08:00 | 
				
					
						|  unknown | d5cc9961e3 | new archive | 2012-08-30 14:14:53 +08:00 | 
				
					
						|  Harry Bomrah | 9cd7aa81a6 | Calendar Module | 2012-08-29 20:13:41 +08:00 | 
				
					
						|  devin | 34764fb28d | front update | 2012-08-29 17:54:18 +08:00 | 
				
					
						|  devin | 43294b2f49 | backend update | 2012-08-29 17:48:29 +08:00 | 
				
					
						|  Harry Bomrah | 4fc196fb71 | resize thumbnails | 2012-08-29 17:36:12 +08:00 | 
				
					
						|  Harry Bomrah | a2da065ce6 | Merge branch 'gallery_orbit' into desktop_devin | 2012-08-29 17:19:04 +08:00 | 
				
					
						|  Harry Bomrah | 4e6703dae6 | ruby update for form and edit tagging | 2012-08-29 17:13:45 +08:00 | 
				
					
						|  devin | e17bc400f1 | gallery frontend update | 2012-08-29 17:12:20 +08:00 | 
				
					
						|  Harry Bomrah | a11d865dd1 | Ruby update | 2012-08-28 21:04:48 +08:00 | 
				
					
						|  Harry Bomrah | 833349bf6c | Merge branch 'gallery_orbit' into desktop_devin | 2012-08-28 15:45:20 +08:00 | 
				
					
						|  devin | 86535874f7 | language fix | 2012-08-28 15:38:35 +08:00 | 
				
					
						|  devin | d2733bde28 | front end added | 2012-08-28 15:23:55 +08:00 | 
				
					
						|  Harry Bomrah | 62abbf9417 | Ruby structure implementation | 2012-08-27 23:36:56 +08:00 | 
				
					
						|  Harry Bomrah | 99096c4ac0 | View only update | 2012-08-23 21:30:37 +08:00 | 
				
					
						|  Harry Bomrah | 33bc430df5 | Commit for view only | 2012-08-23 19:25:56 +08:00 | 
				
					
						|  Harry Bomrah | 861f521da3 | Merge branch 'gallery_orbit' into desktop_devin | 2012-08-23 17:15:03 +08:00 | 
				
					
						|  Harry Bomrah | e2c16e1931 | frontend fixes | 2012-08-23 17:13:33 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | e4cc80248d | Merge branch 'demo_site' of github.com:Rulingcom/orbit into visitor_dsahbroad Conflicts:
	config/mongoid.yml | 2012-08-23 16:08:17 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 01d278d688 | guest user | 2012-08-23 16:05:14 +08:00 | 
				
					
						|  Harry Bomrah | 4d9244005a | Code merge | 2012-08-23 01:40:55 +08:00 | 
				
					
						|  Harry Bomrah | 1e4d534908 | frontend updates | 2012-08-23 01:36:56 +08:00 | 
				
					
						|  devin | 93da8520ed | gallery update | 2012-08-23 01:36:56 +08:00 | 
				
					
						|  devin | 9430f66bee | gallery update | 2012-08-23 01:36:56 +08:00 | 
				
					
						|  devin | 1a4097d1c0 | gallery update especially upload panel | 2012-08-23 01:36:56 +08:00 | 
				
					
						|  Harry Bomrah | 4fe4dc35de | Minor update | 2012-08-23 01:36:55 +08:00 | 
				
					
						|  Harry Bomrah | 0799fb4f87 | code merged … ui updated | 2012-08-23 01:36:55 +08:00 | 
				
					
						|  devin | d6b24c6454 | gallery update | 2012-08-23 01:36:55 +08:00 | 
				
					
						|  devin | a732910f35 | gallery update | 2012-08-23 01:36:55 +08:00 | 
				
					
						|  devin | 7b42adc9a0 | gallery update | 2012-08-23 01:36:55 +08:00 | 
				
					
						|  chris | 7d5531bf01 | Merge branch 'nccu_master' into demo_site Conflicts:
	Gemfile
	app/assets/javascripts/tinymce_orbit.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/admin/assets_controller.rb
	app/controllers/admin/module_apps_new_interface_controller.rb
	app/controllers/admin/page_parts_controller.rb
	app/jobs/sync_db.rb
	app/models/page.rb
	app/models/page_part.rb
	app/models/user/user.rb
	app/uploaders/image_uploader.rb
	app/views/admin/assets/create.js.erb
	app/views/admin/module_apps/reload_frontend_pages.js.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	app/views/layouts/_users_checkbox_ary.html.erb
	app/views/shared/_privilege_user.html.erb
	config/mongoid.yml
	lib/parsers/parser_common.rb
	vendor/built_in_modules/announcement/announcement.json
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb | 2012-08-22 18:07:49 +08:00 | 
				
					
						|  devin | 75b6c447fc | gallery update | 2012-08-22 16:46:37 +08:00 | 
				
					
						|  devin | e8a0015365 | gallery update | 2012-08-22 15:59:06 +08:00 | 
				
					
						|  devin | 1437d2dc14 | gallery update especially upload panel | 2012-08-22 01:15:50 +08:00 | 
				
					
						|  Harry Bomrah | 4a53e5faea | Minor update | 2012-08-21 20:26:07 +08:00 | 
				
					
						|  Harry Bomrah | 16b1e97685 | code merged … ui updated | 2012-08-21 20:15:17 +08:00 | 
				
					
						|  devin | 0ad0ea9acf | gallery update | 2012-08-21 16:32:55 +08:00 | 
				
					
						|  devin | cbef7cd368 | gallery update | 2012-08-21 14:31:25 +08:00 | 
				
					
						|  devin | 1a6ecf4d0f | gallery update | 2012-08-21 13:56:50 +08:00 | 
				
					
						|  chris | 68aed18956 | Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit Conflicts:
	app/views/layouts/_side_bar.html.erb
	config/mongoid.yml
	vendor/built_in_modules/gallery/app/assets/javascripts/galleryAPI.js.erb
	vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css | 2012-08-20 23:24:41 +08:00 | 
				
					
						|  Harry Bomrah | 3d607cfca4 | updates for tagging and language fix | 2012-08-20 23:20:20 +08:00 | 
				
					
						|  Harry Bomrah | 2c0058e8c9 | authorization | 2012-08-20 23:18:50 +08:00 | 
				
					
						|  devin | 489231166f | gallery update | 2012-08-20 23:17:32 +08:00 | 
				
					
						|  devin | 1731c4bcf7 | gallery update add "tag panel", not complete | 2012-08-20 23:17:32 +08:00 | 
				
					
						|  devin | 4beedb1aa4 | gallery update | 2012-08-20 23:17:31 +08:00 | 
				
					
						|  devin | 0dd1c6eb51 | encoding fixed Maybe there are some "chinese" in galleryAPI.js.erb and Ruby treat them
all US-ASCII, so everything crash.
see this post
"http://stackoverflow.com/questions/7761540/encoding-issues-in-javascrip
t-files-using-rails-asset-pipeline" | 2012-08-20 23:16:54 +08:00 | 
				
					
						|  Harry Bomrah | 263cf130e2 | tp | 2012-08-20 23:16:54 +08:00 | 
				
					
						|  Harry Bomrah | aef1bfaba3 | Button fixes | 2012-08-20 23:16:54 +08:00 | 
				
					
						|  Harry Bomrah | 69304fda43 | UI modifications | 2012-08-20 23:16:06 +08:00 | 
				
					
						|  devin | abd1a9ecbc | gallery update | 2012-08-20 23:14:11 +08:00 | 
				
					
						|  devin | 8a9e724979 | gallery update | 2012-08-20 23:14:11 +08:00 | 
				
					
						|  Harry Bomrah | 1ba87982ba | Multi language and side bar update | 2012-08-20 23:14:11 +08:00 | 
				
					
						|  devin | e27c1b0175 | gallery update | 2012-08-20 23:14:11 +08:00 | 
				
					
						|  Harry Bomrah | 587595f815 | gallery translation supported | 2012-08-20 23:14:11 +08:00 | 
				
					
						|  Harry Bomrah | 314af3c16f | Major updates for gallery | 2012-08-20 23:14:11 +08:00 | 
				
					
						|  Harry Bomrah | 0333f97bf3 | Gallery update.. | 2012-08-20 23:14:10 +08:00 | 
				
					
						|  Harry Bomrah | 797c9e57b8 | Gallery update | 2012-08-20 23:14:10 +08:00 | 
				
					
						|  Harry Bomrah | 1daf405b3d | Gallery started. | 2012-08-20 23:14:10 +08:00 | 
				
					
						|  Harry Bomrah | 9f3d22360e | gallery module update | 2012-08-20 23:11:32 +08:00 | 
				
					
						|  Harry Bomrah | 6e90196b77 | updates for tagging and language fix | 2012-08-20 22:00:57 +08:00 | 
				
					
						|  unknown | 23a3a7eff6 | update archive | 2012-08-20 17:14:13 +08:00 | 
				
					
						|  chris | edf9d8a159 | Fix can_display | 2012-08-16 18:55:34 +08:00 | 
				
					
						|  chris | 3c283d1a7a | Set default picture Fix tags where not in params for index fronted (news and announcement)
Change backend index for news
Home banner link for images and main title | 2012-08-16 17:24:12 +08:00 | 
				
					
						|  Christophe Vilayphiou | 96fd89cca3 | Fix js for ie in list | 2012-08-16 01:09:45 +08:00 | 
				
					
						|  Christophe Vilayphiou | c5b95e2e0f | Fix rss feed i18n | 2012-08-15 16:17:28 +08:00 | 
				
					
						|  Christophe Vilayphiou | 43bc704468 | Error popup only shows on flash[:error] | 2012-08-15 15:55:29 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | d9f6bb3b4e | can display scope | 2012-08-15 11:34:19 +08:00 | 
				
					
						|  Christophe Vilayphiou | bcc13a47e6 | Fix deadline was set to nil when update | 2012-08-14 16:23:34 +08:00 | 
				
					
						|  Christophe Vilayphiou | efaed060d9 | Change for date | 2012-08-14 15:11:52 +08:00 | 
				
					
						|  Christophe Vilayphiou | fb53ad524a | Add time to announcement quick edit Fix picture for news quick edit
Fix tags not saving when empty
Hide role in quick edit | 2012-08-14 14:38:21 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 77224bcc8f | check deadline for news | 2012-08-14 13:49:24 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | e57b429398 | Merge branch 'master' of github.com:Rulingcom/NCCU | 2012-08-14 13:13:25 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 5bb4aa95ee | fix for dept | 2012-08-14 13:13:06 +08:00 | 
				
					
						|  Christophe Vilayphiou | 9196deb997 | Merge branch 'master' of github.com:Rulingcom/NCCU | 2012-08-14 01:00:25 +08:00 | 
				
					
						|  Christophe Vilayphiou | c32b0dd4b4 | Move delete checkboxes to js | 2012-08-14 00:59:01 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 83569fac82 | Merge branch 'master' of github.com:Rulingcom/NCCU | 2012-08-13 18:36:04 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 6cc470ede9 | nccu fix | 2012-08-13 18:35:47 +08:00 | 
				
					
						|  Harry Bomrah | e86d5ab338 | tagging | 2012-08-13 16:43:23 +08:00 | 
				
					
						|  Harry Bomrah | 4d676d9ee9 | Merge | 2012-08-13 16:17:23 +08:00 | 
				
					
						|  Christophe Vilayphiou | c2f3f45196 | Fix for link in nccu widget | 2012-08-13 11:34:14 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 080974b563 | Merge branch 'new_rss' Conflicts:
	vendor/built_in_modules/announcement/app/models/bulletin.rb | 2012-08-12 23:32:28 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | f1b4d9e204 | Add authorization for rescue interface Change logic for NCCU site for status panel. | 2012-08-12 23:29:13 +08:00 | 
				
					
						|  Christophe Vilayphiou | 33fc96ac7c | Changes for NCCU after email | 2012-08-11 18:19:30 +08:00 | 
				
					
						|  Harry Bomrah | 34e4928ee1 | authorization | 2012-08-11 17:28:49 +08:00 | 
				
					
						|  devin | 7fb6a1e86b | gallery update | 2012-08-11 01:32:53 +08:00 | 
				
					
						|  unknown | 9333503545 | demo_site widget edit | 2012-08-10 15:33:28 +08:00 | 
				
					
						|  Christophe Vilayphiou | bebb8a1c1e | Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard Conflicts:
	app/views/layouts/_side_bar.html.erb
	vendor/built_in_modules/archive/app/models/archive_file.rb
	vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb | 2012-08-10 15:30:33 +08:00 | 
				
					
						|  unknown | d8b0613147 | archive checkbox | 2012-08-10 15:26:34 +08:00 | 
				
					
						|  unknown | d5cc470e5d | new archive | 2012-08-10 15:23:56 +08:00 | 
				
					
						|  unknown | cdb8d6c755 | announcement edit to view file | 2012-08-10 15:20:17 +08:00 | 
				
					
						|  unknown | 81fa2a7428 | archive checkbox | 2012-08-10 15:19:45 +08:00 | 
				
					
						|  unknown | 2dd2abc8d2 | new archive | 2012-08-10 15:17:16 +08:00 | 
				
					
						|  unknown | e8cea9f0ab | new archive | 2012-08-10 15:14:43 +08:00 | 
				
					
						|  Christophe Vilayphiou | 2bd132cef9 | Pass category and tag to search to redirect to the right page Ray's change for mouseover (take out the black background) | 2012-08-09 19:16:26 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 6059edad70 | Merge branch 'new_rss' of github.com:Rulingcom/NCCU into new_rss | 2012-08-09 18:36:31 +08:00 |