1d32552b51
Add missing effect to banner
2013-10-19 19:54:37 +08:00
9e74d6d47b
Add missing js and css for mobile and fix ad_banner
2013-10-19 19:35:33 +08:00
7353b48212
Finalize ad_banner changes: front-end, back-end, mobile
2013-10-19 19:17:59 +08:00
fea86ba3a9
Page slide does not reload from server for ad_banner
2013-10-19 19:17:24 +08:00
92d2af13f2
changes for ad_banner
2013-10-19 19:17:04 +08:00
68a379f8a4
Some fixes for tags: authorization, translation…
...
can_use now takes all the open_for into account
2013-10-19 19:14:31 +08:00
d2602a3a84
Change code for new page slide.js
...
Conflicts:
app/views/admin/pages/_form.html.erb
2013-10-19 19:14:14 +08:00
f694134150
Remove useless code
...
Add data-title
2013-10-19 19:14:07 +08:00
00e9a5df5b
new ui member settings account data
...
Conflicts:
app/controllers/admin/users_new_interface_controller.rb
app/views/admin/users_new_interface/show.html.erb
config/locales/en.yml
config/routes.rb
2013-10-18 22:28:27 +08:00
32c1defba0
Updated Site Preferences Templates
2013-10-18 20:03:58 +08:00
14d2b0cc76
fix new ui member account privilege
2013-10-18 19:52:36 +08:00
3e491380cd
Revert "new ui member settings account data"
...
This reverts commit e1f4ee464b
2013-10-18 19:51:02 +08:00
e1f4ee464b
new ui member settings account data
2013-10-18 19:12:27 +08:00
14fea3638f
Updated with some locale fixes in site preferences
2013-10-18 15:26:41 +08:00
a67be030c5
Fix JS Path
2013-10-17 11:21:46 +08:00
a76164465e
Fix editing a tag module
2013-10-16 23:34:51 +08:00
d2459f42c0
Added Favicon and default image for orbitbar
2013-10-16 18:50:22 +08:00
155039ac16
Updated fixes for site info - desktop openess, title always displayed
2013-10-16 18:33:57 +08:00
2bcecc322e
Update Ad_Banner for new jQuery
...
Removed loading module.js in module_widget.html.erb
2013-10-16 12:28:21 +08:00
Harry Bomrah
df5cda7a98
new feature added for not loading submenus inside api for desktop
2013-10-16 09:37:39 +08:00
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
279ac774d4
Migrate form old ui to new ui (categories, tags and authorizations)
2013-10-15 23:38:44 +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
96c3be68f7
Fixed Enable and Disable, Sitemap and Terms of Use for header and footer
2013-10-15 10:37:49 +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
08a8d668ec
Display de page contexts in the mobile version as set in structure
2013-10-08 18:11:29 +08: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
cce68beff1
Quick fix for front end reloading
2013-10-08 14:52:24 +08:00
cf7f7aa29c
Fix tag page slide issues
2013-10-08 12:47:31 +08:00
5328a26440
Fix structure position
2013-10-08 12:33:24 +08:00
fe1869199e
Fix typo, it wasn't executing the filtering on tags
2013-10-07 19:01:59 +08:00
061225f56c
Override mongoid-tree callback condition for default position
2013-10-07 18:23:54 +08:00
b3e16ce23b
Updated desktop widgets controller
2013-10-07 18:13:55 +08:00
fad191aefe
Updated Desktop Inheritence class
2013-10-07 17:47:13 +08:00
48aa7ed638
Update rake for resetting position
...
Fix codemirror css
2013-10-07 16:23:07 +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
831bd722b8
Fix site preference openness problem
2013-10-07 14:37:52 +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
43cf6b70b7
Fix structure reorder position
2013-10-04 15:07:24 +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
31b55a0635
Revert "Updated Orbit js to latest version"
...
This reverts commit b18e61a6c0
2013-10-02 12:32:45 +08:00
433c8d5da6
Fix link in category for authorization, fix update of auth users
2013-10-02 12:18:20 +08:00
b18e61a6c0
Updated Orbit js to latest version
2013-10-02 12:09:44 +08:00
4fe2e31f0e
Updated Global css to fix the line height
2013-10-01 17:51:07 +08:00
31e4fb9f39
Updated sidebar line height
2013-10-01 17:47:58 +08:00
9bdb633157
Updated with UI Changes
2013-10-01 17:39:21 +08:00
Harry Bomrah
caca264b50
isotope fixed for all plugins for list and form.
2013-10-01 15:06:49 +08:00
Harry Bomrah
2f673b20ad
disabling changes in desktop, missed out in last one
2013-09-30 17:25:02 +08:00
Harry Bomrah
0a9fd6a4b5
some needed changes in api for desktop
2013-09-30 16:59:50 +08:00
dfec6f7642
Fix for user order
2013-09-27 12:46:19 +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
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
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
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
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
b970ea1e0e
Updated Authorization for member, link, tag, archive
2013-08-27 10:14:39 +08:00
45e987d6f5
Fix for authorization
...
Dashboard and page authorisation
2013-08-23 12:08:33 +08:00
53e5c57970
Commented Dashboard Public Visibility and fall back on no-filter defined authorization
2013-08-22 16:43:11 +08:00
e75873273c
Updated Gallery with authorizations
2013-08-22 16:25:11 +08:00
4c217ec12f
Updated Authorizations for Adbanner, Calendar, Location
2013-08-22 15:20:50 +08:00
452da1b8ec
Updated Desktop Themes controller
2013-08-22 14:14:19 +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
d24bd176cc
Changes in datetimepicker to accepts formats in options
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
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
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
e3d9966f76
bugs fixed for plugins. .. and also css fixed
2013-08-06 17:53:04 +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
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
e12b14311e
Updated Desktop with new UI
2013-07-30 16:43:41 +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
6d89eab98a
desktop final fix
2013-07-30 16:43:28 +08:00
Harry Bomrah
38194311ab
some changes again
2013-07-30 16:43:18 +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
ff375f0c5c
minor update
2013-07-30 16:42:56 +08:00
3cde26ca4a
gridster update
2013-07-30 16:42:53 +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
Harry Bomrah
66582fb671
fixed saving of positions of the tiles again
2013-07-30 16:42:36 +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
ad68f63a7a
style for checkbox, radio button
2013-07-30 16:41:58 +08:00
Harry Bomrah
20521dc8b0
removing duplicate code from js file
2013-07-30 16:41:54 +08:00
a458a50e97
publication's view update
2013-07-30 16:41:48 +08:00
Harry Bomrah
ae8033ea1b
duplicate error fixed and css inside widgets fixed, duplicate location fixed
2013-07-30 16:41:44 +08:00
Harry Bomrah
dc94283af9
duplicate error fixed and css inside widgets fixed, duplicate location fixed
2013-07-30 16:41:38 +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
0c208d0020
Remove some css causing errors in precompile
...
Remove the image in announcement index
Set the db to test_site
2013-07-25 13:15:49 +08:00
1dc7884ec0
Changes for default index:
...
- remove approvable and filterable
- add display_option
- change params
Update web link and gallery index
2013-07-25 11:32:25 +08:00
Harry Bomrah
57a64dc378
mini colors in new ui fixed
2013-07-23 12:12:46 +08:00
0d0f85e7ad
Fix tooltip in form
...
Change form_file
2013-07-22 20:54:40 +08:00
5d3bc07488
archive and web_resouce for new ui
...
Conflicts:
app/assets/stylesheets/lib/main-forms.css
2013-07-22 18:14:33 +08:00
1ba1703e90
Fix get_viewable
2013-07-22 17:41:52 +08:00
6cf249ccfb
Change ckeditor gem and kaminari in gemfile
2013-07-22 17:26:32 +08:00
92faeccdb6
Revert change in main-form and change class name of form_file
2013-07-22 17:24:58 +08:00
5284571300
Add tooltip to bulletin form and remove file
2013-07-22 16:55:02 +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
c8292a7619
Updated zh_tw translation for sidebar labels
...
Conflicts:
vendor/built_in_modules/location/config/locales/zh_tw.yml
2013-07-22 12:17:31 +08:00
7ea9945af0
Location - category fixes
...
Conflicts:
app/models/category.rb
vendor/built_in_modules/location/init.rb
2013-07-22 12:17:29 +08:00
109b891b27
Merge branch 'development' of https://github.com/Rulingcom/orbit into development
2013-07-19 17:39:55 +08:00
1db324d1a2
Fix get_sorted_and_filtered
2013-07-19 17:38:43 +08:00
5190c1160a
Fix get_sorted_and_filtered, accepts 3 arguments and works for category
2013-07-16 14:43:56 +08:00
62288a71ca
Fix category_id in forms
...
Fix statuses list
2013-07-16 11:41:22 +08:00
91b1cf6edc
Merge branch 'development' of https://github.com/Rulingcom/orbit into development
2013-07-11 17:18:58 +08:00
1c4b66f1cb
Fix approval in index
2013-07-10 16:42:25 +08:00
72861f05a6
Merge branch 'development' of https://github.com/Rulingcom/orbit into development
...
Conflicts:
config/mongoid.yml
2013-07-09 14:40:39 +08:00
2c331bf1a5
Revert non rulingcom email constraint
2013-07-04 14:20:13 +08:00
bec0bd76e4
Replace get_categories by categories
2013-07-04 12:33:28 +08:00
5457afdada
Rename global.css to global.css.erb
2013-07-02 17:42:15 +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
869f3b6815
fix object de-authorize failed.
2013-06-26 12:28:00 +08:00
345c471fc9
from now on the rescue namespace will be decided by site object field: resque_namespace
2013-06-20 17:50:17 +08:00
d3f0a10187
fix default setting for partial category selection error,due to API changing.
2013-06-17 15:26:43 +08:00
chris
Spen
saurabhbhatia
Manson Wang
Harry Bomrah
Matt K. Fu
devin chen
rulingcom
Matthew K. Fu JuYuan