Matthew K. Fu JuYuan
ee053cd8ac
fix and hide for visitors,except for album
2012-11-21 11:46:06 +08:00
chris
c1da80761e
Remove wrong mongo port
2012-11-20 12:04:34 +08:00
Matthew K. Fu JuYuan
be448d42c9
add_more ok
2012-11-20 09:52:50 +08:00
chris
cc5e238576
Fix after merge from NCCU, the translations still need to be cleaned
2012-10-30 11:08:26 +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
Matt
962bae9a82
merge
2012-10-01 21:09:09 +08:00
Harry Bomrah
b6c06c6d4f
tiny mce fix
2012-09-19 17:59:17 +08:00
Christophe Vilayphiou
7c57c947c7
Fix typo in mongoid.yml
2012-09-12 03:52:04 +08:00
Christophe Vilayphiou
816b542ca6
Change side bar to use key instead of title for ModuleApps
2012-09-12 03:07:25 +08:00
chris
7d5531bf01
Merge branch 'nccu_master' into demo_site
...
Conflicts:
Gemfile
app/assets/javascripts/tinymce_orbit.js.erb
app/assets/stylesheets/style.css.erb
app/controllers/admin/assets_controller.rb
app/controllers/admin/module_apps_new_interface_controller.rb
app/controllers/admin/page_parts_controller.rb
app/jobs/sync_db.rb
app/models/page.rb
app/models/page_part.rb
app/models/user/user.rb
app/uploaders/image_uploader.rb
app/views/admin/assets/create.js.erb
app/views/admin/module_apps/reload_frontend_pages.js.erb
app/views/layouts/_orbit_bar.html.erb
app/views/layouts/_side_bar.html.erb
app/views/layouts/_users_checkbox_ary.html.erb
app/views/shared/_privilege_user.html.erb
config/mongoid.yml
lib/parsers/parser_common.rb
vendor/built_in_modules/announcement/announcement.json
vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
2012-08-22 18:07:49 +08:00
chris
68aed18956
Merge branch 'gallery_orbit' of github.com:Rulingcom/orbit into gallery_orbit
...
Conflicts:
app/views/layouts/_side_bar.html.erb
config/mongoid.yml
vendor/built_in_modules/gallery/app/assets/javascripts/galleryAPI.js.erb
vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css
2012-08-20 23:24:41 +08:00
Harry Bomrah
5fd367a8d9
fixed db error
2012-08-20 23:14:10 +08:00
Joshua
22c43e7f7d
database fixing
2012-08-20 23:14:10 +08:00
Harry Bomrah
207d360d1e
fixed db error
2012-08-20 23:11:32 +08:00
Matthew K. Fu JuYuan
e8317e0a4b
1.Remove category column when category is specified
...
2.Showing category if not in category browsing
3.Redirect to home and show error if app page is not available for user language
4.Showing no context to display if object has no language for it.
5.Browse new and announcement by unit is now applicable.
2012-08-08 14:46:08 +08:00
Harry Bomrah
ded9326d1f
db fixed
2012-07-16 20:27:34 +08:00
Harry Bomrah
9f0c0bee71
fixed db error
2012-07-16 20:26:32 +08:00
Joshua
b51e656909
database fixing
2012-07-16 13:25:35 +01:00
Harry Bomrah
833c08eafc
fixed db error
2012-07-16 17:29:46 +08:00
Matthew K. Fu JuYuan
98b274d9dd
add slave_ok: true to nccu172
2012-07-09 17:03:26 +08:00
unknown
1d8e386bde
demo website widget
2012-07-09 16:28:03 +08:00
Matthew K. Fu JuYuan
8dd1ab32c1
Add this toolbar, and nccu calendar fix
2012-06-04 16:51:29 +08:00
Christophe Vilayphiou
e1bd5d8c8d
Put back db prototype_r4_development
2012-05-18 16:46:47 +08:00
Christophe Vilayphiou
7c6b807170
Change impression count to exclude when :referrer is nil
2012-05-18 14:13:11 +08:00
Christophe Vilayphiou
d9c12ea5a4
Proof authed_users for case when no category
2012-05-18 10:50:51 +08:00
chris2tof
f99321c279
production mode
2011-08-25 15:59:20 +08:00
ihower
19a7d51e60
Chris's first commit at Fri Jan 28 2011 10:14:32 GMT+0800 (CST)
2011-04-13 18:19:51 +08:00