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

624 Commits

Author SHA1 Message Date
Fu Matthew e1e003af6e Complete new interface 2013-01-14 19:18:25 +08:00
Fu Matthew 16cfd27fe9 apply view 2013-01-14 19:18:25 +08:00
Fu Matthew 46b1d55ff6 Complete new interface 2013-01-14 18:49:23 +08:00
Rueshyna 1b6bfdb80f modularize personal journal and pull relational setting in desktop/index.rb 2013-01-14 17:54:52 +08:00
Rueshyna 68e14a7898 move js file to relational module but have js require problem 2013-01-14 17:54:52 +08:00
Rueshyna 919f951981 restore js,journal_pages.js, 2013-01-14 17:54:52 +08:00
Rueshyna a183ac6041 fixed journal type page 2013-01-14 17:54:52 +08:00
Rueshyna 758cab5ecd move journal code to persional_journal modulaar 2013-01-14 17:53:59 +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
Fu Matthew ca51ebc08c apply view 2013-01-10 18:00:58 +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 48ce2278d0 Update disable time when separated picker new or reset date 2013-01-09 21:17:50 +08:00
chris b49251afee Date picker separated: reset time when reset date 2013-01-09 21:17:50 +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 423e2ac54e Update bootstrap version 2.2.2 2013-01-07 17:25:32 +08:00
Rueshyna a34da20e48 Merge branch 'master' into desktop 
* master: (57 commits)
  Add translations
  Add mobile version in site settings
  Add mobile but remove news in it
  Remove mysql
  Fix album widget options
  Fix link for ad_banner Add missing helper for web_link_category Show design's js in front-end
  Add link to default widget (temporary)
  Ika's fix for width
  Ika's fix for width
  Gallery i18n
  Ika's changes for css default widgets
  Ika's changes for css default widgets
  change bulletin object to bulletin title
  fixing default widget error when needs image
  make default widget works without init
  Fix order in structure
  Fix old tags
  correct pic file format
  complete page error handler logic
  change sub_menu to header in site setting
  ...
 2013-01-07 16:44:05 +08:00
Rueshyna 35e0011111 Merge remote-tracking branch 'remotes/origin/publication' into desktop 
* remotes/origin/publication:
  new desktop framework updates
 2013-01-07 12:44:30 +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
Fu Matthew 2c632551e5 fix preview filed after ad_banner created. 2013-01-02 17:51:53 +08:00
Fu Matthew 5587e83419 Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu 2012-12-28 15:31:32 +08:00
Fu Matthew baf1240b76 gallery options 2012-12-28 15:30:46 +08:00
chris 4d965d754b Fix urls in tinymce source editor 2012-12-28 15:03:02 +08:00
chris 455a27437d Changes for announcement widget style 2 2012-12-28 13:47:30 +08:00
Harry Bomrah 37f8c1637a new desktop framework updates 2012-12-27 18:25:54 +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
chris acaf707900 Merge branch 'publication' of github.com:Rulingcom/orbit into publication 2012-12-07 11:22:06 +08:00
Harry Bomrah ad8273d638 fixed fileview in english mode 2012-12-07 11:19:40 +08:00
chris 4d07b0753c Merge branch 'publication' of github.com:Rulingcom/orbit into publication 2012-12-07 10:13:41 +08:00
Harry Bomrah 08b99011d0 all sections and sections megerd 2012-12-07 10:10:38 +08:00
Harry Bomrah 59c4080f0c stupid fix 2012-12-07 04:21:26 +08:00
Harry Bomrah da3f0b58f5 section fixed and some other fixes 2012-12-07 04:21:26 +08:00
Rueshyna e87526d7bb try to fix problem 2012-12-07 04:21:26 +08:00
Harry Bomrah 3d382fec6b scroll fixed... 2012-12-07 04:21:26 +08:00
devin 89e25fe7a2 view update 2012-12-07 04:21:26 +08:00
chris af381e75de Add images to store 2012-12-07 02:37:05 +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
Harry Bomrah c2285a34f6 stupid fix 2012-12-06 18:50:24 +08:00
Harry Bomrah 8094ddc967 section fixed and some other fixes 2012-12-06 17:43:19 +08:00
Rueshyna 7430a05782 try to fix problem 2012-12-06 16:24:40 +08:00
Harry Bomrah df4a9a5dff scroll fixed... 2012-12-06 15:44:16 +08:00
devin 6a47fc8d62 view update 2012-12-06 11:43:40 +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
Harry Bomrah 3d1fb48489 edit coauthor relation done 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 a0cce2ae0d view update 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
Harry Bomrah 79dc99d431 br fixed 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
Harry Bomrah c6e0b56012 stupid bug fixed 2012-12-04 00:31:46 +08:00
Harry Bomrah 49d1ca6997 new type fixed 2012-12-04 00:31:46 +08:00
Harry Bomrah 0e6c75e677 form for coauthor - fixed 2012-12-04 00:31:07 +08:00
Harry Bomrah a6a50227eb new type fixed 2012-12-04 00:31:07 +08:00
Harry Bomrah f7f55850fe coauthor edit and destroy fixed 2012-12-04 00:31:07 +08:00
Rueshyna 5986817e16 add journal_list. now, those pair, (journal_title, journal_levels), is uniq 2012-12-04 00:31:06 +08:00
Harry Bomrah ee830f148e jumping menus updated.. 2012-12-04 00:30: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 2f67a96532 url fixed and edit form fixed for tinyscrollbar 2012-11-28 18:12:00 +08:00
Harry Bomrah 9cc518b456 autocomplete done 2012-11-27 15:55:32 +08:00
chris 1e89c30150 Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP 2012-11-26 05:02:58 +08:00
Harry Bomrah 3933c048b0 delete fixed 2012-11-23 13:22:01 +08:00
Harry Bomrah f38f32ac8b delete update 2012-11-23 10:46:42 +08:00
Matthew K. Fu JuYuan 5b39d10ac6 user roles starts 2012-11-22 21:10:35 +08:00
Matthew K. Fu JuYuan 77386f0284 disable data transform when switching attribute field type. new member stable 2012-11-22 21:10:35 +08:00
Rueshyna f6d3b4a9e9 correct 'edit' button of journal list 2012-11-22 21:06:31 +08:00
Harry Bomrah 868d1c2201 fix for json and some other bugs 2012-11-22 21:06:30 +08:00
Rueshyna 78500e0661 fixed add journal and co-author curd problem, but have redirect problem... 2012-11-22 21:06:30 +08:00
Rueshyna c281ae9447 hidden file field, and fixed updated function 2012-11-22 21:06:30 +08:00
Rueshyna 9189ebffee correct 'edit' button of journal list 2012-11-22 18:15:07 +08:00
Harry Bomrah 90fd9de5a8 fix for json and some other bugs 2012-11-22 16:31:52 +08:00
Rueshyna 9e400e6e6a fixed add journal and co-author curd problem, but have redirect problem... 2012-11-22 10:49:54 +08:00
chris 475642d375 Remove news and fix default_url in ImageUploader 2012-11-22 09:30:25 +08:00
Rueshyna bb69a059e8 hidden file field, and fixed updated function 2012-11-22 02:37:56 +08:00
Harry Bomrah 73e76f2477 routes fixed 2012-11-21 18:36:56 +08:00