saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
orbit-basic/app/models
History
chris 65ac6980c4 Merge branch 'various_bugs' into nccu_master 
Conflicts:
	Gemfile.lock
	app/assets/javascripts/ajax_form.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/application_controller.rb
	app/controllers/sessions_controller.rb
	app/helpers/admin/web_link_helper.rb
	app/views/admin/attributes/_attribute_field.html.erb
	app/views/admin/designs/_form.html.erb
	app/views/admin/pages/_form.html.erb
	app/views/admin/sites/_side_bar.html.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	config/locales/en.yml
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
	vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
 		2012-10-29 16:10:07 +08:00
..
design Edit uploaded package 2012-10-26 11:19:57 +08:00
meta Remove i18n_variable for controllers, helpers and models 2012-07-27 19:13:39 +08:00
purchase Merge with sub_roles 2011-12-23 18:34:21 +08:00
user Fix bug: User cannot connect using the orbit button (Devise configuration) 2012-10-26 17:42:14 +08:00
.user.rb.swp adding files not commited from previous commit 2011-07-12 16:02:41 +08:00
ad_banner.rb Search sold edition,rake sunspot:solr:run. NewsBulletin.solr_search,NewsBulletin.solr_reindex. Not working 2012-06-20 14:50:51 +08:00
ad_image.rb Fix for banner link 2012-08-13 11:03:11 +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 fix object auth without app_auth 2012-10-16 14:23:44 +08:00
asset.rb Add time to announcement quick edit 2012-08-14 14:38:21 +08:00
asset_category.rb Remove i18n_variable for controllers, helpers and models 2012-07-27 19:13:39 +08:00
asset_tag.rb Add tags to assets 2012-05-16 18:19:41 +08:00
component.rb - No more Home object 2011-05-09 18:49:57 +08:00
desktop.rb very important update for widgets management.. 2012-05-11 15:27:16 +08:00
desktop_theme.rb Themes from db fixed.. 2012-04-23 21:04:02 +08:00
desktop_widget.rb very important update for widgets management.. 2012-05-11 15:27:16 +08:00
group.rb Fetching desktop from db 2012-04-11 15:31:10 +08:00
i18n_variable.rb working cache 2012-07-13 15:36:10 +08:00
item.rb 1.Remove category column when category is specified 2012-08-08 14:46:08 +08:00
journal.rb Timeline ajax load fixed… a bit change in structure.. 2012-07-03 19:45:47 +08:00
link.rb Put inc/ajax_setting in new_admin 2012-05-22 16:11:00 +08:00
module_app.rb Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00
object_auth.rb fix object auth without app_auth 2012-10-16 14:23:44 +08:00
other_account.rb auto login encryption done… 2012-04-30 14:29:42 +08:00
page.rb Fix page_part creation when design is changed 2012-10-26 11:19:56 +08:00
page_part.rb Merge branch 'nccu_master' into demo_site 2012-08-22 18:07:49 +08:00
paper.rb design update 2012-09-12 01:58:23 +08:00
preview.rb preview for association object 2012-09-10 14:19:39 +08:00
preview_association.rb add missing file 2012-09-10 14:23:45 +08:00
preview_file.rb complete preview for both new and announcement 2012-09-07 17:55:59 +08:00
proto_tag.rb basic function 2012-09-17 13:32:52 +08:00
prototype_auth.rb fix bugs with token 2012-02-29 18:56:42 +08:00
section.rb Dock change and getting values from db 2012-04-06 17:49:22 +08:00
session.rb Replace PrototypeR4 by Orbit. 2012-03-16 14:58:32 +08:00
site.rb guest user 2012-09-12 16:20:15 +08:00
sub_role_tag.rb basic function 2012-09-17 13:32:52 +08:00
tag.rb basic function 2012-09-17 13:32:52 +08:00
tile.rb Fetching desktop from db 2012-04-11 15:31:10 +08:00