70b4c83cf5 
								
							 
						 
						
							
							
								
								Fix bugs and changes for nccu  
							
							
							
						 
						
							2012-02-24 19:11:51 +08:00  
				
					
						
							
							
								 
						
							
								f4d663c67d 
								
							 
						 
						
							
							
								
								Temporary changes for announcement form  
							
							
							
						 
						
							2012-02-24 15:35:21 +08:00  
				
					
						
							
							
								 
						
							
								dcc64a20d2 
								
							 
						 
						
							
							
								
								Finish sorting for announcements  
							
							
							
						 
						
							2012-02-24 15:30:49 +08:00  
				
					
						
							
							
								 
						
							
								f8d1d7242d 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into dashboard  
							
							
							
						 
						
							2012-02-23 16:05:33 +08:00  
				
					
						
							
							
								 
						
							
								1a6e497b3d 
								
							 
						 
						
							
							
								
								Ika's changes  
							
							
							
						 
						
							2012-02-23 15:53:15 +08:00  
				
					
						
							
							
								 
						
							
								63d7810b35 
								
							 
						 
						
							
							
								
								Add isotope, categories for announcement page, sort for announcement  
							
							
							
						 
						
							2012-02-23 15:52:58 +08:00  
				
					
						
							
							
								 
						
							
								53ed4b0404 
								
							 
						 
						
							
							
								
								Initial changes in announcement for sorting and filtering  
							
							
							
						 
						
							2012-02-23 15:51:33 +08:00  
				
					
						
							
							
								 
						
							
								ba4d71a026 
								
							 
						 
						
							
							
								
								Changes in orbit_bar and js in announcements  
							
							
							
						 
						
							2012-02-23 15:51:33 +08:00  
				
					
						
							
							
								 
						
							
								48d94d5e15 
								
							 
						 
						
							
							
								
								Fix bug widget when no bulletins or web_links, put link in bulletins  
							
							
							
						 
						
							2012-02-23 15:50:30 +08:00  
				
					
						
							
							
								 
						
							
								ad27537cf7 
								
							 
						 
						
							
							
								
								Change pagination in bulletins  
							
							
							
						 
						
							2012-02-23 15:50:30 +08:00  
				
					
						
							
							
								 
						
							
								20c320961f 
								
							 
						 
						
							
							
								
								edit page_content  
							
							
							
						 
						
							2012-02-23 15:13:36 +08:00  
				
					
						
							
							
								 
						
							
								9b001aa6c3 
								
							 
						 
						
							
							
								
								new page_content app  
							
							
							
						 
						
							2012-02-21 19:22:42 +08:00  
				
					
						
							
							
								 
						
							
								b0834c0c62 
								
							 
						 
						
							
							
								
								Merge branch 'new_announcement_dev' of  https://github.com/Rulingcom/orbit  into new_announcement_dev  
							
							... 
							
							
							
							Conflicts:
	app/views/layouts/module_widget.html.erb 
							
						 
						
							2012-02-20 16:25:29 +08:00  
				
					
						
							
							
								 
						
							
								e82fd405c9 
								
							 
						 
						
							
							
								
								remove bulletins_list  
							
							
							
						 
						
							2012-02-20 16:23:54 +08:00  
				
					
						
							
							
								 
						
							
								1146506063 
								
							 
						 
						
							
							
								
								Fix bug when no bulletins or web_links  
							
							
							
						 
						
							2012-02-20 15:56:17 +08:00  
				
					
						
							
							
								 
						
							
								cf038183b9 
								
							 
						 
						
							
							
								
								Ika's changes in modules  
							
							
							
						 
						
							2012-02-20 08:48:27 +08:00  
				
					
						
							
							
								 
						
							
								7d57b50e46 
								
							 
						 
						
							
							
								
								Widget for announcement and web_link with ajax reload and pagination  
							
							
							
						 
						
							2012-02-20 08:34:36 +08:00  
				
					
						
							
							
								 
						
							
								78a139ff38 
								
							 
						 
						
							
							
								
								update announcement & web_resource widget  
							
							
							
						 
						
							2012-02-20 03:24:47 +08:00  
				
					
						
							
							
								 
						
							
								a3f152b200 
								
							 
						 
						
							
							
								
								Changes for jquery 1.7 (.live -> .on), create module_layout  
							
							
							
						 
						
							2012-02-20 03:24:05 +08:00  
				
					
						
							
							
								 
						
							
								26cd6951db 
								
							 
						 
						
							
							
								
								change view and action for announcement ,Lin checked.  Also add validation for object_auth make sure for each object,the object will be unique for each action.  
							
							
							
						 
						
							2012-02-17 17:50:23 +08:00  
				
					
						
							
							
								 
						
							
								5da75161c4 
								
							 
						 
						
							
							
								
								announcemenet & web_resource widget  
							
							
							
						 
						
							2012-02-16 17:52:49 +08:00  
				
					
						
							
							
								 
						
							
								d2689bc59c 
								
							 
						 
						
							
							
								
								fix bugs with token  
							
							
							
						 
						
							2012-02-16 13:57:28 +08:00  
				
					
						
							
							
								 
						
							
								e0accbecaa 
								
							 
						 
						
							
							
								
								Changes into page_part edition.  
							
							... 
							
							
							
							Can choose between 'text', 'public_r_tag' and 'widget' 
							
						 
						
							2012-02-16 13:09:09 +08:00  
				
					
						
							
							
								 
						
							
								7ea1745f73 
								
							 
						 
						
							
							
								
								items error  
							
							
							
						 
						
							2012-02-16 11:30:54 +08:00  
				
					
						
							
							
								 
						
							
								5640e07733 
								
							 
						 
						
							
							
								
								First version for App and Object auth.Taking Announcement as experiment  
							
							
							
						 
						
							2012-02-15 18:20:44 +08:00  
				
					
						
							
							
								 
						
							
								4d361857cb 
								
							 
						 
						
							
							
								
								Fix tags in web_resource  
							
							
							
						 
						
							2012-02-15 15:47:05 +08:00  
				
					
						
							
							
								 
						
							
								edf236c1c7 
								
							 
						 
						
							
							
								
								edit tags  
							
							
							
						 
						
							2012-02-15 15:38:27 +08:00  
				
					
						
							
							
								 
						
							
								af3a2547e1 
								
							 
						 
						
							
							
								
								Change ModuleAppTag into "Module name"Tag.  
							
							
							
						 
						
							2012-02-15 15:18:11 +08:00  
				
					
						
							
							
								 
						
							
								d0c2856a3a 
								
							 
						 
						
							
							
								
								Fix relations error in tags  
							
							
							
						 
						
							2012-02-15 11:42:19 +08:00  
				
					
						
							
							
								 
						
							
								778a85ca2b 
								
							 
						 
						
							
							
								
								add tags  
							
							
							
						 
						
							2012-02-15 10:37:07 +08:00  
				
					
						
							
							
								 
						
							
								1913f0aca8 
								
							 
						 
						
							
							
								
								Add tinymce  
							
							
							
						 
						
							2012-02-15 10:02:05 +08:00  
				
					
						
							
							
								 
						
							
								3e70634add 
								
							 
						 
						
							
							
								
								Announcement modifications and tags  
							
							
							
						 
						
							2012-02-15 00:34:22 +08:00  
				
					
						
							
							
								 
						
							
								f57e9f19f7 
								
							 
						 
						
							
							
								
								Changes for multiple i18n_variable in bulletin  
							
							
							
						 
						
							2012-02-15 00:34:22 +08:00  
				
					
						
							
							
								 
						
							
								1f7dae9bee 
								
							 
						 
						
							
							
								
								Gemfile and bugs in js for orbit-bar  
							
							
							
						 
						
							2012-02-15 00:34:22 +08:00  
				
					
						
							
							
								 
						
							
								55ae7de01c 
								
							 
						 
						
							
							
								
								Orbit-bar in front-end and back-end, side-bar and drop-down menu  
							
							
							
						 
						
							2012-02-15 00:34:22 +08:00  
				
					
						
							
							
								 
						
							
								436f039c1b 
								
							 
						 
						
							
							
								
								build interface to work with object auth. Go to panel/new_blog/back_end/posts/   ,click New Auth link  
							
							
							
						 
						
							2012-02-15 00:34:21 +08:00  
				
					
						
							
							
								 
						
							
								e20739e32b 
								
							 
						 
						
							
							
								
								Object Auth. Now object can be included with "include OrbitCoreLib::ObjectAuthable" to use kernel method,such as  
							
							... 
							
							
							
							1.Object.authed_for_user(user,title_of_object_auth).  title_of_object_auth is optional
2.object.authed_users(user,title_of_object_auth) .  title_of_object_auth is optional
if title_of_object_auth is not given,then it will return calculation across all possiblity. 
							
						 
						
							2012-02-15 00:34:21 +08:00  
				
					
						
							
							
								 
						
							
								3ed9b81df9 
								
							 
						 
						
							
							
								
								first commit for object auth,will take new_blog for experiment  
							
							
							
						 
						
							2012-02-15 00:34:21 +08:00  
				
					
						
							
							
								 
						
							
								17caa7cb1b 
								
							 
						 
						
							
							
								
								Exp with object_auth  
							
							
							
						 
						
							2012-02-13 17:33:48 +08:00  
				
					
						
							
							
								 
						
							
								70c97bc065 
								
							 
						 
						
							
							
								
								edit announcement widget  
							
							
							
						 
						
							2012-02-13 17:09:38 +08:00  
				
					
						
							
							
								 
						
							
								088bbe1853 
								
							 
						 
						
							
							
								
								Change announcement route  
							
							
							
						 
						
							2012-02-13 17:09:37 +08:00  
				
					
						
							
							
								 
						
							
								964d7b6054 
								
							 
						 
						
							
							
								
								announcement path error  
							
							
							
						 
						
							2012-02-13 17:09:37 +08:00  
				
					
						
							
							
								 
						
							
								c88e1c8419 
								
							 
						 
						
							
							
								
								Merge branch 'obj_auth' into announcement_dev_view_and_auth  
							
							
							
						 
						
							2012-02-12 23:24:50 +08:00  
				
					
						
							
							
								 
						
							
								32159564cd 
								
							 
						 
						
							
							
								
								build interface to work with object auth. Go to panel/new_blog/back_end/posts/   ,click New Auth link  
							
							
							
						 
						
							2012-02-09 19:04:06 +08:00  
				
					
						
							
							
								 
						
							
								31d7cd5b38 
								
							 
						 
						
							
							
								
								Object Auth. Now object can be included with "include OrbitCoreLib::ObjectAuthable" to use kernel method,such as  
							
							... 
							
							
							
							1.Object.authed_for_user(user,title_of_object_auth).  title_of_object_auth is optional
2.object.authed_users(user,title_of_object_auth) .  title_of_object_auth is optional
if title_of_object_auth is not given,then it will return calculation across all possiblity. 
							
						 
						
							2012-02-09 17:48:51 +08:00  
				
					
						
							
							
								 
						
							
								e638c1c7c3 
								
							 
						 
						
							
							
								
								Change announcement route  
							
							
							
						 
						
							2012-02-09 15:07:43 +08:00  
				
					
						
							
							
								 
						
							
								338d18e909 
								
							 
						 
						
							
							
								
								announcement path error  
							
							
							
						 
						
							2012-02-09 14:58:59 +08:00  
				
					
						
							
							
								 
						
							
								3a8dbd6af4 
								
							 
						 
						
							
							
								
								first commit for object auth,will take new_blog for experiment  
							
							
							
						 
						
							2012-02-07 16:16:48 +08:00  
				
					
						
							
							
								 
						
							
								8f885e8bb7 
								
							 
						 
						
							
							
								
								Use key not title for module_app in parser.  
							
							... 
							
							
							
							Modify announcement routes. 
							
						 
						
							2012-02-06 16:58:19 +08:00  
				
					
						
							
							
								 
						
							
								f097f83f2b 
								
							 
						 
						
							
							
								
								announcement_category edit  
							
							
							
						 
						
							2012-02-06 16:20:51 +08:00  
				
					
						
							
							
								 
						
							
								3287b68354 
								
							 
						 
						
							
							
								
								Basic function for ad_banner  
							
							
							
						 
						
							2012-02-01 14:27:51 +08:00  
				
					
						
							
							
								 
						
							
								762c2f5e8a 
								
							 
						 
						
							
							
								
								Add key in module_app.rb to use instead of title for authorization  
							
							
							
						 
						
							2012-01-30 18:12:18 +08:00  
				
					
						
							
							
								 
						
							
								783eae4597 
								
							 
						 
						
							
							
								
								Change "NewBlog" folders into "new_blog" in assets  
							
							... 
							
							
							
							Modify routes and pages handling for clean front-end urls 
							
						 
						
							2012-01-24 18:16:58 +08:00  
				
					
						
							
							
								 
						
							
								959f3e8b2f 
								
							 
						 
						
							
							
								
								put setup APP var setup into Orbit class  
							
							
							
						 
						
							2012-01-24 12:28:32 +08:00  
				
					
						
							
							
								 
						
							
								68ad208777 
								
							 
						 
						
							
							
								
								announcement widget page  
							
							
							
						 
						
							2012-01-20 16:36:25 +08:00  
				
					
						
							
							
								 
						
							
								2c8940e350 
								
							 
						 
						
							
							
								
								announcement widget page  
							
							
							
						 
						
							2012-01-20 14:04:52 +08:00  
				
					
						
							
							
								 
						
							
								4cfae9c107 
								
							 
						 
						
							
							
								
								announcement widget query  
							
							
							
						 
						
							2012-01-18 21:34:26 +08:00  
				
					
						
							
							
								 
						
							
								3e912b6262 
								
							 
						 
						
							
							
								
								Merge branches 'master' and 'exception_notification' into new_announcement_dev  
							
							
							
						 
						
							2012-01-16 07:57:40 +08:00  
				
					
						
							
							
								 
						
							
								7e7fc69a37 
								
							 
						 
						
							
							
								
								add announcemet search & set top  
							
							
							
						 
						
							2012-01-13 19:15:03 +08:00  
				
					
						
							
							
								 
						
							
								4b838b5ef5 
								
							 
						 
						
							
							
								
								edit announcement upload & show  
							
							
							
						 
						
							2012-01-12 18:38:50 +08:00  
				
					
						
							
							
								 
						
							
								ec235bcaa3 
								
							 
						 
						
							
							
								
								merge with master  
							
							
							
						 
						
							2012-01-11 20:31:52 +08:00  
				
					
						
							
							
								 
						
							
								3d9fd359ed 
								
							 
						 
						
							
							
								
								Moving Orbit frontend and widget controller to controllers folder  
							
							
							
						 
						
							2012-01-10 18:30:08 +08:00  
				
					
						
							
							
								 
						
							
								cae3daa9c4 
								
							 
						 
						
							
							
								
								Change NewBlog to new_blog  
							
							
							
						 
						
							2012-01-10 18:29:11 +08:00  
				
					
						
							
							
								 
						
							
								79f778ad8c 
								
							 
						 
						
							
							
								
								creating for disabling widgets and frontend  
							
							
							
						 
						
							2012-01-05 16:21:33 +08:00  
				
					
						
							
							
								 
						
							
								7b40706aed 
								
							 
						 
						
							
							
								
								fixing for app_auth  
							
							
							
						 
						
							2012-01-05 16:20:51 +08:00  
				
					
						
							
							
								 
						
							
								62aaf79491 
								
							 
						 
						
							
							
								
								Merge with sub_roles  
							
							
							
						 
						
							2011-12-23 18:34:21 +08:00  
				
					
						
							
							
								 
						
							
								d465febca7 
								
							 
						 
						
							
							
								
								merge with november_presentation  
							
							
							
						 
						
							2011-12-22 15:43:38 +08:00  
				
					
						
							
							
								 
						
							
								e7c9816139 
								
							 
						 
						
							
							
								
								Move NewBlog to built_in_modules and delete "vendor/templates"  
							
							
							
						 
						
							2011-12-22 01:38:27 +08:00  
				
					
						
							
							
								 
						
							
								a09f8e4551 
								
							 
						 
						
							
							
								
								merge with november_presentation  
							
							
							
						 
						
							2011-12-20 16:47:17 +08:00  
				
					
						
							
							
								 
						
							
								1909edbe2a 
								
							 
						 
						
							
							
								
								Simplification of the 'link_back' code  
							
							
							
						 
						
							2011-04-19 15:05:48 +08:00  
				
					
						
							
							
								 
						
							
								106db069fd 
								
							 
						 
						
							
							
								
								update radius, modify routes to handle modules, add blog module  
							
							
							
						 
						
							2011-04-13 18:28:24 +08:00