Commit Graph

228 Commits

Author SHA1 Message Date
nccu a9e3eaad9d add changed files from 174 2015-03-06 11:48:49 +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
Ray 5f90be20a2 update Templates storn & Module storn UI 2015-02-26 15:09:42 +08:00
Ray f3e9679e54 增加右上角的新增按鈕
使用方式是當 render filter 在最後放個 true
範例:<%=  render_filter @filter_fields, "index_table", true %>
2015-02-26 15:01:06 +08:00
nccu 95da400843 help designer to push code 2015-02-25 11:41:53 +08:00
Harry Bomrah 9862722252 url fixed for license 2015-02-09 15:09:16 +05:30
spen e616c4b947 fix member pic name 2015-01-20 15:27:43 +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 5087a54daa fixed a small bug with no categories enabled. 2015-01-08 23:04:14 +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 343294858e fix for non registered site and module update button 2014-12-31 15:27:18 +08:00
JiangRu 4425063a68 add module update button 2014-12-31 15:13:49 +08:00
Ray 380e2cd4f9 License Denied. 2014-12-30 20:40:45 +08:00
Harry Bomrah 6e27bbd483 module store changes 2014-12-30 18:38:11 +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 4415093ce2 lot of fixes and experience enhancement 2014-12-10 18:09:50 +08:00
Harry Bomrah 05852ed09f category enhancements 2014-12-09 22:00:40 +08:00
Harry Bomrah e521e1ea26 some category disable improvements 2014-12-09 21:25:51 +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 8b7a139dc2 module page modified 2014-12-08 18:29:21 +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 a89e06087a store registration form changes 2014-12-02 21:10:15 +08:00
Harry Bomrah 4712a1f4ff test 3 2014-12-01 19:41:53 +08:00
Harry Bomrah d0f35af7d5 test 2 2014-12-01 19:39:08 +08:00
Harry Bomrah a33022cb4f test for update manager 2014-12-01 19:35:12 +08:00
Harry Bomrah 0623541d94 now only registered websites can update via update manager 2014-11-24 18:21:00 +08:00
nccu e1a716f81d alert for page not available in language 2014-11-13 16:24:30 +08:00
Harry Bomrah 2404e117d0 fixed template change script 2014-11-03 14:12:20 +08:00
Harry Bomrah 9eebd2ff51 store for module store 2014-10-28 19:18:59 +08:00
Harry Bomrah 75d8c46576 module store 2014-10-28 16:46:11 +08:00
Harry Bomrah 5766c6355f orbit store integration 2014-10-27 19:07:01 +08:00
Harry Bomrah 50582cdbd8 back to in use locales for pages and links 2014-10-24 15:15:13 +08:00
Harry Bomrah bc95f77f87 small fix 2014-10-23 18:32:13 +08:00
Harry Bomrah 11caff4b81 fixed forms for link and page for language use 2014-10-23 18:28:02 +08:00
Harry Bomrah 0cff91594c member update modified and h2 tag in orbit bar 2014-10-22 14:51:14 +08:00
Harry Bomrah 384cc4d6f4 fix for chinese simplified and also new user added 2014-10-21 15:27:43 +08:00
Harry Bomrah 051b165298 fixed orbit bar lanugage and menu 2014-10-20 19:50:16 +08:00
Harry Bomrah 9c19a4a2fd added non approved users can view profile and not rest of system 2014-10-20 18:50:36 +08:00
Harry Bomrah 78839a64d0 removed rulingcom user from user list 2014-10-16 19:55:32 +08:00
Harry Bomrah 6cdd2a7c87 fix for page setting page for old stuff 2014-10-15 16:07:01 +08:00
Harry Bomrah 3ca0f399ec fixed username and password to be blank, user cant edit username and also the page setting options 2014-10-15 15:57:58 +08:00
Harry Bomrah 24a07a5780 widget title and page title fixed for page 2014-10-13 18:04:51 +08:00
spen b33c2d5b38 Excel Import Members 2014-10-13 14:27:01 +08:00
Harry Bomrah c2fe693ceb date formating made easy for designers and also sitemap style changed 2014-10-01 16:12:38 +08:00
Harry Bomrah 9288d66660 fixed member view bug in member list page for imported members without user account 2014-09-30 13:27:37 +08:00
Harry Bomrah a73098dc8f clean button removed coz of 502 issues 2014-09-29 21:37:59 +08:00
Harry Bomrah c18846b6b0 added clean button for the modules import 2014-09-29 21:21:41 +08:00