Commit Graph

2616 Commits

Author SHA1 Message Date
Rueshyna 633a68675a make factory girl file clean 2012-12-06 22:37:42 +08:00
Rueshyna 0ebe419484 Merge branch 'publication' of https://github.com/Rulingcom/orbit into publication
* 'publication' of https://github.com/Rulingcom/orbit:
  stupid fix
  section fixed and some other fixes
2012-12-06 22:08:49 +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
chris 0c2d922996 Add path for i18n 2012-12-06 17:27:36 +08:00
Rueshyna 7430a05782 try to fix problem 2012-12-06 16:24:40 +08:00
OrbitServer 339e20964a Merge branch 'store' of github.com:Rulingcom/orbit into store 2012-12-06 16:08:01 +08:00
OrbitServer 9683741ec9 Devin's changes to integrate the store 2012-12-06 16:06:47 +08:00
Rueshyna bbca9f0c9b Merge branch 'publication' of https://github.com/Rulingcom/orbit into publication
* 'publication' of https://github.com/Rulingcom/orbit:
  scroll fixed...
2012-12-06 15:54:00 +08:00
Rueshyna 697e64feec fixed bug 2012-12-06 15:53:46 +08:00
Harry Bomrah df4a9a5dff scroll fixed... 2012-12-06 15:44:16 +08:00
Rueshyna 4e9ed57813 fixed bug about co-author-relation 2012-12-06 15:20:56 +08:00
Rueshyna 54de86eeb4 fixed bug about co-author-relation 2012-12-06 15:20:06 +08:00
Rueshyna d4c6fc66d5 Merge branch 'publication' of https://github.com/Rulingcom/orbit into publication
* 'publication' of https://github.com/Rulingcom/orbit:
  view update
2012-12-06 11:56:58 +08:00
Rueshyna c59c772b55 fixed edit and new page of co-author 2012-12-06 11:56:47 +08:00
devin 6a47fc8d62 view update 2012-12-06 11:43:40 +08:00
Rueshyna 7a412d4e7e current version 2012-12-06 09:49:15 +08:00
Rueshyna 9e3fdcd868 Merge branch 'publication' of https://github.com/Rulingcom/orbit into publication
* 'publication' of https://github.com/Rulingcom/orbit: (37 commits)
  view update
  view update
  view update
  make files and journal level fake data
  make files and journal level fake data
  edit coauthor relation done
  sort co_author name
  add back buton in relation page
  sort author email
  view update
  delete garbage file
  can update co-author relation
  view update
  make coauthor relation can be  edit
  view update
  view update
  view update
  br fixed
  journal update
  journal list
  ...
2012-12-06 09:23:56 +08:00
chris 7ec79213f6 Merge branch 'publication' of github.com:Rulingcom/orbit into publication 2012-12-06 08:00:01 +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
Rueshyna c03b70d47e make files and journal level fake data 2012-12-06 07:59:44 +08:00
Rueshyna ccd314a137 make files and journal level fake data 2012-12-06 07:59:44 +08:00
Harry Bomrah 3d1fb48489 edit coauthor relation done 2012-12-06 07:59:44 +08:00
Rueshyna 4681f0ee36 sort co_author name 2012-12-06 07:59:44 +08:00
Rueshyna 6d08ca996f add back buton in relation page 2012-12-06 07:59:44 +08:00
Rueshyna b4a99e58cf sort author email 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
Rueshyna f8264482e5 delete garbage file 2012-12-06 07:59:43 +08:00
Rueshyna b89e371393 can update co-author relation 2012-12-06 07:59:43 +08:00
devin a0cce2ae0d view update 2012-12-06 07:59:43 +08:00
Rueshyna e7fdac1d23 make coauthor relation can be edit 2012-12-06 07:59:43 +08:00
devin 8d110cce91 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 2aa077bc85 journal list 2012-12-06 07:59:43 +08:00
devin d03f5dc1ff view update 2012-12-06 07:59:43 +08:00
Rueshyna 4ae7ac8388 clean route table about desktop 2012-12-06 07:59:42 +08:00
Rueshyna 6c33d353ba make journal list easy to read 2012-12-06 07:59:42 +08:00
Rueshyna 05027afa63 make journal list easy to read 2012-12-06 07:59:42 +08:00
Rueshyna 4f31b1362b fixed new co-author relation bug.... 2012-12-06 07:59:42 +08:00
Rueshyna 1289ad9f9d fixed co-author relation bug.... 2012-12-06 07:59:42 +08:00
Rueshyna afd8e7e380 when delete co-author relation, the co-author will be reset nil 2012-12-06 07:59:42 +08:00
Rueshyna 09c59c4e03 midify button type 2012-12-06 07:59:42 +08:00
Rueshyna 21b1432f7f change settings table default display 2012-12-06 07:59:42 +08:00
Rueshyna e0e1c30f68 delete onside widget in db 2012-12-06 07:59:42 +08:00
Rueshyna 4a8878132e add content for announcement rss 2012-12-06 07:59:42 +08:00