Harry Bomrah
fbea249782
jquery update and also fixed app manager bug .. jquery updated to 1.10.2 and jquery ui updated to 1.10.0 .. gem jquery-rails vs 2.1.4 changed to 3.0.4 and jquery-ui-rails changed to 4.0.5
2013-10-16 09:37:33 +08:00
11b880752d
Fix Ad_Banner backend refresh page after edit banner
2013-10-15 19:50:01 +08:00
76ba7087b2
Fix Ad_Banner frontend for IE8
...
Fix backend bug in editing banner
Translation Added
2013-10-15 19:37:12 +08:00
5fb3731430
Show Custom orbit bar icon only for frontend and desktop
2013-10-15 10:07:46 +08:00
fb34dc673f
Changeable Orbitbar logo
2013-10-14 18:20:26 +08:00
4120be6f8e
fixes in sitemap, site preference
2013-10-14 16:48:50 +08:00
55fa1cef4f
Added Enable and disable terms of use, sitemap
2013-10-11 13:14:37 +00:00
5c8a57e700
Fixed Sitemap Toggle
2013-10-09 09:06:21 +00:00
315a24556c
Fix parser common to skip not found module_app
...
Do not show default widget if there's no data
2013-10-08 16:42:20 +08:00
cf7f7aa29c
Fix tag page slide issues
2013-10-08 12:47:31 +08:00
21db2a2cba
Drag and drop to reorder users
2013-10-07 15:53:54 +08:00
1194bdd9b4
Updated Sitemap with UI fixes - checkbox tag pending
2013-10-07 15:05:50 +08:00
940a915125
Updated Sitemap with new UI
2013-10-07 09:43:47 +08:00
792785f7ba
Fix relation for Ad_banner and Ad_image
...
Update site.rake for New UI
2013-10-04 19:20:04 +08:00
ba8da9b6bb
Updated button class in template form
2013-10-04 14:41:48 +08:00
ff93670949
Updated template editing
2013-10-04 14:41:31 +08:00
08907aa8c1
Search Engine Preferences complete
2013-10-02 15:23:12 +08:00
433c8d5da6
Fix link in category for authorization, fix update of auth users
2013-10-02 12:18:20 +08:00
9bdb633157
Updated with UI Changes
2013-10-01 17:39:21 +08:00
Harry Bomrah
0a9fd6a4b5
some needed changes in api for desktop
2013-09-30 16:59:50 +08:00
9186978551
new ui member plugin sort fix and user show avatar fix
2013-09-27 11:04:52 +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
f81894af90
User ordering
...
Run the task new_ui:save_users
2013-09-26 19:00:13 +08:00
16c26e3273
Fix path of jquery.cycle.all.latest.js
2013-09-26 16:11:08 +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
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
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
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
3123c5de0a
new ui member bug and interface fix
2013-09-02 11:22:17 +08:00
e75873273c
Updated Gallery with authorizations
2013-08-22 16:25:11 +08:00
4078d426a6
new ui personal front_end page(member app) & users_new_interface show sub_roles fix
2013-08-21 14:13:36 +08:00
c474fa063f
New authorization
2013-08-21 13:42:29 +08:00
21a7b5da5c
Icons for sidebar
2013-08-19 17:13:36 +08:00
Harry Bomrah
b004121187
minimize bar updated to new style and more flexible.
2013-08-19 12:59:57 +08:00
7dfd5d7e00
Generate Breadcrumb for only for modules where module_apps are clearly defined
2013-08-19 09:39:45 +08:00
6c514770bc
solved conflict for member_new_ui
2013-08-12 15:40:34 +08:00
7c64e8c637
Updated AdBanner index page and Ad Image index page, and edit pages
...
Conflicts:
vendor/built_in_modules/ad_banner/config/locales/en.yml
vendor/built_in_modules/ad_banner/init.rb
2013-08-09 15:22:06 +08:00
e14cb3c74c
Updated adimage home page
2013-08-09 15:22:00 +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
c2f223b82c
new plugins added for desktop
2013-08-06 17:52:39 +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
d632439f80
Add class for Ray's check-box
...
Fix some typos
Change the default index for auth
Add some hard code in object_auth.rb to handle page_context
A user cannot select himself in authorisation
2013-07-31 00:08:15 +08:00
b1755bdc80
Added Stock Backgrounds, Fixed production issue with desktop css
2013-07-30 18:37:36 +08:00
7e67d389b9
Added new orbit bar to compatibility page
2013-07-30 17:15:57 +08:00
e12b14311e
Updated Desktop with new UI
2013-07-30 16:43:41 +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
6d89eab98a
desktop final fix
2013-07-30 16:43:28 +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
Harry Bomrah
ed22a4d303
apps update -- app upload and activation
2013-07-30 16:42:50 +08:00
f2ada14b7a
app manager's view update
2013-07-30 16:42:46 +08:00
9963395b05
'select2' minor update
...
Conflicts:
app/assets/Archive/stylesheets/admin/add_attribute_field.js.erb.bak
2013-07-30 16:42:40 +08:00
4ae1fe68cd
app manager view update
2013-07-30 16:42:33 +08:00
Harry Bomrah
2d616ab7a8
solved desktop conflict during cherry pick
2013-07-30 16:42:26 +08:00
874819266d
minor update
2013-07-30 16:42:23 +08:00
3ded19016a
apps setting view
2013-07-30 16:42:20 +08:00
Harry Bomrah
9478bb13e2
search fixed again according to devin requirements
2013-07-30 16:42:14 +08:00
Harry Bomrah
cff77fbee5
new search for app manager and few javascript fixes
2013-07-30 16:42:11 +08:00
Harry Bomrah
b70310c6fe
tiny scrollbar update
2013-07-30 16:41:25 +08:00
4215ed5538
minor update
2013-07-30 16:41:16 +08:00
74b2bbf4b7
Fix link in structure when the item is a link
...
Add internal links creation
2013-07-30 11:49:28 +08:00
c85629d3b3
Fix controller js and css loading error
2013-07-30 11:48:14 +08:00
af98f8efce
Fix orbit bar language change
2013-07-29 19:49:07 +08:00
ff59feb2e7
Fix for structure
2013-07-29 18:46:38 +08:00
f332a3191a
Fiix layout for safari
2013-07-29 17:34:29 +08:00
d190a50046
Breadcrumb for dashboard (tags and categories cannot link to original module index)
2013-07-29 17:34:03 +08:00
fe10cc62d9
Fix structure title (page slide)
2013-07-29 14:59:02 +08:00
d434b878a7
Add default delete modal usage:
...
- <%= render 'layouts/delete_modal', delete_options: {title: '', warning: '', cancel: '', submit: '' } %>
- in default index, just set title, warning, cancel and submit in quick_edit if needed
2013-07-29 14:29:37 +08:00
0be8a74fa8
Fix missing condition in index auth
2013-07-25 17:45:39 +08:00
da1d70efcb
Change authorization to accept other than category
2013-07-25 17:36:55 +08:00
fe82427baa
Ray's changes for css and js
2013-07-22 16:31:44 +08:00
408bebaa4b
Ray's changes in structure
2013-07-22 14:06:58 +08:00
856898016b
New UI changes(tags, categories, authorisations, module index…)
...
To run:
- ruby lib/remove_old_tags.rb DB_NAME
- rake new_ui:migrate_tags
- rake new_ui:migrate_categories['APP_KEY,''MODEL_NAME'] (check new_ui.rake for more details)
2013-07-02 16:46:44 +08:00
e20df41db5
add user log link at site page
2013-06-14 15:24:04 +08:00
e68793afc3
Fix tag delete
2013-06-14 15:23:45 +08:00
8c1e65994a
Merge branch 'clean_development' into lukas/picked_ques
2013-06-06 19:08:59 +08:00
adc15951bb
questionnaire stuff
...
Conflicts:
vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
2013-06-06 18:29:58 +08:00
6b8b749b0f
fix chris tag cloud
2013-06-06 17:18:42 +08:00
Harry Bomrah
Manson Wang
saurabhbhatia
chris
Spen
Matt K. Fu
devin chen
rulingcom
iCross