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

63 Commits

Author SHA1 Message Date
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 9be667d405 removed desktop 2015-03-06 18:03: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
Harry Bomrah e824e23e0a Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 2015-01-09 17:32:06 +08:00
spen 92575e01fa fix member plugins 2015-01-09 16:13:17 +08:00
Harry Bomrah da06328013 Merge branch 'development' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 2015-01-08 23:05:22 +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 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
Harry Bomrah f9f4224a5b calendar removed from built in 2014-12-19 16:36:44 +08:00
Harry Bomrah 6e7b737b47 added calendar to built in extensions 2014-12-17 20:29:00 +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 fc90ab47a4 activity and survey removed by default 2014-11-24 14:06:47 +08:00
Harry Bomrah 57681de065 added spens module to gem file 2014-11-20 17:13:25 +08:00
Harry Bomrah 97b4ad95e0 fix for language while creating pages 2014-11-20 17:06:15 +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 966b6ec919 added override method for widgets frontend 2014-10-31 13:41:16 +08:00
Harry Bomrah ddb457baab fix 2014-10-08 18:57:40 +08:00
Harry Bomrah a32e644297 fixed built_in_extension for desktop 2014-10-08 18:52:53 +08:00
Harry Bomrah 55483420cb builtinextension modified. 2014-09-15 15:34:30 +08:00
Harry Bomrah 5d6f33c90b added new 404 page and also fixed member import 2014-09-15 15:29:53 +08:00
manson 3609fab32a update built_in_extensions git url to http 2014-08-19 12:05:20 +08:00
manson b098904192 fix built_in_extensions.rb 2014-08-08 18:32:09 +08:00
Ray df934ae584 desktop mods 
Conflicts:
	config/routes.rb
 2014-08-08 18:08:26 +08:00
Harry Bomrah 879c84fd16 a small fix for module without categories and built in extension 2014-07-31 17:17:40 +08:00
Harry Bomrah 399b519bea authorizations for users done 2014-07-31 16:48:59 +08:00
manson 911976078b Add personal research plugin 2014-07-04 15:19:15 +08:00
manson 294bd2b48e Add personal project plugin 2014-07-04 14:15:54 +08:00
manson 9e5d0af3bd Add personal patent plugin 2014-07-04 11:50:08 +08:00
manson 6655969ecf Added Personal Lab plugin 2014-07-03 19:36:06 +08:00
Harry Bomrah 31326a49d7 added book plugin in built in extension 2014-07-03 18:36:04 +08:00
manson d2a3f428ae added personal_honor 2014-07-02 17:44:38 +08:00
manson 2d1db840c1 Added personal_experience 2014-07-02 15:31:06 +08:00
manson 1610125109 Added personal diploma plugin 2014-07-02 11:57:15 +08:00
manson 8d8bb6a1d5 Update personal plugin 2014-07-01 18:21:32 +08:00
Harry Bomrah 9cb35af4ad new widget breadcrumb and small bug fixed in import pages 2014-06-27 17:08:03 +08:00
Harry Bomrah 9b958354c2 added widget support for orbit.. now have the ability to install widgets from store 2014-06-26 19:14:46 +08:00
Saurabh Bhatia c86fb8f011 fixed built in extension 2014-06-18 16:11:05 +08:00
Saurabh Bhatia 710d1a1106 removed I18n variable 2014-06-18 15:50:59 +08:00
Saurabh Bhatia 50b97efc46 Member Plugin personal plugins 2014-06-12 18:35:02 +08:00
Saurabh Bhatia 6ec300813d added book to personal plugin 2014-06-04 17:41:30 +08:00
Saurabh Bhatia bc4b687c42 Personal Plugin Registration 2014-06-04 16:46:29 +08:00
manson 264a70e8f2 Fix built_in_extensions.rb 2014-06-03 19:29:18 +08:00
manson b1fe5264ce Import Archive from RSS2 and basic Import UI 2014-06-03 19:27:34 +08:00
Harry Bomrah f220130f88 finished widget more and item links .. made method in orbit helper.. now the method finds best suitable page for the item in widget. 2014-05-24 19:35:06 +08:00
Harry Bomrah cb4b3a4d52 built in extension 2014-05-23 14:23:17 +08:00
Harry Bomrah d7107f02f4 change in parser and widget rendering completed with also lot of changes in kernel 
Conflicts:
	app/helpers/orbit_helper.rb
 2014-05-22 19:26:50 +08:00
Harry Bomrah 2fdc99dfbd brand new parser for orbit 4.5 and some other changes 2014-05-14 19:47:25 +08:00
Harry Bomrah 63fcca1a90 added template for faq 2014-05-08 15:40:16 +08:00