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 8c2f10e59c authorization fix for create and update of plugins 2015-04-28 17:56:01 +08:00
Harry Bomrah b5d2d7736c authorization fix for create and update of plugins 2015-04-28 17:54:49 +08:00
Harry Bomrah 0d7bae7acc Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-04-28 16:08:33 +08:00
Harry Bomrah 2f58c02ee5 cant select empty value in page parts 2015-04-28 16:07:43 +08:00
Harry Bomrah a20d446283 cant select empty value in page parts 2015-04-28 15:48:15 +08:00
Harry Bomrah ccb9a24861 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-04-27 21:41:27 +08:00
Harry Bomrah f9dcf7db3a removed mobile settings and also removed bundle update from server 2015-04-27 21:40:38 +08:00
Harry Bomrah 083b6ace78 removed mobile settings and also removed bundle update from server 2015-04-27 21:39:46 +08:00
Harry Bomrah a833bfd606 page id cannot be chinese and also some module update fixes 2015-04-27 20:46:01 +08:00
Harry Bomrah 057f689526 page id cannot be chinese and also some module update fixes 2015-04-27 20:45:05 +08:00
Harry Bomrah 7210f46f35 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-04-23 17:21:10 +08:00
Harry Bomrah 0122f5aa23 small fix for member fields display 2015-04-23 17:20:08 +08:00
Harry Bomrah 0380972e5b small fix for member fields display 2015-04-23 17:19:10 +08:00
Harry Bomrah 45f58990f0 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-04-22 23:07:18 +08:00
Harry Bomrah b27467c65d sorting for role status fixed 2015-04-22 23:06:05 +08:00
Harry Bomrah c39ca8c360 sorting for role status fixed 2015-04-22 23:05:17 +08:00
Harry Bomrah 4b6c27de75 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-04-22 22:53:52 +08:00
Harry Bomrah 97912d2d3a now can add or delete fields for the member 2015-04-22 22:53:04 +08:00
Harry Bomrah 997a3afd93 now can add or delete fields for the member 2015-04-22 22:51:30 +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 760404cbd2 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-04-22 16:33:09 +08:00
Harry Bomrah dd5f7ed234 fixed bug in members frontend and also roles and role statuses sorted on key ascending 2015-04-22 16:32:24 +08:00
Harry Bomrah db88b1e553 fixed bug in members frontend and also roles and role statuses sorted on key ascending 2015-04-22 16:30:58 +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
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
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 4ecfb9bf80 fix error for page submit 2015-04-10 18:41:22 +08:00
Harry Bomrah 7e46bde3bc fix error for page submit 2015-04-10 18:38:25 +08:00
Harry Bomrah b2a5e361e8 fix for cache clear on page part submit 2015-04-10 16:35:18 +08:00
Harry Bomrah 1fadefa510 fix for cache clear on page part submit 2015-04-10 16:33:47 +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 0b787a1067 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-03-30 18:14:12 +08:00
Harry Bomrah be61b4488e temp ignore cache 2015-03-30 18:12:23 +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 6d06790159 added expire time to cache. 2015-03-30 15:13:45 +08:00
Harry Bomrah 27222ab6cd small fix for cache 2015-03-30 15:13:37 +08:00
Harry Bomrah 8b2281ca17 now the caching initialized with engine 
Conflicts:
	Gemfile
 2015-03-30 15:12:41 +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 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
rulingcom e1c8d61195 sdk precompile fixed 2015-03-23 17:39:58 +08:00
nccu 4603c8b53f help desinger fix IE8 2015-03-23 17:17:52 +08:00
nccu b0d454f274 help designer IE8 fix 2015-03-23 16:28:42 +08:00
nccu fcbb04ccc5 help designer IE8 fix 2015-03-23 16:12:26 +08:00
rulingcom f9ed19def0 Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into development 2015-03-23 13:25:13 +08:00
nccu 013ba56111 precompile fix and also impressionist fix 2015-03-19 18:42:29 +08:00
Harry Bomrah f52919e4b6 group added 2015-03-19 14:24:40 +08:00
Harry Bomrah 25bf24745c Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-03-18 18:01:00 +08:00
Harry Bomrah 2432a587d5 css mods for archive 2015-03-18 17:59:36 +08:00
rulingcom 20350c4e14 Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into development 2015-03-13 17:13:35 +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
rulingcom 338824a509 addes bootstrap back 2015-03-12 19:06:42 +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
nccu 4870fc5ad3 help designer 2015-03-09 11:12:20 +08:00
Harry Bomrah 9be667d405 removed desktop 2015-03-06 18:03:43 +08:00
rulingcom e045025bc6 precompile fixes for orbit mobile template 2015-03-06 17:59:30 +08:00
rulingcom 7aa187497a sdk changes by joshua wq 2015-03-06 17:21:38 +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
manson 470d1b2405 display calendar 2015-03-06 12:41:51 +08:00
nccu 8d3d086629 fix search word 2015-03-06 12:39:30 +08:00
manson eaa63cc5aa enable calendar 2015-03-06 12:34:54 +08:00
nccu a9e3eaad9d add changed files from 174 2015-03-06 11:48:49 +08:00
nccu 007a46a373 help designer fix 2015-03-06 10:49:48 +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
Harry Bomrah 5773d49218 small fix for datepicker 2015-02-26 14:53:55 +05:30
Harry Bomrah 3e1032f801 fixed date and time for announcement and news 2015-02-26 14:53:55 +05:30
Ray eb21f6535c store css 2015-02-26 15:11:38 +08:00
Ray 5f90be20a2 update Templates storn & Module storn UI 2015-02-26 15:09:42 +08:00
Ray d64dc336a5 use CDN 
change jquery, Bootstrap and font-awesome url to CDN
 2015-02-26 15:06:45 +08:00
Ray aef48fe890 Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into development 2015-02-26 15:01:31 +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
JiangRu 17213fb41f if no data , hide title&table 2015-02-25 11:06:58 +08:00
nccu f41f128154 fix by Designer 2015-02-24 14:19:36 +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 5b570fe8a1 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-01-09 17:44:49 +08:00
spen 92575e01fa fix member plugins 2015-01-09 16:13:17 +08:00