developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Orbit/app/views/admin
History
Christophe Vilayphiou f1c8bed29d Merge branch 'design_team' into ldap 
Conflicts:
	vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
 		2012-05-22 20:33:07 +08:00
..
ad_banners fix view for different_user for ad_banner. add field 'best size' for ad_banner within form 2012-05-18 14:19:13 +08:00
ad_images fix view for different_user for ad_banner. add field 'best size' for ad_banner within form 2012-05-18 14:19:13 +08:00
app_auths Listing for Module-apps 2012-01-12 14:13:41 +08:00
asset_categories Change assets 2012-05-16 11:07:11 +08:00
assets image title and description callback fixed… 2012-05-17 20:19:31 +08:00
attributes Fix parser_back_end & side_bar & meta 2012-03-30 15:51:29 +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 Remove link from dashboard 2012-05-15 23:01:00 +08:00
designs Move design to site_settings side_bar 2012-05-21 18:20:39 +08:00
infos Ray's back-end modifications for sub-roles 2011-12-28 20:57:18 +08:00
items JS changes to load drag and drop 2012-05-22 17:37:15 +08:00
links Changes for structure 2012-05-22 14:45:49 +08:00
module_apps Merge branch 'design_team' into ldap 2012-05-14 00:57:17 +08:00
module_apps_new_interface New Interface for App Auth and Object Auth 2012-05-14 00:50:12 +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 Change to apply page to had object_auth 2012-05-14 12:40:50 +08:00
page_parts tinymce loading fixed… 2012-05-16 18:51:37 +08:00
pages Changes for structure 2012-05-22 14:45:49 +08:00
purchases Ray's back_end modification before sub_roles 2011-12-23 18:02:45 +08:00
roles Merge branch 'fix_it' 2012-01-12 18:15:43 +08:00
sites Move design to site_settings side_bar 2012-05-21 18:20:39 +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 Ray's modification before redesign 2012-01-24 11:57:27 +08:00