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

2281 Commits

Author SHA1 Message Date
devin 000cb4dcd6 journal update 2012-12-05 16:40:23 +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
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
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
Harry Bomrah 49d1ca6997 new type fixed 2012-12-04 00:31:46 +08:00
Rueshyna 5d6dd8cded separate relation list from index page and render it 2012-12-04 00:31:46 +08:00
Rueshyna e143f9a345 can select relection from relation db 2012-12-04 00:31:46 +08:00
Harry Bomrah 0e6c75e677 form for coauthor - fixed 2012-12-04 00:31:07 +08:00
Rueshyna 0affc73370 modify delete co-author message 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 7822ffc33d can add relation between co-author 2012-12-04 00:31:06 +08:00
Rueshyna 5dabfe9319 refine co-authro page 2012-12-04 00:31:06 +08:00
Rueshyna 5986817e16 add journal_list. now, those pair, (journal_title, journal_levels), is uniq 2012-12-04 00:31:06 +08:00
Rueshyna b1ddc9950a adjust update password textfield position 2012-12-04 00:31:06 +08:00
Rueshyna 184f903b1c correct user passwd and sent json to front-end 2012-12-04 00:31:06 +08:00
Rueshyna 8a7ae3f061 correct user passwd and sent json to front-end 2012-12-04 00:31:06 +08:00
Rueshyna eb97d417bd if coauthor not in coauthor db then it will be add in db 2012-12-04 00:31:06 +08:00
Rueshyna 7f7b33f310 fixed journal update method 2012-12-04 00:31:06 +08:00
Harry Bomrah ee830f148e jumping menus updated.. 2012-12-04 00:30:10 +08:00
Rueshyna 6426fb74d9 remove edit page cancel buttom 2012-12-04 00:25:58 +08:00
Harry Bomrah d70ef4666b delete fixed.. 2012-12-04 00:25:58 +08:00
Harry Bomrah 43a9f231a6 multiple file fixed 2012-12-04 00:25:58 +08:00
Rueshyna d806e8cf82 have done multiple file 2012-12-04 00:25:58 +08:00
Rueshyna 4a0cc61852 can add multiple file 2012-12-04 00:25:58 +08:00
Rueshyna 5a9d9151d9 add journal list template 2012-12-04 00:25:58 +08:00
chris e2da22b29c Clean translations 2012-12-04 00:17:12 +08:00
chris dc3be3c9a1 Translation changes 2012-12-03 23:00:04 +08:00
chris 9c6c622a49 Add missing icons and css for icons in layout 2012-12-03 22:31:00 +08:00
chris 9254b9960d Add timeout to user 2012-12-03 21:45:00 +08:00
chris fbe2b26e9f Do not create layout part if it already exists 2012-12-03 18:59:32 +08:00