developers
/
orbit-basic
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,273 Commits 5 Branches 0 Tags 52 MiB
Commit Graph

2273 Commits

Author SHA1 Message Date
Matthew K. Fu JuYuan bd743a0ca5 rename of GPRS 
now it's named location
 2012-12-07 12:40:21 +08:00
Matthew K. Fu JuYuan e07fb7d434 Remove GPRS 2012-12-07 12:36:25 +08:00
Matthew K. Fu JuYuan 99f28a0cba sidebar rewrited 2012-12-05 18:35:58 +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 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
Matthew K. Fu JuYuan 4bc80f2bd3 default widgets and sidebar. 2012-12-03 18:52:36 +08:00
chris 4f9aa63045 Remove extra end 2012-12-03 18:45:32 +08:00
chris 5c7f1aa164 Fix saving of page_part after layout change 2012-12-03 18:42:50 +08:00
Harry Bomrah f227e55c4f stupid bug fixed 2012-12-03 17:52:05 +08:00
chris 2757044c32 Forgot to save the page_parts 2012-12-03 17:49:26 +08:00
chris bdcfb46294 Fix previous commit 2012-12-03 17:38:55 +08:00
chris 6543491a53 Save pages to generate page_parts when a layout is updated 2012-12-03 17:25:27 +08:00
Rueshyna afee03cd1f uniq relation 2012-12-03 17:25:07 +08:00
Rueshyna 5660ff8f03 can display relation between author 2012-12-03 17:16:28 +08:00
Rueshyna 6d2fa673c7 Merge branch 'select_co_author_relation' into publication 
* select_co_author_relation:
  add back button
 2012-12-03 16:20:40 +08:00
Rueshyna 8110ef1735 add back button 2012-12-03 16:19:53 +08:00