developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,263 Commits 86 Branches 21 Tags 58 MiB
Commit Graph

3263 Commits

Author SHA1 Message Date
saurabhbhatia db00b8c2b6 Fixed Sync multiple redirect issue 2013-09-27 16:22:47 +08:00
saurabhbhatia 4b56866d23 Updated file name in writing conferences front end 2013-09-27 15:09:18 +08:00
saurabhbhatia 8ec129f559 Updated order for zh_tw translation 2013-09-27 14:36:06 +08:00
chris a6b47d9e72 Fix for user order 2013-09-27 12:49:11 +08:00
Harry Bomrah fd77230247 email hide show facility available 2013-09-27 12:34:43 +08:00
saurabhbhatia 250a03f074 Fixed order of Teacher Show page 2013-09-27 12:02:28 +08:00
saurabhbhatia 471987f800 Merge branch 'development' of https://github.com/Rulingcom/orbit into 0917_ntu_mb 
Conflicts:
	vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/show.html.erb
 2013-09-27 11:10:07 +08:00
Spen 9186978551 new ui member plugin sort fix and user show avatar fix 2013-09-27 11:04:52 +08:00
Harry Bomrah 9a03e7a6b2 added sync for journal paper books and conference.. and also disabled the icons 2013-09-26 22:29:21 +08:00
saurabhbhatia 096aec3406 Merge branch 'development' of https://github.com/Rulingcom/orbit into 0917_ntu_mb 
Bring Development Related Changes to ntu_mb
 2013-09-26 20:31:46 +08:00
chris 622534e5db Fix user order: 
- gender color
 - add cancel button for input
 2013-09-26 20:18:34 +08:00
Harry Bomrah 52c896d8c5 some backend code change for sharing personal plugin module content. Added sharing in desktop for all the modules. 2013-09-26 20:11:45 +08:00
Spen 028c689739 Change User.all to User.not_guest_user 2013-09-26 19:46:14 +08:00
chris f81894af90 User ordering 
Run the task new_ui:save_users
 2013-09-26 19:00:13 +08:00
Spen 09e0d5bd92 sso for ntu mb all sites 2013-09-26 18:52:32 +08:00
saurabhbhatia 1159375de7 Updated Import to Sync Data for all personal plugins 2013-09-26 18:51:31 +08:00
Manson Wang dc3593c162 zh-tw for new ui 2013-09-26 17:13:17 +08:00
saurabhbhatia 843775a2c0 Fixed the order in Personal Plugin member show page 2013-09-26 16:39:45 +08:00
Manson Wang 16c26e3273 Fix path of jquery.cycle.all.latest.js 2013-09-26 16:11:08 +08:00
saurabhbhatia 1021ac2e9b Merge branch '0917_ntu_mb' of https://github.com/Rulingcom/orbit into 0917_ntu_mb 2013-09-26 14:46:14 +08:00
saurabhbhatia ab04070a8e Updated show to remove test code 2013-09-26 14:45:43 +08:00
saurabhbhatia 5ec011a5ff Fixed Personal Plugins tabs for en locale 2013-09-26 14:45:43 +08:00
Spen cd8448d447 Add Brief intro. for all personal plugins 
Add Share Setting for Personal Plugins ( if have old data must be add default value "field: is_hidden => false " )
Apply New UI to Member Plugin Edit Page
Personal Plugin Summary fix
Academic Info. list fix

Updated Import method in teachers to make all false positives.

Updated Data import and sync code

Updated Books,Conference, Journal to display properly in the frontend

Journal title being imported correctly now

Fixed Import data to import journal level types, fixed writing journal
 2013-09-26 14:45:43 +08:00
saurabhbhatia 7990d4388c Import Announcements, Journal Paper, Conference Data, book data 
Conflicts:
	app/models/user/user.rb

Updated import data controller to check for blank user_id

Updated import data controller to check the absense of title data

Updated route to get announcement data

Conflicts:
	config/routes.rb

Updated import data controller

Updated import data controller to import data correctly

Added method for importing page data

Updated import data with pages working

Updated Import data with page data importing successfully

Updated import controller

Updated import data to get complete teacher and announcement data
 2013-09-26 14:45:42 +08:00
saurabhbhatia 367cf67928 Get data from database 
Conflicts:
	app/controllers/admin/import_data_controller.rb

Conflicts:
	app/controllers/admin/import_data_controller.rb
	app/views/admin/import_data/get_teacher_data.html.erb
 2013-09-26 14:45:42 +08:00
Harry Bomrah e7c04c6e6e small add question fix for survey module. 2013-09-26 09:33:25 +08:00
Harry Bomrah 6ac600fb5c brief added to desktop for all plugins 2013-09-26 09:33:18 +08:00
Harry Bomrah 42dcf0a2d2 survey edit completed 2013-09-26 09:33:10 +08:00
Harry Bomrah c35d42d671 external links and link widget fixed for development 2013-09-26 09:33:01 +08:00
Harry Bomrah 5332162646 small add question fix for survey module. 2013-09-26 09:31:52 +08:00
Harry Bomrah 1d0ea6718f brief added to desktop for all plugins 2013-09-25 18:23:44 +08:00
saurabhbhatia 6fc47d7afd Updated show to remove test code 2013-09-25 17:33:05 +08:00
Harry Bomrah 04ff345b94 survey edit completed 2013-09-25 17:29:38 +08:00
saurabhbhatia 79c4cd2075 Fixed Personal Plugins tabs for en locale 2013-09-25 17:07:15 +08:00
saurabhbhatia 2a41e3440e Fixed Import data to import journal level types, fixed writing journal 2013-09-25 12:58:37 +08:00
saurabhbhatia e29b08d0dc Journal title being imported correctly now 2013-09-24 17:13:00 +08:00
Harry Bomrah 58fb2d1c73 external links and link widget fixed for development 2013-09-24 15:37:40 +08:00
saurabhbhatia d5bb2a1889 Updated Books,Conference, Journal to display properly in the frontend 2013-09-24 15:07:49 +08:00
saurabhbhatia b535f2cf9c Updated Data import and sync code 2013-09-23 16:18:07 +08:00
saurabhbhatia f2a27c6b40 Updated Import method in teachers to make all false positives. 2013-09-23 09:52:33 +08:00
Spen 9613a52305 Add Brief intro. for all personal plugins 
Add Share Setting for Personal Plugins ( if have old data must be add default value "field: is_hidden => false " )
Apply New UI to Member Plugin Edit Page
Personal Plugin Summary fix
Academic Info. list fix
 2013-09-18 18:56:36 +08:00
Spen a067bcd304 Add Brief intro. for all personal plugins 
Add Share Setting for Personal Plugins ( if have old data must be add default value "field: is_hidden => false " )
Apply New UI to Member Plugin Edit Page
Personal Plugin Summary fix
Academic Info. list fix
 2013-09-18 18:55:40 +08:00
saurabhbhatia b487740035 Fixed Pagination Errors in member module 2013-09-18 16:11:17 +08:00
saurabhbhatia dc8815d619 Fixed Pagination Errors in member module 2013-09-18 16:10:39 +08:00
Harry Bomrah b5b416d531 add page completed with attributes and reordering 2013-09-18 12:27:01 +08:00
Harry Bomrah f27f96b994 commit for survey questions 2013-09-18 12:26:52 +08:00
Harry Bomrah 1e3cffee0a add page completed with attributes and reordering 2013-09-17 15:34:34 +08:00
Harry Bomrah e4a16eab3a commit for survey questions 2013-09-17 15:34:23 +08:00
saurabhbhatia cd1d4356fb Updated import data to get complete teacher and announcement data 2013-09-17 11:36:50 +08:00
saurabhbhatia d5357ea63c Updated import controller 2013-09-17 11:36:45 +08:00