Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu

2015-07-03 20:42:05 +08:00 · 2015-05-05 18:13:41 +08:00 · 2015-04-30 14:40:03 +08:00 · 2015-04-28 17:57:22 +08:00 · 2015-04-28 17:56:01 +08:00 · 2015-04-28 16:08:33 +08:00
961 changed files with 14832 additions and 130 deletions
--- a/.gitignore
+++ b/.gitignore
@ -23,3 +23,5 @@ public/assets/*
 public/import_status.yml
 public/announcement_link_widget_en.json
 public/announcement_link_widget_zh_tw.json
 vendor/announcement-test
 vendor/news
--- a/3
+++ b/3
@ -46,6 +46,9 @@ gem 'usagewatch_ext'
 gem 'ckeditor'
 gem 'unicorn'
 gem 'zhconv'
 gem "net-ldap", "~> 0.3.1"
 gem 'time_difference'
 gem 'execjs'
 gem 'therubyracer'
--- a/app/assets/fonts/desktop/FontAwesome.otf
+++ b/app/assets/fonts/desktop/FontAwesome.otf
--- a/app/assets/fonts/desktop/fontawesome-webfont.eot
+++ b/app/assets/fonts/desktop/fontawesome-webfont.eot
--- a/app/assets/fonts/desktop/fontawesome-webfont.svg
+++ b/app/assets/fonts/desktop/fontawesome-webfont.svg
--- a/app/assets/fonts/desktop/fontawesome-webfont.ttf
+++ b/app/assets/fonts/desktop/fontawesome-webfont.ttf
--- a/app/assets/fonts/desktop/fontawesome-webfont.woff
+++ b/app/assets/fonts/desktop/fontawesome-webfont.woff
--- a/app/assets/images/chosen/chosen-sprite.png
+++ b/app/assets/images/chosen/chosen-sprite.png
--- a/app/assets/images/chosen/chosen-sprite@2x.png
+++ b/app/assets/images/chosen/chosen-sprite@2x.png
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/Small
+++ b/app/assets/images/ft-icons/Small
--- a/app/assets/images/ft-icons/accdb/accdb-128_32.png
+++ b/app/assets/images/ft-icons/accdb/accdb-128_32.png
--- a/app/assets/images/ft-icons/accdb/accdb-16_32.png
+++ b/app/assets/images/ft-icons/accdb/accdb-16_32.png
--- a/app/assets/images/ft-icons/accdb/accdb-24_32.png
+++ b/app/assets/images/ft-icons/accdb/accdb-24_32.png
--- a/app/assets/images/ft-icons/accdb/accdb-256_32.png
+++ b/app/assets/images/ft-icons/accdb/accdb-256_32.png
--- a/app/assets/images/ft-icons/accdb/accdb-32_32.png
+++ b/app/assets/images/ft-icons/accdb/accdb-32_32.png
--- a/app/assets/images/ft-icons/accdb/accdb-48_32.png
+++ b/app/assets/images/ft-icons/accdb/accdb-48_32.png
--- a/app/assets/images/ft-icons/accdb/accdb-64_32.png
+++ b/app/assets/images/ft-icons/accdb/accdb-64_32.png
--- a/app/assets/images/ft-icons/accdb/accdb-72_32.png
+++ b/app/assets/images/ft-icons/accdb/accdb-72_32.png
--- a/app/assets/images/ft-icons/accdb/accdb-80_32.png
+++ b/app/assets/images/ft-icons/accdb/accdb-80_32.png
--- a/app/assets/images/ft-icons/accdb/accdb-96_32.png
+++ b/app/assets/images/ft-icons/accdb/accdb-96_32.png
--- a/app/assets/images/ft-icons/accdb/accdb-sm-16_32.png
+++ b/app/assets/images/ft-icons/accdb/accdb-sm-16_32.png
--- a/app/assets/images/ft-icons/accdb/accdb-sm-24_32.png
+++ b/app/assets/images/ft-icons/accdb/accdb-sm-24_32.png
--- a/app/assets/images/ft-icons/accdb/accdb-sm-32_32.png
+++ b/app/assets/images/ft-icons/accdb/accdb-sm-32_32.png
--- a/app/assets/images/ft-icons/accdb/accdb-sm.ico
+++ b/app/assets/images/ft-icons/accdb/accdb-sm.ico
--- a/app/assets/images/ft-icons/accdb/accdb.ico
+++ b/app/assets/images/ft-icons/accdb/accdb.ico
--- a/app/assets/images/ft-icons/avi/avi-128_32.png
+++ b/app/assets/images/ft-icons/avi/avi-128_32.png
--- a/app/assets/images/ft-icons/avi/avi-16_32.png
+++ b/app/assets/images/ft-icons/avi/avi-16_32.png
--- a/app/assets/images/ft-icons/avi/avi-24_32.png
+++ b/app/assets/images/ft-icons/avi/avi-24_32.png
--- a/app/assets/images/ft-icons/avi/avi-256_32.png
+++ b/app/assets/images/ft-icons/avi/avi-256_32.png
--- a/app/assets/images/ft-icons/avi/avi-32_32.png
+++ b/app/assets/images/ft-icons/avi/avi-32_32.png
--- a/app/assets/images/ft-icons/avi/avi-48_32.png
+++ b/app/assets/images/ft-icons/avi/avi-48_32.png
--- a/app/assets/images/ft-icons/avi/avi-64_32.png
+++ b/app/assets/images/ft-icons/avi/avi-64_32.png
--- a/app/assets/images/ft-icons/avi/avi-72_32.png
+++ b/app/assets/images/ft-icons/avi/avi-72_32.png
--- a/app/assets/images/ft-icons/avi/avi-80_32.png
+++ b/app/assets/images/ft-icons/avi/avi-80_32.png
--- a/app/assets/images/ft-icons/avi/avi-96_32.png
+++ b/app/assets/images/ft-icons/avi/avi-96_32.png
--- a/app/assets/images/ft-icons/avi/avi-sm-16_32.png
+++ b/app/assets/images/ft-icons/avi/avi-sm-16_32.png
--- a/app/assets/images/ft-icons/avi/avi-sm-24_32.png
+++ b/app/assets/images/ft-icons/avi/avi-sm-24_32.png
--- a/app/assets/images/ft-icons/avi/avi-sm-32_32.png
+++ b/app/assets/images/ft-icons/avi/avi-sm-32_32.png
--- a/app/assets/images/ft-icons/avi/avi-sm.ico
+++ b/app/assets/images/ft-icons/avi/avi-sm.ico
--- a/app/assets/images/ft-icons/avi/avi.icns
+++ b/app/assets/images/ft-icons/avi/avi.icns
--- a/app/assets/images/ft-icons/avi/avi.ico
+++ b/app/assets/images/ft-icons/avi/avi.ico
--- a/app/assets/images/ft-icons/bmp/bmp-128_32.png
+++ b/app/assets/images/ft-icons/bmp/bmp-128_32.png
--- a/app/assets/images/ft-icons/bmp/bmp-16_32.png
+++ b/app/assets/images/ft-icons/bmp/bmp-16_32.png
--- a/app/assets/images/ft-icons/bmp/bmp-24_32.png
+++ b/app/assets/images/ft-icons/bmp/bmp-24_32.png
--- a/app/assets/images/ft-icons/bmp/bmp-256_32.png
+++ b/app/assets/images/ft-icons/bmp/bmp-256_32.png
--- a/app/assets/images/ft-icons/bmp/bmp-32_32.png
+++ b/app/assets/images/ft-icons/bmp/bmp-32_32.png
--- a/app/assets/images/ft-icons/bmp/bmp-48_32.png
+++ b/app/assets/images/ft-icons/bmp/bmp-48_32.png
--- a/app/assets/images/ft-icons/bmp/bmp-64_32.png
+++ b/app/assets/images/ft-icons/bmp/bmp-64_32.png
--- a/app/assets/images/ft-icons/bmp/bmp-72_32.png
+++ b/app/assets/images/ft-icons/bmp/bmp-72_32.png
--- a/app/assets/images/ft-icons/bmp/bmp-80_32.png
+++ b/app/assets/images/ft-icons/bmp/bmp-80_32.png
--- a/app/assets/images/ft-icons/bmp/bmp-96_32.png
+++ b/app/assets/images/ft-icons/bmp/bmp-96_32.png
--- a/app/assets/images/ft-icons/bmp/bmp-sm-16_32.png
+++ b/app/assets/images/ft-icons/bmp/bmp-sm-16_32.png
--- a/app/assets/images/ft-icons/bmp/bmp-sm-24_32.png
+++ b/app/assets/images/ft-icons/bmp/bmp-sm-24_32.png
--- a/app/assets/images/ft-icons/bmp/bmp-sm-32_32.png
+++ b/app/assets/images/ft-icons/bmp/bmp-sm-32_32.png
--- a/app/assets/images/ft-icons/bmp/bmp-sm.ico
+++ b/app/assets/images/ft-icons/bmp/bmp-sm.ico
--- a/app/assets/images/ft-icons/bmp/bmp.icns
+++ b/app/assets/images/ft-icons/bmp/bmp.icns
--- a/app/assets/images/ft-icons/bmp/bmp.ico
+++ b/app/assets/images/ft-icons/bmp/bmp.ico
--- a/app/assets/images/ft-icons/css/css-128_32.png
+++ b/app/assets/images/ft-icons/css/css-128_32.png
--- a/app/assets/images/ft-icons/css/css-16_32.png
+++ b/app/assets/images/ft-icons/css/css-16_32.png
--- a/app/assets/images/ft-icons/css/css-24_32.png
+++ b/app/assets/images/ft-icons/css/css-24_32.png
--- a/app/assets/images/ft-icons/css/css-256_32.png
+++ b/app/assets/images/ft-icons/css/css-256_32.png
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Harry Bomrah	78399d4f91	Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu	2015-07-03 20:42:05 +08:00
Harry Bomrah	a4081d40b2	Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu	2015-05-05 18:13:41 +08:00
Harry Bomrah	95704ed56e	Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu	2015-04-30 14:40:03 +08:00
Harry Bomrah	f16b1b34b5	Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu	2015-04-28 17:57:22 +08:00
Harry Bomrah	8c2f10e59c	authorization fix for create and update of plugins	2015-04-28 17:56:01 +08:00
Harry Bomrah	0d7bae7acc	Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu	2015-04-28 16:08:33 +08:00
Harry Bomrah	2f58c02ee5	cant select empty value in page parts	2015-04-28 16:07:43 +08:00
Harry Bomrah	ccb9a24861	Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu	2015-04-27 21:41:27 +08:00
Harry Bomrah	f9dcf7db3a	removed mobile settings and also removed bundle update from server	2015-04-27 21:40:38 +08:00
Harry Bomrah	a833bfd606	page id cannot be chinese and also some module update fixes	2015-04-27 20:46:01 +08:00
Harry Bomrah	7210f46f35	Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu	2015-04-23 17:21:10 +08:00
Harry Bomrah	0122f5aa23	small fix for member fields display	2015-04-23 17:20:08 +08:00
Harry Bomrah	45f58990f0	Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu	2015-04-22 23:07:18 +08:00
Harry Bomrah	b27467c65d	sorting for role status fixed	2015-04-22 23:06:05 +08:00
Harry Bomrah	143d8009c5	Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu	2015-04-22 22:59:42 +08:00
Harry Bomrah	16389cb942	adding routes file	2015-04-22 22:58:51 +08:00
Harry Bomrah	4b6c27de75	Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu	2015-04-22 22:53:52 +08:00
Harry Bomrah	97912d2d3a	now can add or delete fields for the member	2015-04-22 22:53:04 +08:00
Harry Bomrah	c902c51006	Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu	2015-04-22 18:31:21 +08:00
Harry Bomrah	1a19b97258	user friendly for editing members Conflicts: app/views/admin/members/edit.html.erb	2015-04-22 18:30:37 +08:00
Harry Bomrah	760404cbd2	Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu	2015-04-22 16:33:09 +08:00
Harry Bomrah	dd5f7ed234	fixed bug in members frontend and also roles and role statuses sorted on key ascending	2015-04-22 16:32:24 +08:00
Harry Bomrah	babf12c777	Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu	2015-04-21 17:44:39 +08:00
Harry Bomrah	0746250c46	removed update all button	2015-04-21 17:43:44 +08:00
Harry Bomrah	07f6b6aab2	module update stuff added to kernel	2015-04-21 17:43:33 +08:00
Harry Bomrah	ef8728c6fa	modified debugging for frontend	2015-04-17 15:56:06 +08:00
Harry Bomrah	449d809b35	debug added for modules and widgets frontend	2015-04-17 15:55:58 +08:00
Harry Bomrah	6c1683f7d5	rails menu cache removed	2015-04-14 17:00:08 +08:00
Harry Bomrah	72c120c0ae	rails menu cache removed	2015-04-14 16:58:45 +08:00
Harry Bomrah	4ecfb9bf80	fix error for page submit	2015-04-10 18:41:22 +08:00
Harry Bomrah	b2a5e361e8	fix for cache clear on page part submit	2015-04-10 16:35:18 +08:00
Harry Bomrah	0b787a1067	Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu	2015-03-30 18:14:12 +08:00
Harry Bomrah	363610c5c9	Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu	2015-03-30 16:49:23 +08:00
Harry Bomrah	07e96225a7	Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu	2015-03-30 15:39:13 +08:00
Harry Bomrah	3362601b1f	Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu Conflicts: lib/orbit_model/impression.rb	2015-03-30 15:22:03 +08:00
nccu	4603c8b53f	help desinger fix IE8	2015-03-23 17:17:52 +08:00
nccu	b0d454f274	help designer IE8 fix	2015-03-23 16:28:42 +08:00
nccu	fcbb04ccc5	help designer IE8 fix	2015-03-23 16:12:26 +08:00
nccu	013ba56111	precompile fix and also impressionist fix	2015-03-19 18:42:29 +08:00
Harry Bomrah	25bf24745c	Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu	2015-03-18 18:01:00 +08:00
Harry Bomrah	7d6fdc2559	Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu	2015-03-18 15:43:23 +08:00
Harry Bomrah	366876ae29	Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu Conflicts: app/assets/stylesheets/lib/orbit_bar/orbit-bar.scss.erb	2015-03-13 17:10:52 +08:00
nccu	4870fc5ad3	help designer	2015-03-09 11:12:20 +08:00
manson	470d1b2405	display calendar	2015-03-06 12:41:51 +08:00
nccu	8d3d086629	fix search word	2015-03-06 12:39:30 +08:00
manson	eaa63cc5aa	enable calendar	2015-03-06 12:34:54 +08:00
nccu	a9e3eaad9d	add changed files from 174	2015-03-06 11:48:49 +08:00
nccu	007a46a373	help designer fix	2015-03-06 10:49:48 +08:00
Harry Bomrah	2d1f9cb1ab	Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu	2015-02-26 14:56:06 +05:30
nccu	95da400843	help designer to push code	2015-02-25 11:41:53 +08:00
nccu	f41f128154	fix by Designer	2015-02-24 14:19:36 +08:00
nccu	66bc09094c	add insert translate	2015-01-27 16:52:34 +08:00
Harry Bomrah	5b570fe8a1	Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu	2015-01-09 17:44:49 +08:00
Harry Bomrah	e1a80e496a	Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu	2015-01-08 23:06:25 +08:00
Harry Bomrah	ceb110e030	Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu	2015-01-07 16:13:19 +08:00
Harry Bomrah	f19ce9b961	Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu Conflicts: Gemfile app/controllers/pages_controller.rb app/views/orbit_bar/index.html.erb	2014-12-19 16:41:15 +08:00
Harry Bomrah	54fd95163b	lot of fixes and experience enhancement	2014-12-10 18:14:45 +08:00
Harry Bomrah	84308c3d10	category enhancements	2014-12-10 18:13:51 +08:00
Harry Bomrah	4b86270725	some category disable improvements	2014-12-10 18:13:51 +08:00
Harry Bomrah	aac6b97d2d	added version file	2014-12-10 18:13:51 +08:00
nccu	568b6d3a46	update index3	2014-12-09 15:08:45 +08:00
Harry Bomrah	7947a45413	Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu Conflicts: lib/orbit_tag/taggable.rb	2014-12-08 19:02:06 +08:00
Harry Bomrah	b9a6e6fe05	Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu	2014-12-08 15:54:03 +08:00
Harry Bomrah	96cf61f688	Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu	2014-12-04 15:56:15 +08:00
Harry Bomrah	1a3b7d43d1	optimization for authorization	2014-11-14 17:00:42 +08:00
Harry Bomrah	6192cff3a1	fixed authorizations	2014-11-14 17:00:42 +08:00
nccu	639c398e41	update ipv4 & 6 block	2014-11-13 17:38:44 +08:00
Harry Bomrah	dd4c9fc587	Merge branch 'master' into nccu Conflicts: .gitignore	2014-11-13 16:48:09 +08:00
nccu	e1a716f81d	alert for page not available in language	2014-11-13 16:24:30 +08:00
nccu	7dd20cafa0	update css	2014-11-13 11:22:08 +08:00
nccu	5d11d95ca9	update session time	2014-11-11 17:46:11 +08:00
nccu	731b55249d	update template	2014-11-11 16:30:27 +08:00
nccu	018557ba41	update template	2014-11-11 15:48:55 +08:00
nccu	a6ac7f9eeb	fix orbit_helper widget_tags overrides page_tags	2014-11-11 13:50:48 +08:00
nccu	925001ca3f	update tag	2014-11-11 10:55:21 +08:00
nccu	527648da0a	update template	2014-11-10 16:42:09 +08:00
nccu	3eaf3914ca	update template	2014-11-10 10:05:02 +08:00
nccu	57a40a47ad	update template	2014-11-07 19:52:31 +08:00
nccu	9de2740b9f	update template	2014-11-07 17:37:44 +08:00
nccu	50fdb0b350	fix vendor modules	2014-11-07 16:50:11 +08:00
nccu	2c6bdd4bac	nccu branch	2014-11-07 16:06:50 +08:00