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

88 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
rulingcom dd3b4f0384 sdk update for groups and orbit_bootstrap by joshua 2015-06-24 18:09:59 +08:00
rulingcom ed24126648 joshuas update for sdk and grou 2015-06-05 19:05:01 +08:00
rulingcom 25eb95672a joshua mods for calendar accessbility 2015-06-03 18:17:58 +08:00
Harry Bomrah 2508d70883 calendar widget and frontend fix 2015-06-02 17:22:05 +08:00
rulingcom a3033c548b mods by joshua for groups and calendar and etc sdk 2015-06-01 16:15:07 +08:00
rulingcom 017be3eb3d joshua commit for groups, sdk and orbit_bar 2015-05-18 16:26:22 +08:00
Harry Bomrah 95704ed56e Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu 2015-04-30 14:40:03 +08:00
rulingcom 804030751f big commit from joshua for orbit_bootstrap sdk and groups 2015-04-28 18:34:40 +08:00
rulingcom 5aac9b297d merged 2015-04-14 15:31:41 +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 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
rulingcom 338824a509 addes bootstrap back 2015-03-12 19:06:42 +08:00
rulingcom 7aa187497a sdk changes by joshua wq 2015-03-06 17:21:38 +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
JiangRu 17213fb41f if no data , hide title&table 2015-02-25 11:06:58 +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
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 f1acfa34ac template default modified 2015-01-06 15:23:29 +08:00
JiangRu aac9135149 member plugin front page show 2014-12-26 16:23:51 +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 e21ad257ff some changes in sdk for ad_banner 2014-12-18 20:04:38 +08:00
Harry Bomrah 1da348f747 some mods for calendar 2014-12-16 19:34:29 +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
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
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 f3000d1947 added active and survey module templates 2014-11-17 18:20:10 +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
rulingcom 63b08335fa sdk changes 2014-11-12 19:00:18 +08:00
spen fa5ba42034 Add Active Event frontend index page 2014-11-10 10:40:35 +08:00
nccu 2c6bdd4bac nccu branch 2014-11-07 16:06:50 +08:00
Harry Bomrah 1704232814 new json for announcement 2014-10-15 16:10:46 +08:00
spen 6af19a2fda Add Survey frontend index page 2014-10-08 09:55:51 +08:00
rulingcom a2398ed6d9 added new types for announcment module widgets 2014-09-29 21:26:19 +08:00
manson 29c3394873 fix template index page title 2014-09-10 10:17:08 +08:00
manson f4635502ef fix announcement template index page-title 2014-09-03 15:00:51 +08:00
manson 37dae67cbe fix template announcement info.js 2014-08-12 15:39:04 +08:00
manson 9d4ed9a6ab Add new widget method for announcement 2014-08-12 11:39:20 +08:00
manson 2ca408294e Add link_to_edit for modules frontend(Announcement, Archive, Faq, PageContent) 2014-08-05 14:45:52 +08:00
manson ef1dda757a update member index page font size 2014-08-03 20:40:24 +08:00
manson 766b1482b6 Update personal-plugin frontend 2014-08-01 19:51:41 +08:00
manson 69db2e2926 Rewrite member frontend, fix I18n.enforce_available_locales, update CKEditor setting 2014-07-31 15:41:28 +08:00
manson 4de07afb2a update member import,frontend,structure 
member frontend order is hard-coded
 2014-07-29 11:21:27 +08:00
Ray cc54f7f908 selecting interface for edit and add and module page is done. 2014-07-28 20:33:51 +08:00