Lukas adc15951bb questionnaire stuff ...

Conflicts:

	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb

2013-06-06 18:29:58 +08:00

..

_drop_down_menu.html.erb

fix for Spen's translation and Chris's tag error

2013-04-26 15:37:27 +08:00

_guest_orbit_menu.erb

fix for Spen's translation and Chris's tag error

2013-04-26 15:37:27 +08:00

_lang_menu.html.erb

…

_member_orbit_menu.erb

fix for Spen's translation and Chris's tag error

2013-04-26 15:37:27 +08:00

_orbit_bar.html.erb

member translation fix

2013-04-26 11:26:11 +08:00

_side_bar_content.html.erb

Merge commit 'fc702a6210d901cd3beea220e72f71a3b7f7d41e' into sidebar_config

2013-01-24 16:30:02 +08:00

_side_bar.html.erb

fix member sidebar

2013-02-06 17:44:38 +08:00

_users_checkbox_ary.html.erb

…

admin.html.erb

new code for attribute fields and values for new member interface

2012-10-26 11:19:55 +08:00

application.html.erb

clean 403 404 500

2013-05-27 16:46:49 +08:00

compatibility.html.erb

add browser compatibility page

2013-04-17 11:07:45 +08:00

desktop.html.erb

app manager changed plus some changes

2013-04-17 11:09:56 +08:00

devise.html.erb

…

mobile.mobile.erb

Merge branch 'back' of github.com:Rulingcom/orbit into back

2013-01-14 17:46:27 +08:00

module_widget.html.erb

…

new_admin.html.erb

first version of confined sidebar render

2012-12-24 16:17:00 +08:00

page_layout.html.erb

Change icons

2013-01-09 21:17:50 +08:00

site_editor.html.erb

…

standalone.html.erb

questionnaire stuff

2013-06-06 18:29:58 +08:00