alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
686 Commits 12 Branches 0 Tags 17 MiB
Commit Graph

304 Commits

Author SHA1 Message Date
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 cf7e15d4bb user friendly for editing members 2015-04-22 18:28:14 +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 573030b119 removed update all button 2015-04-21 17:40:48 +08:00
Harry Bomrah b1be711fd5 module update stuff added to kernel 2015-04-21 17:19:00 +08:00
rulingcom 5aac9b297d merged 2015-04-14 15:31:41 +08:00
Harry Bomrah 1cfd6b80f9 lot of changes for groups 2015-04-14 15:18:58 +08:00
Harry Bomrah 15fec35e3f groups multifile added and show page working. 2015-04-01 01:02:01 +08:00
rulingcom 60bb2cac1e group mods by joshua 2015-03-31 15:51:44 +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
Harry Bomrah 4b770b7fd1 group create fix 2015-03-25 15:50:58 +08:00
Harry Bomrah b290d3653f groups commit 2015-03-25 15:46:11 +08:00
Harry Bomrah f52919e4b6 group added 2015-03-19 14:24:40 +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
Harry Bomrah 52c78856be added insert new widgets to kernel 2015-03-13 16:39:09 +08:00
Harry Bomrah c4be6c5f63 visibility of group fixed 2015-03-12 19:05:49 +08:00
Harry Bomrah f71b5d6bbb groups started 2015-03-12 19:02:48 +08:00
rulingcom 16dae228b1 sdk updates from joshua 2015-03-11 16:18:56 +08:00
Harry Bomrah dfd7865bd5 new error and success pages for google auth and also spinner fixed for update manager 2015-03-06 17:13:09 +08:00
nccu a9e3eaad9d add changed files from 174 2015-03-06 11:48:49 +08:00
Harry Bomrah e881d02bee fix 2015-03-04 20:43:01 +08:00
Harry Bomrah b53a7508f5 again small fix for js 
Conflicts:
	app/views/admin/members/show.html.erb
 2015-03-04 20:37:44 +08:00
Harry Bomrah 8e7319b3c3 fixed js 2015-03-04 20:31:33 +08:00
Harry Bomrah 2942ab8563 small fix in js for google connect 2015-03-04 20:17:39 +08:00
Harry Bomrah ed3308abbb google oauth added and also preferences 2015-03-04 18:31:36 +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
Harry Bomrah cbd3a79122 fixed a small bug in sitemap 2014-09-26 18:58:55 +08:00
Harry Bomrah 23bead2b5d fixed problem of sitemap sorting and also import modules dont go back after importing. also added sitemap for google crawler. 2014-09-26 17:10:17 +08:00
Harry Bomrah 72c8d4917b fixed non approved member bug in list page 2014-09-25 18:52:54 +08:00
Harry Bomrah fe1a87aae4 important update with some fixes in member import and also site preferences and page imports 2014-09-25 17:57:46 +08:00
Harry Bomrah 5b3b009f65 fix for high security bugs in report and plus some other member area fixes 2014-09-23 17:06:17 +08:00
Harry Bomrah f6d29e128d skip announcement with no category 2014-09-19 13:58:30 +08:00
Harry Bomrah cac23e3c52 fixed a bug in js 2014-09-17 19:57:47 +08:00
Harry Bomrah eaf5fbbc8e import bugs removed for no data 2014-09-17 19:51:04 +08:00
Harry Bomrah e558b916fe fixed widget text image insert problem with chinese and also page import is changed to per page 2014-09-17 17:25:47 +08:00
Harry Bomrah 5d6f33c90b added new 404 page and also fixed member import 2014-09-15 15:29:53 +08:00
manson ef55afceae update site search setting 2014-09-11 19:08:39 +08:00
Harry Bomrah 856b590e1b fixed delete and update user issue and also the language switch 2014-09-11 18:19:48 +08:00
manson 2c06c03f4d change member form first/last name position for zh_tw 2014-09-10 19:26:03 +08:00
manson a8a092a395 fix update manager 2014-08-15 17:47:14 +08:00
manson 3435a7bfd3 update login redirect to referer url and fix check_user_can_use method 2014-08-15 10:29:17 +08:00
manson 7dd2c25180 fix jquery-ui-sortable path 2014-08-11 11:07:55 +08:00
manson 285335b0c3 fix member edit_privilege authorization 2014-08-08 18:41:49 +08:00
manson e19816ede5 fix member password note and birthday format 2014-08-08 16:41:31 +08:00
manson c2c9bd4682 update dashboard for better performance 2014-08-08 14:16:03 +08:00
manson 5f50d59333 fix switch_language 2014-08-08 11:46:21 +08:00
manson b4e5d36cc3 update backend search for modules 2014-08-07 18:44:23 +08:00
manson 68e0fbcd92 update backend search js 2014-08-07 14:20:22 +08:00
manson c656720132 search for module backend 2014-08-06 19:36:53 +08:00
Harry Bomrah 56e18cd040 fixed authorization bug and also added select and deselect for member selection 2014-08-06 18:27:54 +08:00