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

571 Commits

Author SHA1 Message Date
saurabhbhatia b18e61a6c0 Updated Orbit js to latest version 2013-10-02 12:09:44 +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
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
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
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
Harry Bomrah b004121187 minimize bar updated to new style and more flexible. 2013-08-19 12:59:57 +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
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 d9079d9d7c Updated with icons, latest js and css for desktop 2013-07-30 16:43:47 +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
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 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 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
Lukas 51640423a7 survey module initial 2013-06-06 18:26:41 +08:00
Matt K. Fu 3e0b7d81ae clean 403 404 500 2013-05-27 16:46:49 +08:00
Matt K. Fu 7e9fce0c2d clean Harry's code 2013-04-17 14:31:10 +08:00
Harry Bomrah 38d5a193e0 tiny scrollbar trigger fixed and devin branch merged 2013-04-17 14:31:09 +08:00
devin chen 989e5aa974 minor update 2013-04-17 14:29:56 +08:00
devin chen e3782c9cf7 minor update 2013-04-17 14:29:04 +08:00
Harry Bomrah e2802d94d0 rake task added 2013-04-17 14:28:13 +08:00
devin chen 055d758769 Page Loading Effect 
tinyscrollbar has problem
 2013-04-17 14:27:18 +08:00
Matt K. Fu a4ebe31ada fix for widget edit js missing 2013-04-17 14:19:32 +08:00
Matt K. Fu 3de4591413 fix frontend ajax respond 404 due to javascript overwritten after assets precompile 2013-04-17 14:19:32 +08:00
devin chen d177fe0369 minor update 2013-04-17 14:19:32 +08:00
Harry Bomrah c6868bf2e0 small fix in select2.js 2013-04-17 14:18:49 +08:00
devin chen 95e308e046 minor update 2013-04-17 14:18:49 +08:00
Matt K. Fu 425a320c02 fix widget and fronted setting interface. checked with Spen 2013-04-17 14:16:24 +08:00
Harry Bomrah bc0477a5ed widget and gridster fixes 2013-04-17 14:16:24 +08:00
Matt K. Fu 0781779ac0 solved conflicts 2013-04-17 14:14:24 +08:00
devin e7bffe4c0f devin's new branch 2013-04-17 14:14:24 +08:00
chris dd10b3147c Fix js bug and asset url after merge 2013-04-17 14:14:24 +08:00
Harry Bomrah 793d739726 features and widgets added 
Conflicts:
	app/assets/javascripts/orbitdesktop.js
 2013-04-17 14:14:23 +08:00
devin c8aa50ee87 Lots of Update 
1. CSS to SCSS
2. Journal Paper update

Conflicts:
	Gemfile.lock
	app/assets/javascripts/orbitdesktop.js
	app/assets/stylesheets/desktop/desktop-main.css
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb
 2013-04-17 14:14:23 +08:00
Matt K. Fu 0f6f5aafce fix for both part and page part settings 
Conflicts:
	app/helpers/admin/page_parts_helper.rb
	app/views/admin/pages/reload_front_end_setting.js.erb
	app/views/admin/pages/reload_frontend_pages.js.erb
 2013-04-17 14:12:52 +08:00
Harry Bomrah 764f83d58c app manager changed plus some changes 2013-04-17 14:01:14 +08:00
Harry Bomrah 8dee211ab4 section page fixed.. 2013-04-17 14:01:14 +08:00
Harry Bomrah f9e7cefc94 compatibility page added and tinyscrollbar drag event fixed.. 2013-04-17 13:59:16 +08:00
Harry Bomrah 41643d1f61 tinyscrollbar pagination fixed 2013-04-17 12:11:33 +08:00
Harry Bomrah 54af5e8bd4 insert and remove columns 2013-04-17 12:06:33 +08:00
Harry Bomrah 6db9e70132 Major tinyscrollbar update 2013-04-17 12:04:22 +08:00
Harry Bomrah dae3f069ff app manager changed plus some changes 2013-04-17 11:09:56 +08:00
Harry Bomrah b1d7d5345e section page fixed.. 2013-04-17 11:08:58 +08:00
Harry Bomrah b8ee2fd559 compatibility page added and tinyscrollbar drag event fixed.. 2013-04-17 11:07:20 +08:00
Harry Bomrah 323fadc210 tinyscrollbar pagination fixed 2013-04-17 11:05:57 +08:00
Rueshyna 625f2e9ad6 have done conference author filter, journal haven't been done, yet 2013-04-17 11:04:52 +08:00
Harry Bomrah d840b82fa9 insert and remove columns 2013-04-17 10:56:15 +08:00
Harry Bomrah 1d06bcaae7 Major tinyscrollbar update 2013-04-17 10:54:38 +08:00
Harry Bomrah 0189d1c2c0 all none fixed 2013-04-17 10:54:38 +08:00
devin db2b371744 tinyscrollbar minor update 2013-03-05 17:22:53 +08:00
Harry Bomrah 3182f5c9a8 merging 2013-03-05 11:20:01 +08:00
Harry Bomrah dc92ef9f42 simple layout tinyscrollbar fixed 2013-03-05 11:04:18 +08:00
devin 4e24223c78 desktop CSS update 2013-03-05 09:39:01 +08:00
Harry Bomrah b5abbc9ef0 highlighting fixed… 2013-03-04 17:57:32 +08:00
Harry Bomrah e69679d3fe tinyscrollbar_bug fixed 2013-03-04 12:37:29 +08:00
Harry Bomrah 2ead541733 url handling modified.. tinyscrollbar modified… star checkbox fixed.. 2013-03-04 12:37:29 +08:00
Harry Bomrah 23c8c28b52 tinyscrollbar fixed 2013-03-04 12:37:29 +08:00
Harry Bomrah 0f12314213 some changes for gridster 2013-03-04 12:37:29 +08:00
Harry Bomrah b8ee748723 Lot of changes in gridster 2013-03-04 12:37:29 +08:00
Rueshyna ee4b94ace0 Merge branch 'desktop' of https://github.com/Rulingcom/orbit into desktop 
* 'desktop' of https://github.com/Rulingcom/orbit:
  fix widget field reload
  link to more
  fix default widget link
  fixed Widget data count should be available for other widgets, not only for default widget. The availability of this option must be set in the init
  fix javascript disable checkbox failed after cate and tags being reloaded.
  first version of multi categories and tags
  fix widget field reload
  link to more
  fix default widget link
  fixed Widget data count should be available for other widgets, not only for default widget. The availability of this option must be set in the init
  fix javascript disable checkbox failed after cate and tags being reloaded.
  first version of multi categories and tags
 2013-03-04 12:17:14 +08:00
Rueshyna 8f1d7b55ab authors auto-complete 2013-03-04 12:16:46 +08:00
Harry Bomrah c1cb5e5ffb tinyscrollbar_bug fixed 2013-03-01 17:49:58 +08:00
Harry Bomrah 9b8ab2a2c1 url handling modified.. tinyscrollbar modified… star checkbox fixed.. 2013-03-01 14:45:20 +08:00
Harry Bomrah c82e9a646d tinyscrollbar fixed 2013-02-27 18:55:26 +08:00
Harry Bomrah 7ef02d3108 Merge branch 'desktop' into desktop_work 2013-02-27 11:51:56 +08:00
Harry Bomrah 912080482b some changes for gridster 2013-02-27 11:47:41 +08:00
Fu Matthew 0dabd5b95f fix widget field reload 2013-02-27 10:51:41 +08:00
Fu Matthew 0e6599e9b9 fix javascript disable checkbox failed after cate and tags being reloaded. 2013-02-27 10:49:51 +08:00
Fu Matthew 99e67c8719 first version of multi categories and tags 2013-02-27 10:49:48 +08:00
Harry Bomrah e9c0f443b7 Lot of changes in gridster 2013-02-26 11:47:39 +08:00
Harry Bomrah edd2c1f522 css minor changes. 2013-02-25 11:08:57 +08:00
Harry Bomrah 9f362d9ae6 gridster, url code fixed, views removed. 2013-02-25 11:08:56 +08:00
chris caac9191ce Fix public_r_tag selection 2013-02-23 16:52:37 +08:00