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

81 Commits

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 cfda81a546 added site bar settings for logo and title in frontend, fixed role status disbale enable and also added br to text area 2015-06-05 18:55:28 +08:00
Harry Bomrah 451176b068 text with number of counts 2015-05-13 15:36:42 +08:00
Harry Bomrah 7180b94bd6 fix language sitemap name 2015-05-05 20:03:09 +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 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 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 25c612ac9e modified debugging for frontend 2015-04-17 15:54:32 +08:00
Harry Bomrah 54eb8ee766 debug added for modules and widgets frontend 2015-04-15 13:39:46 +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 a481be0694 rails menu cache removed 2015-04-14 16:57: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
manson 3262359911 update impression and add cache for page sub-parts, main-menu 2015-03-30 15:11:26 +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 4575fce2a9 counter added and also some changes for store 2014-12-26 16:55:28 +08:00
Harry Bomrah 84308c3d10 category enhancements 2014-12-10 18:13:51 +08:00
Harry Bomrah 05852ed09f category enhancements 2014-12-09 22:00: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 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 212f612e3e fixed uri parsing and also some page controller changes 2014-11-21 17:25:02 +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
Harry Bomrah bbe44022c4 html_safe rendering 2014-11-12 16:17:08 +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 c2fe693ceb date formating made easy for designers and also sitemap style changed 2014-10-01 16:12:38 +08:00
manson a8a092a395 fix update manager 2014-08-15 17:47:14 +08:00
manson 5f50d59333 fix switch_language 2014-08-08 11:46:21 +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
Harry Bomrah 6bb2708b82 now the external links open in new browser window and internal links open in same window. also now internal links are independent of the host 2014-07-16 18:49:38 +08:00
Harry Bomrah 32c6975f76 made frontend kernel more stable .. now should not break in any case 2014-07-16 17:12:23 +08:00
Harry Bomrah 9b42eb4e8b added html_safe 2014-07-16 15:25:02 +08:00
Harry Bomrah ab97083408 added rescue 2014-07-16 15:23:27 +08:00
Harry Bomrah 0cca5ec1b2 added a msg for module frontend problem 2014-07-16 15:21:51 +08:00
Harry Bomrah 6f3e951ba8 now page will render not give 500 error if controller doesnt send anything back 2014-07-16 15:12:41 +08:00
Harry Bomrah e00ec26409 book import complete with mobile page enable and disable 2014-07-11 21:07:47 +08:00
manson 1492e6e9e8 Add zh_cn, working but it's hard code 2014-07-09 10:05:02 +08:00
manson 91e8d87d59 rescue nil for render_google_analytics 2014-07-08 15:00:59 +08:00
manson 60aef1426a Render google analytics 2014-07-07 16:18:52 +08:00
Harry Bomrah 823aafd819 fixed chinese issue of site title 2014-06-30 18:08:48 +08:00
Harry Bomrah 3155c44a5e site title now rendering from site info with page title 2014-06-30 17:11:41 +08:00
Saurabh Bhatia e8c9d6b036 member module fixes for frontend,personal plugin frontend 2014-06-25 13:27:34 +08:00