developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,519 Commits 9 Branches 0 Tags 55 MiB
Commit Graph

327 Commits

Author SHA1 Message Date
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
iCross d2f131d160 survey module: update css 
Conflicts:

	app/assets/stylesheets/questionnaire.css
 2013-06-06 18:43:28 +08:00
iCross 21bf3a0ccd standalone css and icon 2013-06-06 18:41:27 +08:00
iCross 443d1c4fbe csv stats & required start 2013-06-06 18:38:47 +08:00
iCross 531cee70d2 fix 2013-06-06 18:31:28 +08:00
Lukas 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
Matt K. Fu 287e77836d fix css compiling error 2013-05-14 14:19:20 +08:00
Matt K. Fu f2247aab32 ray's css fix 2013-05-14 11:27:15 +08:00
devin chen 989e5aa974 minor update 2013-04-17 14:29:56 +08:00
devin chen aedab01ae6 minor update 2013-04-17 14:29:04 +08:00
devin chen e3782c9cf7 minor update 2013-04-17 14:29:04 +08:00
devin chen 055d758769 Page Loading Effect 
tinyscrollbar has problem
 2013-04-17 14:27:18 +08:00
devin chen d177fe0369 minor update 2013-04-17 14:19:32 +08:00
devin chen 95e308e046 minor update 2013-04-17 14:18:49 +08:00
devin chen dc5f24ab22 starting new branch ( add rules in .gitignore for SASS cache folder ) 2013-04-17 14:16: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
devin cae43e8acd recover .gitignore file 
Conflicts:
	.gitignore
 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
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
devin 0d5ab20efa add browser compatibility page 2013-04-17 11:07:45 +08:00
Rueshyna 625f2e9ad6 have done conference author filter, journal haven't been done, yet 2013-04-17 11:04:52 +08:00
devin 84dfb44e78 tinyscrollbar css minor update 2013-04-17 10:56:15 +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
devin 4e24223c78 desktop CSS update 2013-03-05 09:39:01 +08:00
Harry Bomrah b8ee748723 Lot of changes in gridster 2013-03-04 12:37:29 +08:00
Rueshyna 8f1d7b55ab authors auto-complete 2013-03-04 12:16:46 +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 680d7908b9 member plugin init edit 2013-02-21 17:53:08 +08:00
unknown bc44d38948 member plugin edit 2013-02-20 17:25:20 +08:00
chris d19ba7b1c6 Change css mobile for 3 columns 2013-02-19 18:31:34 +08:00
chris b1a11b4dad Remove isotope 2013-02-04 18:01:42 +08:00
chris c33a723a2a Fix css bug when precompile 2013-02-04 18:01:00 +08:00
Fu Matthew 9630d0a841 Merge branch 'new_widget_setting_interface' of github.com:Rulingcom/orbit into new_widget_setting_interface 2013-01-16 14:09:05 +08:00
Fu Matthew 9edf0dca54 ika re-redesign module widget 2013-01-16 14:07:09 +08:00
chris 72e26fd92a Fix css bug when precompile 2013-01-16 02:37:49 +08:00
Fu Matthew e1e003af6e Complete new interface 2013-01-14 19:18:25 +08:00
Fu Matthew 46b1d55ff6 Complete new interface 2013-01-14 18:49:23 +08:00
chris 282604d1fa Merge branch 'back' of github.com:Rulingcom/orbit into back 
Conflicts:
	app/assets/javascripts/mobile/orbit.mobile.js.erb
	app/assets/stylesheets/mobile.css
	app/assets/stylesheets/mobile/orbit-mobile.css.erb
	app/controllers/application_controller.rb
	app/controllers/mobile_controller.rb
	app/views/layouts/mobile.mobile.erb
	app/views/mobile/_footer.mobile.erb
	app/views/mobile/_header.mobile.erb
	app/views/mobile/_menu.mobile.erb
	app/views/mobile/index.mobile.erb
	config/routes.rb
 2013-01-14 17:46:27 +08:00
chris 141eb7e723 Add mobile but remove news in it 2013-01-14 17:38:44 +08:00
chris 91d1487a04 Fix mobile banner, icons, announcement css 2013-01-11 18:34:20 +08:00
chris d00192f018 Fix for mobile icon and iphone5 fullscreen 2013-01-11 17:00:09 +08:00
chris 5a4f681cfc Fix the tooltips overflow 2013-01-11 12:24:50 +08:00
chris b90e8efb1f Fix filter not collapsing 
Fix icon size for button
 2013-01-11 11:37:11 +08:00
Rueshyna 08adb887c5 change *default* to *defulat* 2013-01-10 09:40:52 +08:00
chris c36f3152f5 Changes in css for structure icon and sidebar padding 2013-01-09 21:35:54 +08:00
chris d8f6ebb153 Fix icons 2013-01-09 21:17:50 +08:00
chris 7434d36e9b Ray's changes for icon size 2013-01-09 21:17:50 +08:00
chris 933ac7b8fe Ray's changes for icon css 2013-01-09 21:17:50 +08:00
chris 41dff814fb Change icons 2013-01-09 21:17:50 +08:00
chris fac4faad6c Change date picker 2013-01-09 05:18:16 +08:00
chris 5b13c53ed9 Ika's changes in default_widget.css 2013-01-08 12:50:28 +08:00
chris 37740adb24 Add mobile but remove news in it 2013-01-07 03:03:38 +08:00
nccu ac6da1340a Ika's fix for width 2013-01-04 12:31:12 +08:00
nccu ea2d38b23b Ika's changes for css default widgets 2013-01-04 11:54:58 +08:00
chris 455a27437d Changes for announcement widget style 2 2012-12-28 13:47:30 +08:00
chris e9815c3d9b Fix css bug when precompiling assets 2012-12-20 14:34:02 +08:00
chris 7ac6958690 Fix css bug when precompiling assets 2012-12-20 14:32:06 +08:00
chris fc076a28bd Remove useless css 2012-12-20 13:53:28 +08:00
chris 30268ab3bc Remove useless css 2012-12-20 13:52:23 +08:00
chris 3a9106c10d Add mobile but remove news in it 2012-12-20 03:21:50 +08:00
chris fcbba6660b Only one parser for front end 
Separate site map for i18n
 2012-12-19 17:15:31 +08:00
devin 89e25fe7a2 view update 2012-12-07 04:21:26 +08:00
chris 6f1748d2b3 - template list/show is loaded from central server 
- buy a template downloads and creates it in DB
- changes in designs index
 2012-12-06 23:20:27 +08:00
OrbitServer b1f2749000 Devin's changes to integrate the store 2012-12-06 23:11:23 +08:00
devin 5d76600154 view update 2012-12-06 07:59:44 +08:00
devin 756bfa563b view update 2012-12-06 07:59:44 +08:00
devin 22c0eabca5 view update 2012-12-06 07:59:44 +08:00
devin 59c0cdd761 view update 
not finish all required pages yet
 2012-12-06 07:59:43 +08:00
devin d413f705a4 view update 2012-12-06 07:59:43 +08:00
devin 363ccdde4d view update 2012-12-06 07:59:43 +08:00
devin 936101358c journal update 2012-12-06 07:59:43 +08:00
devin d03f5dc1ff view update 2012-12-06 07:59:43 +08:00
chris e68c52bc00 Changes for store back-end 2012-12-05 13:46:10 +08:00
chris 9c6c622a49 Add missing icons and css for icons in layout 2012-12-03 22:31:00 +08:00
chris 036d7bbb0e Module store 2012-11-29 02:02:37 +08:00
chris 06335f9bd1 Joshua's html 2012-11-29 00:59:46 +08:00
chris 390da0e49a Change icons 2012-11-29 00:49:53 +08:00
Harry Bomrah 9cc518b456 autocomplete done 2012-11-27 15:55:32 +08:00
Matthew K. Fu JuYuan 5b39d10ac6 user roles starts 2012-11-22 21:10:35 +08:00
Matthew K. Fu JuYuan a85e5fcc0d address field. js and style is broken 2012-11-20 09:53:36 +08:00
chris b40d4702d5 Merge branch 'master' into various_bugs 
Conflicts:
	config/locales/en.yml
	config/locales/zh_tw.yml
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb
 2012-11-06 11:44:00 +08:00
Matthew K. Fu JuYuan beb843f75b add new member with role interface. add more not usable. 
role management new attribute is ok. delete is ok.
 2012-11-04 20:42:58 +08:00
chris cc5e238576 Fix after merge from NCCU, the translations still need to be cleaned 2012-10-30 11:08:26 +08:00
chris 65ac6980c4 Merge branch 'various_bugs' into nccu_master 
Conflicts:
	Gemfile.lock
	app/assets/javascripts/ajax_form.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/application_controller.rb
	app/controllers/sessions_controller.rb
	app/helpers/admin/web_link_helper.rb
	app/views/admin/attributes/_attribute_field.html.erb
	app/views/admin/designs/_form.html.erb
	app/views/admin/pages/_form.html.erb
	app/views/admin/sites/_side_bar.html.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	config/locales/en.yml
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
	vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
 2012-10-29 16:10:07 +08:00
Matthew K. Fu JuYuan bd0d975014 for user new interface, member role is working. 2012-10-26 11:27:37 +08:00
chris d7fd61ce55 Edit uploaded package 2012-10-26 11:19:57 +08:00
Matthew K. Fu JuYuan 0a1a9d2c2e member for THU 2012-10-26 11:19:56 +08:00
chris cbfa659928 Changes for side_bar 2012-10-26 11:19:56 +08:00
Matthew K. Fu JuYuan 8b9cffd4f2 new code for attribute fields and values for new member interface 2012-10-26 11:19:55 +08:00
Harry Bomrah a5722af315 Calendar updates for day view 2012-10-26 11:15:37 +08:00