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

605 Commits

Author SHA1 Message Date
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
rulingcom 6b469e78fd info json added to gallery 2015-01-07 16:09:47 +08:00
Harry Bomrah fea7113cd1 removed joshua from db 2015-01-07 15:02:00 +08:00
rulingcom 1c65e90699 small fix 2015-01-06 15:46:39 +08:00
rulingcom f1acfa34ac template default modified 2015-01-06 15:23:29 +08:00
Harry Bomrah 12107376b6 fix for restarting server 2014-12-31 16:41:47 +08:00
Harry Bomrah ceca2c58c0 fix for module permissions 2014-12-31 16:33:33 +08:00
Harry Bomrah 343294858e fix for non registered site and module update button 2014-12-31 15:27:18 +08:00
JiangRu 487d84c1d1 help designer's to push code 2014-12-31 15:16:24 +08:00
JiangRu 4425063a68 add module update button 2014-12-31 15:13:49 +08:00
JiangRu 76397de5ef fix member list 2014-12-31 10:11:39 +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 c8d395aca1 fixed tags and also some store commits 2014-12-28 14:43:34 +08:00
Harry Bomrah 4575fce2a9 counter added and also some changes for store 2014-12-26 16:55:28 +08:00
JiangRu aac9135149 member plugin front page show 2014-12-26 16:23:51 +08:00
JiangRu 207fc9c0f8 fix member plugin intro or complete list & fix journal all author 2014-12-26 16:20:47 +08:00
JiangRu 71ea2eb2dd fix menu tag 2014-12-26 10:26:40 +08:00
Harry Bomrah e3e15a1ef2 fix for all members 2014-12-19 17:53:24 +08:00
Harry Bomrah fc184a7cea fix for members category 2014-12-19 17:14:31 +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 f62b3c7ae4 Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 2014-12-19 16:35:02 +08:00
Harry Bomrah 2402f953f0 fixed member categories all problem 2014-12-19 16:33:23 +08:00
Harry Bomrah e21ad257ff some changes in sdk for ad_banner 2014-12-18 20:04:38 +08:00
JiangRu 2ae34f1cbc fix journal all author 2014-12-18 16:08:34 +08:00
Harry Bomrah 1da348f747 some mods for calendar 2014-12-16 19:34:29 +08:00
Harry Bomrah adbbd044ef import modified 2014-12-11 15:01:42 +08:00
Harry Bomrah b11299a667 import modified 2014-12-10 19:28:40 +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
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 8b7a139dc2 module page modified 2014-12-08 18:29:21 +08:00
Harry Bomrah 934edc5f81 removes uninstalled modules and also attemp to bundle install fast 2014-12-08 18:11:10 +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 8b2e88be0a added is user sub manager 2014-12-08 15:52:37 +08:00
Harry Bomrah 075ae1b135 site type added 2014-12-08 15:08:59 +08:00
rulingcom 5c33fa0ddb sdk changes 2014-12-08 14:54:40 +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 e791339c4e fix for frontend authorization 2014-12-01 22:00:42 +08:00
Harry Bomrah 79554de201 edit button 2014-12-01 21:40:15 +08:00
Harry Bomrah 59d491c199 change for edit url in frontend 2014-12-01 21:17:20 +08:00
Harry Bomrah 4712a1f4ff test 3 2014-12-01 19:41:53 +08:00
Harry Bomrah 8663cf3699 fix for update manager 2014-12-01 19:40:48 +08:00
Harry Bomrah d0f35af7d5 test 2 2014-12-01 19:39:08 +08:00
Harry Bomrah 4511b11d99 fix for update manager 2014-12-01 19:37:59 +08:00
Harry Bomrah a33022cb4f test for update manager 2014-12-01 19:35:12 +08:00
Harry Bomrah 0526b5f9e7 update manager fix 2014-12-01 19:32:09 +08:00
Harry Bomrah 4b13800007 some update for page settings 2014-12-01 19:11:40 +08:00
Harry Bomrah ed36c3a48f added category to page model 2014-12-01 18:07:23 +08:00
Harry Bomrah 5e789bd473 fix for multi language 2014-12-01 15:06:26 +08:00
Harry Bomrah ff17799e83 small fix 2014-12-01 14:48:39 +08:00
Harry Bomrah eeebed8d7b small fix 2014-11-27 18:28:37 +08:00
Harry Bomrah 179a14d717 fixed url target issue 2014-11-27 18:19:43 +08:00
Harry Bomrah 03822379b2 small fix for page render 2014-11-27 18:09:18 +08:00
Harry Bomrah 0623541d94 now only registered websites can update via update manager 2014-11-24 18:21:00 +08:00
rulingcom 466f08d4f6 second check 2014-11-24 18:00:13 +08:00
rulingcom a17a5aeb8b test commit for access check 2014-11-24 16:44:32 +08:00
Harry Bomrah 212f612e3e fixed uri parsing and also some page controller changes 2014-11-21 17:25:02 +08:00
Harry Bomrah d58090816e fix for language 2014-11-20 17:36:37 +08:00
Harry Bomrah 97b4ad95e0 fix for language while creating pages 2014-11-20 17:06:15 +08:00
Harry Bomrah a1df9c5af3 some changes for desktop 2014-11-18 19:08:17 +08:00
Harry Bomrah f3000d1947 added active and survey module templates 2014-11-17 18:20:10 +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
Harry Bomrah 46ec4be6a2 optimization for authorization 2014-11-13 21:50:08 +08:00
Harry Bomrah 58bea99430 fixed authorizations 2014-11-13 19:50:19 +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
rulingcom b5233da7e8 removed script form html sdk 2014-11-13 16:35:29 +08:00
Harry Bomrah f13312ddb6 mod for ad_banner 2014-11-13 16:31:10 +08:00
nccu e1a716f81d alert for page not available in language 2014-11-13 16:24:30 +08:00
spen d836ded7f3 fix member frontend show fields 2014-11-13 11:56:50 +08:00
nccu 7dd20cafa0 update css 2014-11-13 11:22:08 +08:00
rulingcom 63b08335fa sdk changes 2014-11-12 19:00:18 +08:00
Harry Bomrah bbe44022c4 html_safe rendering 2014-11-12 16:17: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
spen fa5ba42034 Add Active Event frontend index page 2014-11-10 10:40:35 +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
Harry Bomrah 3a1fb9c72b fix for pagination and also added data-module in body 2014-11-05 17:25:28 +08:00
Harry Bomrah e73ebe9037 some update for announcement_widget_link template 2014-11-04 15:53:03 +08:00
Harry Bomrah 0e2bd7b71f a small fix for locales for ajax 2014-11-03 20:39:16 +08:00
Harry Bomrah 067f7b18e5 added some method in orbit helper and some mods 2014-11-03 20:00:59 +08:00
Harry Bomrah 2404e117d0 fixed template change script 2014-11-03 14:12:20 +08:00
Harry Bomrah 966b6ec919 added override method for widgets frontend 2014-10-31 13:41:16 +08:00
Harry Bomrah 9da0c9f380 small member fix 2014-10-29 21:27:53 +08:00
Harry Bomrah 9eebd2ff51 store for module store 2014-10-28 19:18:59 +08:00
Harry Bomrah 99305b19ca small fix store 2014-10-28 18:18:06 +08:00
Harry Bomrah eb6a48bc84 small fix 2014-10-28 18:15:10 +08:00
Harry Bomrah 59731acccf UX enhancement for module store 2014-10-28 18:08:23 +08:00
Harry Bomrah 9d42b6fcda store url fix 2014-10-28 17:59:41 +08:00
Harry Bomrah d65df694a5 fixed js for email resend button 2014-10-28 17:56:58 +08:00
Harry Bomrah 75d8c46576 module store 2014-10-28 16:46:11 +08:00
Harry Bomrah 12b38691b0 url change for store 2014-10-27 19:10:42 +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 a81f7576b6 trying to restart the server after language change 2014-10-24 14:49:23 +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 97e8aaea2b fix for no modules and added gotcha for ask module 2014-10-23 17:07:01 +08:00
Harry Bomrah 24b24ad760 fix for member import save.. removed validation 2014-10-22 15:20:43 +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 b4533a1720 fix for upgrading 4.2 to 4.5 2014-10-16 18:35:23 +08:00
Harry Bomrah e27192295d user save bug fixed 2014-10-16 15:14:37 +08:00
Harry Bomrah 1f088692aa new member password restriction removed 2014-10-15 17:13:32 +08:00
Harry Bomrah 1704232814 new json for announcement 2014-10-15 16:10:46 +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 d0781dea4a imported announcements are now by default approved 2014-10-14 17:08:06 +08:00
spen 0507d9d856 add member controller for Excel Import Members 2014-10-14 10:58:32 +08:00
Harry Bomrah 24a07a5780 widget title and page title fixed for page 2014-10-13 18:04:51 +08:00
spen d4df227811 fixed orbit mailer for no file title 2014-10-13 15:25:30 +08:00
spen b33c2d5b38 Excel Import Members 2014-10-13 14:27:01 +08:00
Harry Bomrah 947da85563 fixed sorting problem for memebers 2014-10-09 18:02:42 +08:00
Harry Bomrah f2de4eb0e3 a small fix for no chinese translations 2014-10-08 18:30:54 +08:00
Harry Bomrah f3dd0b8295 modified select scss.. 2014-10-08 17:11:02 +08:00
spen 6af19a2fda Add Survey frontend index page 2014-10-08 09:55:51 +08:00
Harry Bomrah 1467eb039d fixed filemanager.js for urls 2014-10-06 18:43:44 +08:00
Harry Bomrah f630596edc frontend access level bug fix 2014-10-06 18:00:41 +08:00
Harry Bomrah 0bd8680d62 git fixed tag module for taggable 2014-10-03 19:36:41 +08:00
Harry Bomrah e89fd7c30e fix for page date for sdk 2014-10-01 19:37:18 +08:00
Harry Bomrah c0fe4d9b2a fixed a small research file bug in import 2014-10-01 18:08:05 +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
rulingcom a2398ed6d9 added new types for announcment module widgets 2014-09-29 21:26:19 +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 b28597d16a added access level method to orbithelper 2014-09-22 16:34:22 +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 b94f3ca2a1 fixed insert image problem in text for widget 2014-09-16 22:28:48 +08:00
Harry Bomrah 5d6f33c90b added new 404 page and also fixed member import 2014-09-15 15:29:53 +08:00
manson 424d3fa559 fix member first/last name display order for zh_tw 2014-09-12 14:39:38 +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 29c3394873 fix template index page title 2014-09-10 10:17:08 +08:00
manson 84a11d6e67 fix some issue in import_controller 2014-09-05 18:36:37 +08:00
manson 3dafcf37bc rescue import_controller import_status file not found 2014-09-03 18:57:28 +08:00
manson f4635502ef fix announcement template index page-title 2014-09-03 15:00:51 +08:00
Harry Bomrah 883fb31966 added desktop to user 2014-09-02 21:20:13 +08:00
Harry Bomrah ee6456a16a changed assets upload dirctory to public/uploads 2014-09-01 17:58:55 +08:00
Harry Bomrah 8e37fc33f4 changed upload directory to uploaded_assets from assets in public folder 2014-09-01 17:41:11 +08:00
manson a01d68e721 remove template orbit-classic 2014-08-26 16:30:42 +08:00
manson 6851051af5 fix update manager check update 2014-08-20 16:15:49 +08:00
manson 3f15d8102c fix page model assign_page_number method for empty database 2014-08-19 12:17:00 +08:00
manson a8a092a395 fix update manager 2014-08-15 17:47:14 +08:00
manson 39cb82e83d fix site structure main-enable checkboxes 2014-08-15 12:08:43 +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 fb8d36fc35 update for ad_banner 2014-08-14 19:08:25 +08:00
manson 37dae67cbe fix template announcement info.js 2014-08-12 15:39:04 +08:00
manson 04272588d3 hide html element with class name "ui-helper-hidden-accessible" 2014-08-12 12:18:22 +08:00
manson 9d4ed9a6ab Add new widget method for announcement 2014-08-12 11:39:20 +08:00
manson 580d0f26aa fix import_controller missing fields 2014-08-11 20:09:44 +08:00
Harry Bomrah a1fb6ebd68 added template json for title key author 2014-08-11 16:02:58 +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 ced6643246 fix member check_aceess_rights 2014-08-08 18:37:33 +08:00
manson 4be2993a9a fix member edit_password authorization 2014-08-08 18:29:44 +08:00
Harry Bomrah bbc171fc7c desktop mods with new layout stuff 2014-08-08 18:08:26 +08:00
Ray df934ae584 desktop mods 
Conflicts:
	config/routes.rb
 2014-08-08 18:08:26 +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 a52239b135 a small link click bug fixed 2014-08-06 18:37:02 +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
Harry Bomrah e320fa848d authorization completed .. select all button for member select is left 2014-08-05 21:51:05 +08:00
manson 14bfbe2d8a update ModuleApp and OrbitWidget registration 2014-08-05 18:22:36 +08:00
manson 43e1a669d6 fix a Ruby issue 2014-08-05 15:53:08 +08:00
manson 2ca408294e Add link_to_edit for modules frontend(Announcement, Archive, Faq, PageContent) 2014-08-05 14:45:52 +08:00