orbit-basic

0 Fork 0

Files

T

Christophe Vilayphiou 2b9190a49e Merge branch 'design_team' into ldap

Conflicts:
	config/locales/zh_tw.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb

2012-05-08 11:40:38 +08:00

ad_banners

Announcement preivew

2012-05-04 15:50:45 +08:00

ad_images

Fix site_locale_default_head and active for current locale

2012-05-07 00:53:52 +08:00

app_auths

Listing for Module-apps

2012-01-12 14:13:41 +08:00

assets

Fix for quick edit file and link in announcement

2012-04-26 16:42:28 +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

clean up useless flash msgs. add i18n vars for app auth and object auth

2012-05-04 15:40:43 +08:00

designs

Put sorting in web_link, page_context and design

2012-05-05 21:20:20 +08:00

infos

Ray's back-end modifications for sub-roles

2011-12-28 20:57:18 +08:00

items

Ray's changes for structure and web_links

2012-04-27 11:02:56 +08:00

links

Improve code in items, pages, links

2012-02-17 14:54:11 +08:00

module_apps

Merge branch 'design_team' into ldap

2012-05-08 11:40:38 +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

page_parts

Separate announcement and news

2012-04-30 06:31:46 +08:00

pages

Add menu_enabled_for: the page can be shown even if there's no link in the menu

2012-05-07 15:47:14 +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

Add always_display checkbox for title in site_info independent of i18n

2012-05-07 16:29:32 +08:00