fe5e5fd974
Merge branch 'publication' of https://github.com/Rulingcom/orbit into publication
...
* 'publication' of https://github.com/Rulingcom/orbit :
coauthor edit and destroy fixed
2012-12-03 12:34:46 +08:00
Harry Bomrah
7d865a65e2
coauthor edit and destroy fixed
2012-12-03 12:23:56 +08:00
a0aa5e6d45
can add relation between co-author
2012-12-03 12:10:45 +08:00
a0fc2caaf6
refine co-authro page
2012-12-01 00:21:49 +08:00
cc6339d59b
add journal_list. now, those pair, (journal_title, journal_levels), is uniq
2012-11-30 23:50:46 +08:00
ccacef6d9e
Merge branch 'publication' into journal_list
...
* publication: (23 commits)
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
fixed journal update method
jumping menus updated..
remove edit page cancel buttom
delete fixed..
multiple file fixed
have done multiple file
can add multiple file
Module store
Joshua's html
Change icons
add quick link to change user password, but it's not work
change template
add templete
add templete
url fixed and edit form fixed for tinyscrollbar
easy to make fake data
...
2012-11-30 21:02:18 +08:00
192779fb6e
adjust update password textfield position
2012-11-30 16:32:06 +08:00
129d68817e
correct user passwd and sent json to front-end
2012-11-30 15:17:39 +08:00
5c8df7bafc
correct user passwd and sent json to front-end
2012-11-30 15:17:29 +08:00
72915cdfaa
if coauthor not in coauthor db then it will be add in db
2012-11-29 22:37:13 +08:00
75539d35f0
fixed journal update method
2012-11-29 16:49:41 +08:00
55dbfd8c4e
fixed journal update method
2012-11-29 16:48:07 +08:00
Harry Bomrah
944daff524
jumping menus updated..
2012-11-29 16:46:33 +08:00
8ebe9abdfe
remove edit page cancel buttom
2012-11-29 15:18:38 +08:00
f9bcb27efc
put module app json into init,making orbit app work with module app.
2012-11-29 14:21:46 +08:00
bb1603f8bf
Merge branch 'publication' of https://github.com/Rulingcom/orbit into publication
...
* 'publication' of https://github.com/Rulingcom/orbit :
delete fixed..
2012-11-29 14:07:44 +08:00
Harry Bomrah
5b05e4ed3a
delete fixed..
2012-11-29 13:35:08 +08:00
57be3dbfbd
Merge branch 'publication' of https://github.com/Rulingcom/orbit into publication
...
* 'publication' of https://github.com/Rulingcom/orbit :
multiple file fixed
2012-11-29 12:33:17 +08:00
Harry Bomrah
5272f20bea
multiple file fixed
2012-11-29 12:32:21 +08:00
ead3a47243
have done multiple file
2012-11-29 12:13:56 +08:00
349ce37ca4
can add multiple file
2012-11-29 11:21:05 +08:00
247b2fa76e
Merge branch 'publication' of https://github.com/Rulingcom/orbit into publication
...
* 'publication' of https://github.com/Rulingcom/orbit :
Module store
Joshua's html
Change icons
2012-11-29 09:35:09 +08:00
036d7bbb0e
Module store
2012-11-29 02:02:37 +08:00
06335f9bd1
Joshua's html
2012-11-29 00:59:46 +08:00
390da0e49a
Change icons
2012-11-29 00:49:53 +08:00
9e2d6cfcdd
add quick link to change user password, but it's not work
2012-11-28 23:44:43 +08:00
6ed1dd0cc6
change template
2012-11-28 23:43:39 +08:00
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
aad1b2e47b
Merge branch 'publication' of https://github.com/Rulingcom/orbit into publication
...
* 'publication' of https://github.com/Rulingcom/orbit :
url fixed and edit form fixed for tinyscrollbar
2012-11-28 18:13:00 +08:00
6d159a3a9e
add templete
2012-11-28 18:12:37 +08:00
254a81fa5d
add templete
2012-11-28 18:12:21 +08:00
2f67a96532
url fixed and edit form fixed for tinyscrollbar
2012-11-28 18:12:00 +08:00
796dcc4dc6
easy to make fake data
2012-11-28 15:20:02 +08:00
25324809bb
add account link
2012-11-28 14:42:15 +08:00
730c29bf49
change layout
2012-11-28 14:28:41 +08:00
114ca5493a
replace rss format with json in announcement
2012-11-28 13:43:48 +08:00
2f05885c4a
add journal list template
2012-11-28 11:45:23 +08:00
452b1525de
Merge branch 'publication' of https://github.com/Rulingcom/orbit into publication
...
* 'publication' of https://github.com/Rulingcom/orbit :
autocomplete done
2012-11-27 15:57:18 +08:00
9cc518b456
autocomplete done
2012-11-27 15:55:32 +08:00
46576c6947
modify fake data
2012-11-27 00:18:34 +08:00
6de62318c5
fake data for journal and coauthor
2012-11-27 00:05:04 +08:00
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
c9e3d5271a
remove '"' candidate list
2012-11-26 16:06:22 +08:00
0125010a05
modified error msgs and cancle button, but those two have bug...
2012-11-26 15:45:51 +08:00
613bbec1f0
Merge branch 'autocomplete' into publication
...
* autocomplete:
add autocomplete js
2012-11-26 14:44:52 +08:00
065d38c797
add autocomplete js
2012-11-26 14:44:35 +08:00
f2d1b0eaf7
Merge branch 'fake_journal_data' into publication
...
* fake_journal_data:
make a 'real' fake data
2012-11-26 14:05:50 +08:00
5e04ec70a3
make a 'real' fake data
2012-11-26 11:52:11 +08:00
10c1b3e6a2
Merge branch 'master' of https://github.com/Rulingcom/orbit
...
* 'master' of https://github.com/Rulingcom/orbit : (136 commits)
member selects
add paper status textfield
fix for showing subroles
member selects
fix for showing subroles
add paper status textfield
delete fixed
fixed delete function
delete update
add co-author json
user roles starts
disable data transform when switching attribute field type. new member stable
correct 'edit' button of journal list
make fake data
fix for json and some other bugs
add delete link
fixed add journal and co-author curd problem, but have redirect problem...
hidden file field, and fixed updated function
Fix album images display
user roles starts
...
2012-11-26 11:36:13 +08:00
6b248a949b
Merge branch 'member_plugin' of github.com:Rulingcom/orbit into member_plugin
2012-11-26 10:25:57 +08:00
Rueshyna
Harry Bomrah
Matthew K. Fu JuYuan
chris
Harry Bomrah