Commit Graph

1750 Commits

Author SHA1 Message Date
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
devin 75b6c447fc gallery update 2012-08-22 16:46:37 +08:00
devin e8a0015365 gallery update 2012-08-22 15:59:06 +08:00
devin 1437d2dc14 gallery update
especially upload panel
2012-08-22 01:15:50 +08:00
Harry Bomrah 4a53e5faea Minor update 2012-08-21 20:26:07 +08:00
Harry Bomrah 16b1e97685 code merged … ui updated 2012-08-21 20:15:17 +08:00
Harry Bomrah e447dc411a design update 2012-08-21 19:36:49 +08:00
unknown 1bfae05242 update item page 2012-08-21 17:37:25 +08:00
devin 0ad0ea9acf gallery update 2012-08-21 16:32:55 +08:00
devin cbef7cd368 gallery update 2012-08-21 14:31:25 +08:00
devin 1a6ecf4d0f gallery update 2012-08-21 13:56:50 +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 3d607cfca4 updates for tagging and language fix 2012-08-20 23:20:20 +08:00
Harry Bomrah 2c0058e8c9 authorization 2012-08-20 23:18:50 +08:00
devin 489231166f gallery update 2012-08-20 23:17:32 +08:00
devin 1731c4bcf7 gallery update
add "tag panel", not complete
2012-08-20 23:17:32 +08:00
Harry Bomrah faf2d914b6 Page added for desktop 2012-08-20 23:17:31 +08:00
devin 4beedb1aa4 gallery update 2012-08-20 23:17:31 +08:00
devin 0dd1c6eb51 encoding fixed
Maybe there are some "chinese" in galleryAPI.js.erb and Ruby treat them
all US-ASCII, so everything crash.
see this post
"http://stackoverflow.com/questions/7761540/encoding-issues-in-javascrip
t-files-using-rails-asset-pipeline"
2012-08-20 23:16:54 +08:00
Harry Bomrah 263cf130e2 tp 2012-08-20 23:16:54 +08:00
Harry Bomrah aef1bfaba3 Button fixes 2012-08-20 23:16:54 +08:00
Harry Bomrah 69304fda43 UI modifications 2012-08-20 23:16:06 +08:00
devin abd1a9ecbc gallery update 2012-08-20 23:14:11 +08:00
devin 8a9e724979 gallery update 2012-08-20 23:14:11 +08:00
Harry Bomrah 1ba87982ba Multi language and side bar update 2012-08-20 23:14:11 +08:00
devin e27c1b0175 gallery update 2012-08-20 23:14:11 +08:00
Harry Bomrah 587595f815 gallery translation supported 2012-08-20 23:14:11 +08:00
Harry Bomrah 314af3c16f Major updates for gallery 2012-08-20 23:14:11 +08:00
Harry Bomrah 0333f97bf3 Gallery update.. 2012-08-20 23:14:10 +08:00
Harry Bomrah 797c9e57b8 Gallery update 2012-08-20 23:14:10 +08:00
Harry Bomrah 1daf405b3d Gallery started. 2012-08-20 23:14:10 +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
Harry Bomrah 9f3d22360e gallery module update 2012-08-20 23:11:32 +08:00
devin 801c7cab0c tinyscroll bar update 2012-08-20 23:11:32 +08:00
Harry Bomrah 1efb807246 tinyscrollbar extension 2012-08-20 23:11:32 +08:00
Harry Bomrah 6e90196b77 updates for tagging and language fix 2012-08-20 22:00:57 +08:00
unknown 23a3a7eff6 update archive 2012-08-20 17:14:13 +08:00
chris edf9d8a159 Fix can_display 2012-08-16 18:55:34 +08:00
chris 3c283d1a7a Set default picture
Fix tags where not in params for index fronted (news and announcement)
Change backend index for news
Home banner link for images and main title
2012-08-16 17:24:12 +08:00
Christophe Vilayphiou 96fd89cca3 Fix js for ie in list 2012-08-16 01:09:45 +08:00
Christophe Vilayphiou 53c5f6a3b9 New css and images for rss 2012-08-15 18:00:55 +08:00
Christophe Vilayphiou 0d330edfa3 New css and images for rss 2012-08-15 17:42:45 +08:00
Christophe Vilayphiou 84ad9dd724 Fix ab_banner display 2012-08-15 16:34:00 +08:00
Christophe Vilayphiou c5b95e2e0f Fix rss feed i18n 2012-08-15 16:17:28 +08:00
Christophe Vilayphiou 4e3dc7c438 Fix ab_banner display 2012-08-15 16:08:47 +08:00
Christophe Vilayphiou 43bc704468 Error popup only shows on flash[:error] 2012-08-15 15:55:29 +08:00
Christophe Vilayphiou 39604d30ce Fix ab_banner display 2012-08-15 14:58:43 +08:00
Christophe Vilayphiou a19a5415c1 Ray's changes for list.css 2012-08-15 12:13:58 +08:00