developers/orbit-basic
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
b5571dbc438d8f818c1f4ff9e6fb3befeb29ea7c
orbit-basic/app/views/admin
T
History
Matthew K. Fu JuYuan b5571dbc43 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member 
Conflicts:
	app/controllers/admin/users_new_interface_controller.rb
	app/views/admin/users_new_interface/show.html.erb
2012-10-12 18:17:05 +08:00
..
ad_banners
Remove i18n_variable for views
2012-07-27 19:13:39 +08:00
ad_images
Remove i18n_variable for views
2012-07-27 19:13:39 +08:00
app_auths
Listing for Module-apps
2012-01-12 14:13:41 +08:00
asset_categories
Remove i18n_variable for views
2012-07-27 19:13:39 +08:00
assets
fix commit bugs
2012-09-13 15:53:36 +08:00
attributes
new code for attribute fields and values for new member interface
2012-10-12 18:09:02 +08:00
components
Integrate App & Object Auth to announcement with i18n variables. Also changed Role and SubRole i18n var. Checked with Allen
2012-04-30 00:24:11 +08:00
dashboards
Ray's changes for new backend
2012-09-14 02:38:56 +08:00
designs
Fix js for ie in list
2012-08-16 01:09:45 +08:00
infos
Remove i18n_variable for views
2012-07-27 19:13:39 +08:00
items
Fix .class to .class.to_s
2012-07-30 18:34:54 +08:00
links
Remove i18n_variable for views
2012-07-27 19:13:39 +08:00
module_apps
Merge branch 'nccu_master' into demo_site
2012-08-22 18:07:49 +08:00
module_apps_new_interface
Clean up code , cache other auths. Fix sidebar
2012-05-29 17:17:26 +08:00
object_auths
Integrate App & Object Auth to announcement with i18n variables. Also changed Role and SubRole i18n var. Checked with Allen
2012-04-30 00:24:11 +08:00
object_auths_new_interface
Clean up code , cache other auths. Fix sidebar
2012-05-29 17:17:26 +08:00
page_parts
update archive
2012-08-30 15:17:39 +08:00
pages
Merge branch 'nccu_master' into demo_site
2012-08-22 18:07:49 +08:00
plugins
demo site plugin
2012-09-24 14:10:44 +08:00
purchases
Ray's back_end modification before sub_roles
2011-12-23 18:02:45 +08:00
roles
Remove i18n_variable for views
2012-07-27 19:13:39 +08:00
sites
Merge branch 'nccu_master' into demo_site
2012-08-22 18:07:49 +08:00
tags
Ray's changes in css and html
2012-04-30 00:17:18 +08:00
translations
Fix wrong variable names in translations
2012-05-02 16:22:06 +08:00
users
Remove i18n_variable for views
2012-07-27 19:13:39 +08:00
users_new_interface
Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member
2012-10-12 18:17:05 +08:00