thomaschen
|
4201617a76
|
add Chinese version sidebar Menu in Site Setting
Conflicts:
config/locales/en.yml
|
2013-12-24 16:51:50 +08:00 |
saurabhbhatia
|
1a4c689ee6
|
Fixed application locale
|
2013-11-28 12:28:43 +08:00 |
|
saurabhbhatia
|
03957f565b
|
Added Mobile Web as a separate page
|
2013-11-25 12:43:23 +08:00 |
|
saurabhbhatia
|
d636248073
|
Updated Sidebar, Application Controllers
|
2013-11-01 16:42:39 +08:00 |
|
saurabhbhatia
|
7216676c40
|
Updated Sidebar and Preferences
|
2013-09-09 10:18:14 +08:00 |
|
saurabhbhatia
|
e9d6fa8787
|
Preference Page
|
2013-09-06 18:00:28 +08:00 |
|
saurabhbhatia
|
6e032a8757
|
Add Preference and search engine
|
2013-09-06 18:00:23 +08:00 |
|
saurabhbhatia
|
1558cfdb4e
|
Updated Sitebar with Search Engine
|
2013-09-06 18:00:21 +08:00 |
|
saurabhbhatia
|
9e4686a565
|
Fixed Site Info completely and added search engine page
|
2013-09-06 18:00:18 +08:00 |
|
saurabhbhatia
|
7f0821ea84
|
Updated Site info page to new ui
|
2013-09-06 17:59:56 +08:00 |
|
saurabhbhatia
|
2c0761aafb
|
Updated Sitemap to New UI
|
2013-09-06 17:59:54 +08:00 |
Matt K. Fu
|
e20df41db5
|
add user log link at site page
|
2013-06-14 15:24:04 +08:00 |
chris
|
036d7bbb0e
|
Module store
|
2012-11-29 02:02:37 +08:00 |
|
chris
|
06335f9bd1
|
Joshua's html
|
2012-11-29 00:59:46 +08:00 |
|
chris
|
390da0e49a
|
Change icons
|
2012-11-29 00:49:53 +08:00 |
|
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 |
|
chris
|
cbfa659928
|
Changes for side_bar
|
2012-10-26 11:19:56 +08:00 |
|
Christophe Vilayphiou
|
bdd5a1a047
|
Changes for i18n yml
|
2012-09-24 09:02:45 +08:00 |
|
Christophe Vilayphiou
|
a8cc581279
|
Sitemap done for backend and fronted
|
2012-07-27 19:13:40 +08:00 |
|
Christophe Vilayphiou
|
aa114568c4
|
Move design to site_settings side_bar
|
2012-05-21 18:20:39 +08:00 |
|
Christophe Vilayphiou
|
f9f7ddc8ee
|
Hide some links in side_bar for site_settings
|
2012-05-09 12:53:42 +08:00 |
|
Christophe Vilayphiou
|
44a485611a
|
Site_info and site_setting i18n
|
2012-05-09 12:29:46 +08:00 |
|
Christophe Vilayphiou
|
18c42a80a6
|
Put site_settings in the orbit_button
|
2012-05-08 20:06:56 +08:00 |