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

2862 Commits

Author SHA1 Message Date
devin b786e4b347 view update 2012-12-06 02:39:27 +08:00
Rueshyna 9db3b382b8 Merge branch 'publication' of https://github.com/Rulingcom/orbit into publication 
* 'publication' of https://github.com/Rulingcom/orbit:
  edit coauthor relation done
 2012-12-06 02:12:25 +08:00
Rueshyna 70e13b481b make files and journal level fake data 2012-12-06 02:11:27 +08:00
Rueshyna ddec333e03 make files and journal level fake data 2012-12-06 02:10:32 +08:00
unknown a39d406bcb add info field 2012-12-05 20:32:28 +08:00
Harry Bomrah 93c027cfd6 edit coauthor relation done 2012-12-05 18:58:43 +08:00
Matthew K. Fu JuYuan 99f28a0cba sidebar rewrited 2012-12-05 18:35:58 +08:00
Rueshyna 16e637260c sort co_author name 2012-12-05 18:34:29 +08:00
Rueshyna 270644a959 add back buton in relation page 2012-12-05 18:24:50 +08:00
Rueshyna 476041510c Merge branch 'publication' of https://github.com/Rulingcom/orbit into publication 
* 'publication' of https://github.com/Rulingcom/orbit:
  view update
 2012-12-05 18:16:51 +08:00
Rueshyna 1c6283f8e3 sort author email 2012-12-05 18:15:58 +08:00
devin 4f03900605 view update 
not finish all required pages yet
 2012-12-05 18:06:40 +08:00
Rueshyna aedc91dd0a delete garbage file 2012-12-05 18:03:36 +08:00
Rueshyna b4082a2d60 can update co-author relation 2012-12-05 18:02:42 +08:00
Rueshyna 9b4a07a2b0 Merge branch 'publication' of https://github.com/Rulingcom/orbit into publication 
* 'publication' of https://github.com/Rulingcom/orbit:
  view update
 2012-12-05 17:54:17 +08:00
devin 6006965870 view update 2012-12-05 17:51:44 +08:00
Rueshyna e64306e133 Merge branch 'publication' of https://github.com/Rulingcom/orbit into publication 
* 'publication' of https://github.com/Rulingcom/orbit:
  view update
 2012-12-05 17:50:09 +08:00
Rueshyna abbe1e86ac make coauthor relation can be edit 2012-12-05 17:49:41 +08:00
devin 68489084b0 view update 2012-12-05 17:48:17 +08:00
Rueshyna 3e9cf27fe2 Merge branch 'publication' of https://github.com/Rulingcom/orbit into publication 
* 'publication' of https://github.com/Rulingcom/orbit:
  view update
  view update
 2012-12-05 17:47:16 +08:00
devin b1fd82197e view update 2012-12-05 17:45:50 +08:00
devin 62f1dadcb3 view update 2012-12-05 17:17:14 +08:00
Rueshyna b5e7f81108 Merge branch 'publication' of https://github.com/Rulingcom/orbit into publication 
* 'publication' of https://github.com/Rulingcom/orbit:
  br fixed
  journal update
 2012-12-05 17:10:32 +08:00
Harry Bomrah 02ff46d16e br fixed 2012-12-05 17:09:17 +08:00
devin 000cb4dcd6 journal update 2012-12-05 16:40:23 +08:00
Rueshyna 359e0f113f Merge branch 'publication' of https://github.com/Rulingcom/orbit into publication 
* 'publication' of https://github.com/Rulingcom/orbit:
  journal list
  view update
 2012-12-05 16:19:53 +08:00
devin e39e6536f5 journal list 2012-12-05 16:12:24 +08:00
devin 743e177fbe view update 2012-12-05 16:10:35 +08:00
Rueshyna 1be794328a clean route table about desktop 2012-12-05 16:00:36 +08:00
Rueshyna 9041f9cd7b make journal list easy to read 2012-12-05 15:34:21 +08:00
Rueshyna 27ae41c833 make journal list easy to read 2012-12-05 15:33:47 +08:00
Rueshyna 3e752b94ec fixed new co-author relation bug.... 2012-12-05 15:09:58 +08:00
Rueshyna 00c8bca957 fixed co-author relation bug.... 2012-12-05 14:51:12 +08:00
Rueshyna 4ebbd7cb5a when delete co-author relation, the co-author will be reset nil 2012-12-05 13:49:53 +08:00
chris e68c52bc00 Changes for store back-end 2012-12-05 13:46:10 +08:00
Rueshyna 7342fe0e24 Merge branch 'fix_rss' into publication 
* fix_rss:
  add content for announcement rss
 2012-12-05 11:48:30 +08:00
Rueshyna 7e4160c670 Merge branch 'widget' into publication 
* widget: (41 commits)
  midify button type
  change settings table default display
  delete onside widget in db
  Fix typo
  Fix some translations
  stupid bug fixed
  uniq relation
  can display relation between author
  add back button
  new type fixed
  separate relation list from index page and render it
  can select relection from relation db
  form for coauthor - fixed
  modify delete co-author message
  new type fixed
  coauthor edit and destroy fixed
  can add relation between co-author
  refine co-authro page
  add journal_list. now, those pair, (journal_title, journal_levels), is uniq
  adjust update password textfield position
  ...
 2012-12-05 11:48:20 +08:00
Rueshyna 37850c6d90 midify button type 2012-12-05 11:46:25 +08:00
Matthew K. Fu JuYuan ca290f3519 Merge commit 'e429aa9425e9648a94a1dd7bb5cea15af7ba854a' into sidebar_config 
Conflicts:
	app/views/layouts/_side_bar_content.html.erb
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
	vendor/built_in_modules/announcement/init.rb
 2012-12-05 11:36:32 +08:00
Rueshyna b150077b7b change settings table default display 2012-12-04 18:55:49 +08:00
Rueshyna 501931df06 delete onside widget in db 2012-12-04 17:45:40 +08:00
Rueshyna a790c0c482 add content for announcement rss 2012-12-04 10:29:30 +08:00
Rueshyna e429aa9425 Merge branch 'master' of https://github.com/Rulingcom/orbit 
* 'master' of https://github.com/Rulingcom/orbit: (83 commits)
  Fix typo
  Fix some translations
  stupid bug fixed
  uniq relation
  can display relation between author
  add back button
  new type fixed
  separate relation list from index page and render it
  can select relection from relation db
  form for coauthor - fixed
  modify delete co-author message
  new type fixed
  coauthor edit and destroy fixed
  can add relation between co-author
  refine co-authro page
  add journal_list. now, those pair, (journal_title, journal_levels), is uniq
  adjust update password textfield position
  correct user passwd and sent json to front-end
  correct user passwd and sent json to front-end
  if coauthor not in coauthor db then it will be add in db
  ...
 2012-12-04 09:32:47 +08:00
chris 9a79e432dd Fix typo 2012-12-04 01:12:15 +08:00
chris 2983b181e6 Fix some translations 2012-12-04 01:03:28 +08:00
chris 8d798b14d7 Merge branch 'publication' of github.com:Rulingcom/orbit into publication 
Conflicts:
	app/controllers/desktop/journal_pages_controller.rb
	app/models/user/user.rb
 2012-12-04 00:32:55 +08:00
Harry Bomrah c6e0b56012 stupid bug fixed 2012-12-04 00:31:46 +08:00
Rueshyna 58e71c29b3 uniq relation 2012-12-04 00:31:46 +08:00
Rueshyna 9759a32394 can display relation between author 2012-12-04 00:31:46 +08:00
Rueshyna f89a6194c4 add back button 2012-12-04 00:31:46 +08:00