32dbd57d29
Fix filemanager delete url path
2013-10-25 21:29:50 +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
09e0d5bd92
sso for ntu mb all sites
2013-09-26 18:52:32 +08:00
Harry Bomrah
1d0ea6718f
brief added to desktop for all plugins
2013-09-25 18:23:44 +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
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
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
a3f1b8d54a
Updated Preferences in Site Info
2013-09-06 18:00:30 +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
Harry Bomrah
82b6be483a
isotope embedded inside desktop kernel
2013-08-30 10:58:08 +08:00
5591b06ee6
Ask Module for New UI
2013-08-27 12:38:06 +08:00
Harry Bomrah
b004121187
minimize bar updated to new style and more flexible.
2013-08-19 12:59:57 +08:00
Harry Bomrah
6577885761
docx xlsx and pptx file types fixed plus icon provided in edit form for files
2013-08-16 15:49:04 +08:00
Harry Bomrah
a04155963d
all file things are fixed. delete and view and also names
2013-08-14 09:30:48 +08:00
Harry Bomrah
6d54dbd5f8
bilingual for files fixed and description added and also filename display after selecting filenames
...
Conflicts:
app/assets/javascripts/desktop/orbitdesktop.js
2013-08-13 17:22:09 +08:00
cb070cc537
Updated Desktop with fix for forms for all users
2013-08-13 11:51:59 +08:00
6c514770bc
solved conflict for member_new_ui
2013-08-12 15:40:34 +08:00
Harry Bomrah
771ec0b8f6
css fixed for plugins and types and also some other css problem fixed
2013-08-12 12:28:51 +08:00
Harry Bomrah
d0ef862f85
language changes and conferences add/edit bug fixed
2013-08-12 12:28:46 +08:00
Harry Bomrah
b2c3beefe9
icons and colors for themes fixed
2013-08-12 12:28:39 +08:00
Harry Bomrah
55670e6318
icons and theme minicolors fixed
2013-08-12 12:28:32 +08:00
a2e9aa2e0b
Updated ADBanner with fixes on index page, ADImage with fixes
...
Conflicts:
app/views/admin/ad_banners/index.html.erb
app/views/admin/ad_images/_form.html.erb
vendor/built_in_modules/ad_banner/init.rb
2013-08-09 15:21:51 +08:00
Harry Bomrah
e3d9966f76
bugs fixed for plugins. .. and also css fixed
2013-08-06 17:53:04 +08:00
Harry Bomrah
42615f02ea
new feature in desktop for uploading wallpapers or putting url link
2013-08-02 19:32:41 +08:00
0f3a8414be
Delete duplicate js and css
...
Close the form in search in orbit bar
2013-07-31 17:30:53 +08:00
b1755bdc80
Added Stock Backgrounds, Fixed production issue with desktop css
2013-07-30 18:37:36 +08:00
094c0f4314
Updated desktop compatibility to fix css paths
2013-07-30 17:15:55 +08:00
d9079d9d7c
Updated with icons, latest js and css for desktop
2013-07-30 16:43:47 +08:00
aeaec79a2c
new themes, apps and widgets for new ui
2013-07-30 16:43:44 +08:00
55d9aea664
Merged Desktop with New UI
2013-07-30 16:43:38 +08:00
Harry Bomrah
79c7f8e90f
new orbit bar fixed..
...
Conflicts:
app/assets/javascripts/orbit_js_1.0.1-front-end.js
app/assets/stylesheets/basic/orbit_bar.css.erb
app/assets/stylesheets/orbit_bar_bootstrap.css
app/views/layouts/_left_menu.html.erb
app/views/layouts/_orbit_bar.html.erb
app/views/layouts/_right_menu.html.erb
app/views/layouts/desktop.html.erb
2013-07-30 16:43:35 +08:00
Harry Bomrah
f7dbbf1bca
new themes added to desktop plus theme uploader created
2013-07-30 16:43:32 +08:00
Harry Bomrah
5f9190db39
few updates with fb integration and some other changes in user and supports data to android
...
Conflicts:
vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb
2013-07-30 16:43:11 +08:00
ac58b993c2
simple component update
...
minor update
2013-07-30 16:43:09 +08:00
2b12a4775c
Various view update and change #thmbackground tag
2013-07-30 16:43:02 +08:00
b085e826a5
fix loading Section page for Chrome
2013-07-30 16:42:59 +08:00
Manson Wang
saurabhbhatia
Spen
Harry Bomrah
chris
devin chen