1159375de7
Updated Import to Sync Data for all personal plugins
2013-09-26 18:51:31 +08:00
843775a2c0
Fixed the order in Personal Plugin member show page
2013-09-26 16:39:45 +08:00
1021ac2e9b
Merge branch '0917_ntu_mb' of https://github.com/Rulingcom/orbit into 0917_ntu_mb
2013-09-26 14:46:14 +08:00
ab04070a8e
Updated show to remove test code
2013-09-26 14:45:43 +08:00
5ec011a5ff
Fixed Personal Plugins tabs for en locale
2013-09-26 14:45:43 +08:00
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
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
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
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
79c4cd2075
Fixed Personal Plugins tabs for en locale
2013-09-25 17:07:15 +08:00
2a41e3440e
Fixed Import data to import journal level types, fixed writing journal
2013-09-25 12:58:37 +08:00
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
d5bb2a1889
Updated Books,Conference, Journal to display properly in the frontend
2013-09-24 15:07:49 +08:00
b535f2cf9c
Updated Data import and sync code
2013-09-23 16:18:07 +08:00
f2a27c6b40
Updated Import method in teachers to make all false positives.
2013-09-23 09:52:33 +08:00
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
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
b487740035
Fixed Pagination Errors in member module
2013-09-18 16:11:17 +08:00
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
cd1d4356fb
Updated import data to get complete teacher and announcement data
2013-09-17 11:36:50 +08:00
d5357ea63c
Updated import controller
2013-09-17 11:36:45 +08:00
50bb2a870c
Updated Import data with page data importing successfully
2013-09-17 11:36:41 +08:00
a93945cd45
Updated import data with pages working
2013-09-17 11:36:38 +08:00
249644e72c
Added method for importing page data
2013-09-17 11:36:35 +08:00
f16d1908be
Updated import data controller to import data correctly
2013-09-17 11:36:31 +08:00
c8be884291
Updated import data controller
2013-09-17 11:36:29 +08:00
6280fdfba0
Updated route to get announcement data
...
Conflicts:
config/routes.rb
2013-09-17 11:36:26 +08:00
2a9948868f
Updated import data controller to check the absense of title data
2013-09-17 11:36:24 +08:00
e4514a353a
Updated import data controller to check for blank user_id
2013-09-17 11:36:07 +08:00
d2a07d9ffb
Import Announcements, Journal Paper, Conference Data, book data
...
Conflicts:
app/models/user/user.rb
2013-09-17 11:36:05 +08:00
93909eeca0
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-17 11:36:02 +08:00
Harry Bomrah
e45b7e09a0
half survey module form changed to new ui plus one calendar fix
2013-09-16 12:25:58 +08:00
Harry Bomrah
bd3462df7f
small change left in last commit. commiting for gallery widget
2013-09-16 11:19:24 +08:00
Harry Bomrah
f5f1822f0a
no data file added
2013-09-16 11:19:18 +08:00
Harry Bomrah
d532ded8e4
widget code for gallery rewritten for new_ui
2013-09-16 11:19:11 +08:00
8456a91968
Fix structure edit
2013-09-14 17:26:16 +08:00
ba7ac5d954
Fix [app_name]_category_with_title and change announcement init
2013-09-14 11:54:35 +08:00
9cc1e95cb1
announcement add new widget bulletins_and_links
...
Conflicts:
vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_bulletins.html.erb
2013-09-14 11:52:19 +08:00
saurabhbhatia
Spen
Harry Bomrah
chris