9254b9960d
Add timeout to user
2012-12-03 21:45:00 +08:00
fbe2b26e9f
Do not create layout part if it already exists
2012-12-03 18:59:32 +08:00
4f9aa63045
Remove extra end
2012-12-03 18:45:32 +08:00
5c7f1aa164
Fix saving of page_part after layout change
2012-12-03 18:42:50 +08:00
05be9dbc33
Merge branch 'publication' of https://github.com/Rulingcom/orbit into publication
...
* 'publication' of https://github.com/Rulingcom/orbit :
stupid bug fixed
2012-12-03 17:53:09 +08:00
Harry Bomrah
f227e55c4f
stupid bug fixed
2012-12-03 17:52:05 +08:00
2757044c32
Forgot to save the page_parts
2012-12-03 17:49:26 +08:00
bdcfb46294
Fix previous commit
2012-12-03 17:38:55 +08:00
6543491a53
Save pages to generate page_parts when a layout is updated
2012-12-03 17:25:27 +08:00
afee03cd1f
uniq relation
2012-12-03 17:25:07 +08:00
5660ff8f03
can display relation between author
2012-12-03 17:16:28 +08:00
6d2fa673c7
Merge branch 'select_co_author_relation' into publication
...
* select_co_author_relation:
add back button
2012-12-03 16:20:40 +08:00
8110ef1735
add back button
2012-12-03 16:19:53 +08:00
4ebb274d41
Merge branch 'publication' of https://github.com/Rulingcom/orbit into publication
...
* 'publication' of https://github.com/Rulingcom/orbit :
new type fixed
2012-12-03 15:45:24 +08:00
Harry Bomrah
dc1ce37c90
new type fixed
2012-12-03 15:44:26 +08:00
0011fb8972
separate relation list from index page and render it
2012-12-03 15:00:55 +08:00
659b3fe494
Merge branch 'select_co_author_relation' into publication
...
* select_co_author_relation:
can select relection from relation db
2012-12-03 14:57:14 +08:00
c8c4444497
Merge branch 'publication' of https://github.com/Rulingcom/orbit into publication
...
* 'publication' of https://github.com/Rulingcom/orbit :
form for coauthor - fixed
2012-12-03 14:56:46 +08:00
7ba65caa70
can select relection from relation db
2012-12-03 14:55:57 +08:00
Harry Bomrah
56aa125ade
form for coauthor - fixed
2012-12-03 14:54:52 +08:00
3e1e2c47ec
modify delete co-author message
2012-12-03 14:04:23 +08:00
386f50e866
Merge branch 'publication' of https://github.com/Rulingcom/orbit into publication
...
* 'publication' of https://github.com/Rulingcom/orbit :
new type fixed
2012-12-03 13:18:48 +08:00
Harry Bomrah
8ab7245695
new type fixed
2012-12-03 12:47:05 +08:00
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
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
chris
Rueshyna
Harry Bomrah