saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,510 Commits 5 Branches 0 Tags 52 MiB
Commit Graph

813 Commits

Author SHA1 Message Date
chris 92d2af13f2 changes for ad_banner 2013-10-19 19:17:04 +08:00
chris d2602a3a84 Change code for new page slide.js 
Conflicts:
	app/views/admin/pages/_form.html.erb
 2013-10-19 19:14:14 +08:00
Manson Wang 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
Manson Wang 76ba7087b2 Fix Ad_Banner frontend for IE8 
Fix backend bug in editing banner
Translation Added
 2013-10-15 19:37:12 +08:00
chris cf7f7aa29c Fix tag page slide issues 2013-10-08 12:47:31 +08:00
chris 5328a26440 Fix structure position 2013-10-08 12:33:24 +08:00
chris 48aa7ed638 Update rake for resetting position 
Fix codemirror css
 2013-10-07 16:23:07 +08:00
chris 21db2a2cba Drag and drop to reorder users 2013-10-07 15:53:54 +08:00
saurabhbhatia ff93670949 Updated template editing 2013-10-04 14:41:31 +08:00
saurabhbhatia 31b55a0635 Revert "Updated Orbit js to latest version" 
This reverts commit b18e61a6c0.
 2013-10-02 12:32:45 +08:00
saurabhbhatia b18e61a6c0 Updated Orbit js to latest version 2013-10-02 12:09:44 +08:00
saurabhbhatia 4fe2e31f0e Updated Global css to fix the line height 2013-10-01 17:51:07 +08:00
saurabhbhatia 31e4fb9f39 Updated sidebar line height 2013-10-01 17:47:58 +08:00
saurabhbhatia 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
Spen 9186978551 new ui member plugin sort fix and user show avatar fix 2013-09-27 11:04:52 +08:00
chris 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
Harry Bomrah 1d0ea6718f brief added to desktop for all plugins 2013-09-25 18:23:44 +08:00
Spen 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
chris 8456a91968 Fix structure edit 2013-09-14 17:26:16 +08:00
chris 17d7912e07 Ray's js code for status in form 2013-09-11 19:24:58 +08:00
chris 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
chris 3328a41b55 Put back js that was deleted by mistake 2013-09-11 14:01:06 +08:00
saurabhbhatia a3f1b8d54a Updated Preferences in Site Info 2013-09-06 18:00:30 +08:00
Spen 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
Spen 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
saurabhbhatia 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
saurabhbhatia cb070cc537 Updated Desktop with fix for forms for all users 2013-08-13 11:51:59 +08:00
Spen 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
saurabhbhatia 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
chris 0f3a8414be Delete duplicate js and css 
Close the form in search in orbit bar
 2013-07-31 17:30:53 +08:00
saurabhbhatia b1755bdc80 Added Stock Backgrounds, Fixed production issue with desktop css 2013-07-30 18:37:36 +08:00
saurabhbhatia 094c0f4314 Updated desktop compatibility to fix css paths 2013-07-30 17:15:55 +08:00
saurabhbhatia d9079d9d7c Updated with icons, latest js and css for desktop 2013-07-30 16:43:47 +08:00
saurabhbhatia aeaec79a2c new themes, apps and widgets for new ui 2013-07-30 16:43:44 +08:00
saurabhbhatia 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
devin chen ac58b993c2 simple component update 
minor update
 2013-07-30 16:43:09 +08:00
devin chen 2b12a4775c Various view update and change #thmbackground tag 2013-07-30 16:43:02 +08:00
devin chen b085e826a5 fix loading Section page for Chrome 2013-07-30 16:42:59 +08:00
devin chen ff375f0c5c minor update 2013-07-30 16:42:56 +08:00
devin chen 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
devin chen f2ada14b7a app manager's view update 2013-07-30 16:42:46 +08:00
devin chen 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
devin chen 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
devin chen 874819266d minor update 2013-07-30 16:42:23 +08:00
devin chen 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
devin chen 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
devin chen 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
devin chen 4215ed5538 minor update 2013-07-30 16:41:16 +08:00
chris fe10cc62d9 Fix structure title (page slide) 2013-07-29 14:59:02 +08:00
chris 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
chris 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
chris 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
chris 0d0f85e7ad Fix tooltip in form 
Change form_file
 2013-07-22 20:54:40 +08:00
Spen 5d3bc07488 archive and web_resouce for new ui 
Conflicts:
	app/assets/stylesheets/lib/main-forms.css
 2013-07-22 18:14:33 +08:00
chris 6cf249ccfb Change ckeditor gem and kaminari in gemfile 2013-07-22 17:26:32 +08:00
chris 92faeccdb6 Revert change in main-form and change class name of form_file 2013-07-22 17:24:58 +08:00
chris 5284571300 Add tooltip to bulletin form and remove file 2013-07-22 16:55:02 +08:00
chris fe82427baa Ray's changes for css and js 2013-07-22 16:31:44 +08:00
rulingcom 408bebaa4b Ray's changes in structure 2013-07-22 14:06:58 +08:00
chris 5457afdada Rename global.css to global.css.erb 2013-07-02 17:42:15 +08:00
chris 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
iCross f3e1f4057d ask module update css 2013-06-07 13:04:00 +08:00
iCross e353961b21 ask moudule: add ask.css 2013-06-07 13:04:00 +08:00
chris 0904978292 Remove non resolved conflict 2013-06-07 13:02:47 +08:00