developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
This repository has been archived on 2024-03-16. You can view files and clone it, but cannot push or open issues or pull requests.
orbit-4-1/app/models
History
Matthew K. Fu JuYuan f55b3a4374 Merge branch 'master' of https://github.com/Rulingcom/orbit into ldap 
Conflicts:
	Gemfile
	Gemfile.lock
	app/views/admin/attributes/_app_selector.html.erb
	app/views/admin/module_apps/_app_selector.html.erb
	app/views/admin/pages/_app_selector.html.erb
	config/application.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb
	vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
 		2012-04-19 14:06:00 +08:00
..
design Fix bugs in upload design and missing menu 2012-04-06 17:37:45 +08:00
meta Clean the parsers and introduce the metas 2012-03-21 18:30:12 +08:00
purchase Merge with sub_roles 2011-12-23 18:34:21 +08:00
user Merge branch 'design_team' into ldap for NCCU 0229 demo on Redmine 2012-02-29 13:07:21 +08:00
.user.rb.swp adding files not commited from previous commit 2011-07-12 16:02:41 +08:00
ad_banner.rb The new AdBanner. 2012-04-02 03:04:38 +08:00
ad_image.rb The new AdBanner. 2012-04-02 03:04:38 +08:00
app_auth.rb First version for App and Object auth.Taking Announcement as experiment 2012-02-29 18:55:55 +08:00
app_manager.rb Manger and SubManager 2012-01-24 12:28:32 +08:00
asset.rb include Mongoid::Timestamps 2011-04-13 18:22:52 +08:00
component.rb - No more Home object 2011-05-09 18:49:57 +08:00
i18n_variable.rb Fix relations error in tags 2012-02-15 11:42:19 +08:00
item.rb Improve code in items, pages, links 2012-02-17 14:54:11 +08:00
link.rb Chris's first commit at Fri Jan 28 2011 10:14:32 GMT+0800 (CST) 2011-04-13 18:19:51 +08:00
meta.rb Trying nokogiri 2012-03-27 18:42:22 +08:00
module_app.rb fix bugs with token 2012-02-29 18:56:42 +08:00
object_auth.rb Fact check program completed,Lin checked 2012-03-27 18:54:03 +08:00
page.rb Fix several bus when there is no design 2012-04-02 02:41:42 +08:00
page_part.rb Changes into page_part edition. 2012-02-16 13:09:09 +08:00
prototype_auth.rb fix bugs with token 2012-02-29 18:56:42 +08:00
session.rb Replace PrototypeR4 by Orbit. 2012-03-16 14:58:32 +08:00
site.rb Clean the parsers and introduce the metas 2012-03-21 18:30:12 +08:00
tag.rb Fix relations error in tags 2012-02-15 11:42:19 +08:00