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

419 Commits

Author SHA1 Message Date
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