Commit Graph

774 Commits

Author SHA1 Message Date
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
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
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
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 8a7ae3f061 correct user passwd and sent json to front-end 2012-12-04 00:31:06 +08:00
Rueshyna 7f7b33f310 fixed journal update method 2012-12-04 00:31:06 +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 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
Matthew K. Fu JuYuan 4bc80f2bd3 default widgets and sidebar. 2012-12-03 18:52:36 +08:00
Matthew K. Fu JuYuan f9bcb27efc put module app json into init,making orbit app work with module app. 2012-11-29 14:21:46 +08:00
chris 036d7bbb0e Module store 2012-11-29 02:02:37 +08:00
chris 06335f9bd1 Joshua's html 2012-11-29 00:59:46 +08:00
chris 390da0e49a Change icons 2012-11-29 00:49:53 +08:00
Rueshyna 9e2d6cfcdd add quick link to change user password, but it's not work 2012-11-28 23:44:43 +08:00
Rueshyna 6ed1dd0cc6 change template 2012-11-28 23:43:39 +08:00
Rueshyna 7853aec886 Merge branch 'publication' into multiple_file_upload
* publication:
  url fixed and edit form fixed for tinyscrollbar
2012-11-28 18:19:06 +08:00
Rueshyna 6d159a3a9e add templete 2012-11-28 18:12:37 +08:00
Rueshyna 254a81fa5d add templete 2012-11-28 18:12:21 +08:00
Harry Bomrah 2f67a96532 url fixed and edit form fixed for tinyscrollbar 2012-11-28 18:12:00 +08:00
Rueshyna 25324809bb add account link 2012-11-28 14:42:15 +08:00
Harry Bomrah 9cc518b456 autocomplete done 2012-11-27 15:55:32 +08:00
Matthew K. Fu JuYuan 3d573680b2 Merge commit '6b248a949b44b6e4dc908f29f4f08c3a821210cd' into sidebar_config
Conflicts:
	app/models/user/attribute_value.rb
	app/views/layouts/_side_bar_content.html.erb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
2012-11-26 17:55:53 +08:00
Rueshyna c9e3d5271a remove '"' candidate list 2012-11-26 16:06:22 +08:00
Rueshyna 0125010a05 modified error msgs and cancle button, but those two have bug... 2012-11-26 15:45:51 +08:00
Rueshyna 065d38c797 add autocomplete js 2012-11-26 14:44:35 +08:00
unknown 8a79d7ff2e member selects 2012-11-26 10:25:34 +08:00
Rueshyna 9061448c5f add paper status textfield 2012-11-26 10:23:50 +08:00
Matthew K. Fu JuYuan 9a684f54b4 fix for showing subroles 2012-11-26 10:22:36 +08:00
chris 1e89c30150 Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP 2012-11-26 05:02:58 +08:00
Rueshyna 996a69f595 add co-author json 2012-11-23 10:44:48 +08:00
Matthew K. Fu JuYuan 5b39d10ac6 user roles starts 2012-11-22 21:10:35 +08:00
Matthew K. Fu JuYuan 77386f0284 disable data transform when switching attribute field type. new member stable 2012-11-22 21:10:35 +08:00
Rueshyna 78500e0661 fixed add journal and co-author curd problem, but have redirect problem... 2012-11-22 21:06:30 +08:00