Commit Graph

2938 Commits

Author SHA1 Message Date
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
chris c74ead8318 Redirect to designs after buying template
Randomise buy counts
2012-12-07 09:07:49 +08:00
chris a48690d4bf Merge branches 'publication' and 'publication' of github.com:Rulingcom/orbit into publication 2012-12-07 04:21:41 +08:00
Rueshyna 1c7ddb4b29 fixed empty db bug 2012-12-07 04:21:27 +08:00
Rueshyna a84cb560a0 make factory girl file clean 2012-12-07 04:21:26 +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
Rueshyna adb9621877 fixed bug 2012-12-07 04:21:26 +08:00
Harry Bomrah 3d382fec6b scroll fixed... 2012-12-07 04:21:26 +08:00
Rueshyna 24f6623787 fixed bug about co-author-relation 2012-12-07 04:21:26 +08:00
Rueshyna 39b5959de7 fixed bug about co-author-relation 2012-12-07 04:21:26 +08:00
Rueshyna 222ae37cd4 fixed edit and new page of co-author 2012-12-07 04:21:26 +08:00
devin 89e25fe7a2 view update 2012-12-07 04:21:26 +08:00
Rueshyna 1b4c76a472 current version 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
chris eb53343bdb Merge branch 'store' of github.com:Rulingcom/orbit into store 2012-12-06 23:11:38 +08:00
OrbitServer b1f2749000 Devin's changes to integrate the store 2012-12-06 23:11:23 +08:00
OrbitServer fbed496034 Harry's changes in i18n 2012-12-06 23:08:13 +08:00
Rueshyna 749e794c30 fixed empty db bug 2012-12-06 22:37:43 +08:00
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