68489084b0
view update
2012-12-05 17:48:17 +08:00
3e9cf27fe2
Merge branch 'publication' of https://github.com/Rulingcom/orbit into publication
...
* 'publication' of https://github.com/Rulingcom/orbit :
view update
view update
2012-12-05 17:47:16 +08:00
b1fd82197e
view update
2012-12-05 17:45:50 +08:00
62f1dadcb3
view update
2012-12-05 17:17:14 +08:00
b5e7f81108
Merge branch 'publication' of https://github.com/Rulingcom/orbit into publication
...
* 'publication' of https://github.com/Rulingcom/orbit :
br fixed
journal update
2012-12-05 17:10:32 +08:00
Harry Bomrah
02ff46d16e
br fixed
2012-12-05 17:09:17 +08:00
000cb4dcd6
journal update
2012-12-05 16:40:23 +08:00
359e0f113f
Merge branch 'publication' of https://github.com/Rulingcom/orbit into publication
...
* 'publication' of https://github.com/Rulingcom/orbit :
journal list
view update
2012-12-05 16:19:53 +08:00
e39e6536f5
journal list
2012-12-05 16:12:24 +08:00
743e177fbe
view update
2012-12-05 16:10:35 +08:00
1be794328a
clean route table about desktop
2012-12-05 16:00:36 +08:00
9041f9cd7b
make journal list easy to read
2012-12-05 15:34:21 +08:00
27ae41c833
make journal list easy to read
2012-12-05 15:33:47 +08:00
3e752b94ec
fixed new co-author relation bug....
2012-12-05 15:09:58 +08:00
00c8bca957
fixed co-author relation bug....
2012-12-05 14:51:12 +08:00
4ebbd7cb5a
when delete co-author relation, the co-author will be reset nil
2012-12-05 13:49:53 +08:00
e68c52bc00
Changes for store back-end
2012-12-05 13:46:10 +08:00
7342fe0e24
Merge branch 'fix_rss' into publication
...
* fix_rss:
add content for announcement rss
2012-12-05 11:48:30 +08:00
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
37850c6d90
midify button type
2012-12-05 11:46:25 +08:00
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
b150077b7b
change settings table default display
2012-12-04 18:55:49 +08:00
501931df06
delete onside widget in db
2012-12-04 17:45:40 +08:00
a790c0c482
add content for announcement rss
2012-12-04 10:29:30 +08:00
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
9a79e432dd
Fix typo
2012-12-04 01:12:15 +08:00
2983b181e6
Fix some translations
2012-12-04 01:03:28 +08:00
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
58e71c29b3
uniq relation
2012-12-04 00:31:46 +08:00
9759a32394
can display relation between author
2012-12-04 00:31:46 +08:00
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
5d6dd8cded
separate relation list from index page and render it
2012-12-04 00:31:46 +08:00
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
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
7822ffc33d
can add relation between co-author
2012-12-04 00:31:06 +08:00
5dabfe9319
refine co-authro page
2012-12-04 00:31:06 +08:00
5986817e16
add journal_list. now, those pair, (journal_title, journal_levels), is uniq
2012-12-04 00:31:06 +08:00
b1ddc9950a
adjust update password textfield position
2012-12-04 00:31:06 +08:00
184f903b1c
correct user passwd and sent json to front-end
2012-12-04 00:31:06 +08:00
8a7ae3f061
correct user passwd and sent json to front-end
2012-12-04 00:31:06 +08:00
eb97d417bd
if coauthor not in coauthor db then it will be add in db
2012-12-04 00:31:06 +08:00
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
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
devin
Rueshyna
Harry Bomrah
chris
Matthew K. Fu JuYuan