311d741f92
style for front end
2013-03-11 18:21:17 +08:00
8e0632236b
modify nil of email string and sort
2013-03-11 17:21:02 +08:00
78abcac1cb
remove redundant space of co_author sample data
2013-03-11 17:20:24 +08:00
385e043809
make index of list can be hightline list when click cancel button
2013-03-11 17:18:58 +08:00
8d5a2d71b7
fixed author sample data generation and model method
2013-03-11 14:53:21 +08:00
1880ed11ca
add author filter for journal and fix some bug
2013-03-11 10:41:07 +08:00
96602842a3
have done conference author filter, journal haven't been done, yet
2013-03-08 19:16:01 +08:00
Harry Bomrah
ca64cba9ad
updated
2013-03-08 12:54:58 +08:00
Harry Bomrah
4f64ff3568
insert and remove columns
2013-03-08 12:23:15 +08:00
a22c0c46e0
tinyscrollbar css minor update
2013-03-08 12:23:15 +08:00
Harry Bomrah
196030b4b4
Major tinyscrollbar update
2013-03-08 12:23:15 +08:00
75a5e74bc0
add pagination for personal plugin
2013-03-08 12:01:13 +08:00
73e9a60212
Pagination or more link for default widget
2013-03-07 21:21:48 +08:00
d7d480ac12
archive edit & plugins edit
2013-03-07 21:12:31 +08:00
Harry Bomrah
39a20f6cc9
Merge branch 'desktop_work' into desktop_work_devin
2013-03-07 19:16:41 +08:00
Harry Bomrah
32d56232bc
insert and remove columns
2013-03-07 19:15:30 +08:00
b7beadfc04
tinyscrollbar css minor update
2013-03-07 17:44:02 +08:00
147b7b9292
Fix update when no tag or category
2013-03-07 17:30:49 +08:00
e53ad9f5d1
1.make module app forbid unearthed access except from admin
...
2.override sidebar link when it's object_auth or app_auth.
2013-03-07 16:51:47 +08:00
b2cbcf6629
fixed bug
2013-03-07 10:50:43 +08:00
Harry Bomrah
906e522a6a
Major tinyscrollbar update
2013-03-06 19:04:33 +08:00
4f7928ad1b
Merge branch 'development' of github.com:Rulingcom/orbit into development
2013-03-06 15:17:06 +08:00
77c7053bf1
put add admin pages using orbit back end controller
2013-03-06 15:16:20 +08:00
Harry Bomrah
20ac4f1ac0
all none for conf done
2013-03-06 12:08:08 +08:00
Harry Bomrah
9931eb7f61
all none fixed
2013-03-06 11:32:53 +08:00
27686a5d04
Merge branch 'development' into desktop
2013-03-05 19:07:58 +08:00
a9bf400fac
Merge branch 'desktop_work_devin' into desktop
...
* desktop_work_devin:
tinyscrollbar minor update
desktop CSS update
tinyscrollbar minor update
desktop CSS update
Conflicts:
app/views/desktop/index.html.erb
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_form.html.erb
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/index.html.erb
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_authors/_form.html.erb
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_window.html.erb
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_form.html.erb
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/index.html.erb
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/_form.html.erb
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_window.html.erb
2013-03-05 18:48:12 +08:00
74900ac048
Merge branch 'desktop_work' into desktop_work_devin
...
* desktop_work:
tinyscrollbar minor update
desktop CSS update
Conflicts:
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/_form.html.erb
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb
2013-03-05 18:35:17 +08:00
dc3966be81
fix cates and tags
2013-03-05 18:34:41 +08:00
f2f8ffd157
tinyscrollbar minor update
2013-03-05 17:48:29 +08:00
924ecc3b1f
desktop CSS update
2013-03-05 17:48:28 +08:00
d5f1d13670
Merge remote-tracking branch 'origin/desktop_work' into desktop
...
* origin/desktop_work:
simple layout tinyscrollbar fixed
highlighting fixed…
fixed adding.
layout fix
tinyscrollbar_bug fixed
url handling modified.. tinyscrollbar modified… star checkbox fixed..
tinyscrollbar fixed
some changes for gridster
Lot of changes in gridster
Conflicts:
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb
2013-03-05 17:34:28 +08:00
806ffe0a1e
fixed desktop several bug
2013-03-05 17:31:57 +08:00
db2b371744
tinyscrollbar minor update
2013-03-05 17:22:53 +08:00
f6272728d5
fixed delete co author relation bug
2013-03-05 12:41:42 +08:00
430981a534
checked back and cancel button of personal plugin and fixed journal co author save and update bug
2013-03-05 12:14:10 +08:00
626b2a7bca
fix default failed when cate or tags set to empty
2013-03-05 11:48:20 +08:00
Harry Bomrah
3182f5c9a8
merging
2013-03-05 11:20:01 +08:00
Harry Bomrah
dc92ef9f42
simple layout tinyscrollbar fixed
2013-03-05 11:04:18 +08:00
4e24223c78
desktop CSS update
2013-03-05 09:39:01 +08:00
285119a5f3
fix for multi select cates and tags
2013-03-04 19:29:45 +08:00
80b6a9ab48
Merge branch 'desktop' into desktop_work
...
* desktop:
highlighting fixed…
add Devin's css file for gallery
using refine tiny scroll bar js for personal plugin
fixed adding.
layout fix
layout fix
tinyscrollbar_bug fixed
url handling modified.. tinyscrollbar modified… star checkbox fixed..
tinyscrollbar fixed
some changes for gridster
Lot of changes in gridster
authors auto-complete
fixed paper title and journal title bug
Conflicts:
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_show_form.html.erb
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/index.html.erb
vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_show_form.html.erb
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb
2013-03-04 18:03:59 +08:00
Harry Bomrah
b5abbc9ef0
highlighting fixed…
2013-03-04 17:57:32 +08:00
Harry Bomrah
ee5fd18b64
highlighting fixed…
2013-03-04 17:44:55 +08:00
874648eacf
add Devin's css file for gallery
2013-03-04 17:27:36 +08:00
a6ca308a5e
using refine tiny scroll bar js for personal plugin
2013-03-04 16:35:09 +08:00
Harry Bomrah
8ade2c5949
fixed adding.
2013-03-04 16:31:37 +08:00
Harry Bomrah
0c659e5a9b
layout fix
2013-03-04 16:31:37 +08:00
Harry Bomrah
d4392c8d56
fixed adding.
2013-03-04 16:21:35 +08:00
Harry Bomrah
6ae4e4d0ef
layout fix
2013-03-04 15:48:24 +08:00
Fu Matthew
Rueshyna
Harry Bomrah
devin
chris
Spen