b415b23db2
sso server for ntu mb server site
2013-09-27 12:49:52 +08:00
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
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
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
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
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
028c689739
Change User.all to User.not_guest_user
2013-09-26 19:46:14 +08:00
f81894af90
User ordering
...
Run the task new_ui:save_users
2013-09-26 19:00:13 +08:00
09e0d5bd92
sso for ntu mb all sites
2013-09-26 18:52:32 +08:00
1159375de7
Updated Import to Sync Data for all personal plugins
2013-09-26 18:51:31 +08:00
16c26e3273
Fix path of jquery.cycle.all.latest.js
2013-09-26 16:11:08 +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
1d0ea6718f
brief added to desktop for all plugins
2013-09-25 18:23:44 +08:00
Harry Bomrah
58fb2d1c73
external links and link widget fixed for development
2013-09-24 15:37:40 +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
Harry Bomrah
e4a16eab3a
commit for survey questions
2013-09-17 15:34:23 +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
8456a91968
Fix structure edit
2013-09-14 17:26:16 +08:00
Harry Bomrah
789e02e313
ad_banner banner load fixed for test site
2013-09-13 14:23:44 +08:00
17d7912e07
Ray's js code for status in form
2013-09-11 19:24:58 +08:00
911cfdc980
Move js into a file for status in form
2013-09-11 18:38:56 +08:00
Harry Bomrah
579bc3c245
some very small fix for image alternative text and browse files manager
2013-09-11 14:03:25 +08:00
Harry Bomrah
8c98645a69
small bug fix for inserting and delete button.
2013-09-11 14:03:19 +08:00
Harry Bomrah
9e10a3c944
editing for the assets are done with replacable files and description
2013-09-11 14:03:13 +08:00
Harry Bomrah
f920a4f6ba
filemanager and some update for file uploader . added file uploader to kernel
2013-09-11 14:03:06 +08:00
3328a41b55
Put back js that was deleted by mistake
2013-09-11 14:01:06 +08:00
06203d27b9
Fix for user and role relationship
2013-09-11 14:00:41 +08:00
865be29b37
Updated Preference Page
2013-09-09 11:29:46 +08:00
0eeb7db1a8
Updated preference UI
2013-09-09 11:02:58 +08:00
7216676c40
Updated Sidebar and Preferences
2013-09-09 10:18:14 +08:00
fa857cfeea
Default Locale
2013-09-06 18:00:36 +08:00
a3f1b8d54a
Updated Preferences in Site Info
2013-09-06 18:00:30 +08:00
e9d6fa8787
Preference Page
2013-09-06 18:00:28 +08:00
6e032a8757
Add Preference and search engine
2013-09-06 18:00:23 +08:00
1558cfdb4e
Updated Sitebar with Search Engine
2013-09-06 18:00:21 +08:00
9e4686a565
Fixed Site Info completely and added search engine page
2013-09-06 18:00:18 +08:00
fef7cc4ed2
Updated Site info
2013-09-06 18:00:10 +08:00
7f0821ea84
Updated Site info page to new ui
2013-09-06 17:59:56 +08:00
2c0761aafb
Updated Sitemap to New UI
2013-09-06 17:59:54 +08:00
1e5ad750cd
Updated Site bar with correct links
2013-09-06 17:59:43 +08:00
00ddd94314
fix design index
2013-09-03 15:20:48 +08:00
8045a18230
Change modal delete to take an "remote" option
2013-09-03 15:04:05 +08:00
81a89d2d7c
new ui member image js fix
2013-09-02 14:37:35 +08:00
Harry Bomrah
4209356e9d
new features in gallery image view.. and also tags for gallery completed.
2013-09-02 11:23:01 +08:00
3123c5de0a
new ui member bug and interface fix
2013-09-02 11:22:17 +08:00
Spen
chris
Harry Bomrah
saurabhbhatia
Manson Wang
Matt K. Fu