f0fbd50261
fixed checkout and start in personal plugin
2013-03-21 18:25:36 +08:00
f61b786e90
one abstract one column for personal plugin
2013-03-21 18:25:36 +08:00
d085197635
add pagination for every controller and view in personal plugin
2013-03-21 18:25:36 +08:00
Harry Bomrah
478b54da26
tinyscrollbar pagination fixed
2013-03-21 18:25:05 +08:00
Harry Bomrah
e799ac4395
insert and remove columns
2013-03-21 18:25:05 +08:00
Harry Bomrah
c101413d32
Major tinyscrollbar update
2013-03-21 18:25:02 +08:00
50a09763ec
modify translation for journal_co_author_relation button
2013-03-21 18:24:20 +08:00
811b30791b
modify nil of email string and sort
2013-03-21 18:24:20 +08:00
e5e45f3ada
make index of list can be hightline list when click cancel button
2013-03-21 18:24:20 +08:00
f619c5e389
fixed author sample data generation and model method
2013-03-21 18:24:20 +08:00
3c6ca3c254
add author filter for journal and fix some bug
2013-03-21 18:24:20 +08:00
12fdb5a0ca
have done conference author filter, journal haven't been done, yet
2013-03-21 18:24:16 +08:00
Harry Bomrah
7df0be3826
tinyscrollbar pagination fixed
2013-03-21 18:22:28 +08:00
Harry Bomrah
80be9e63ef
insert and remove columns
2013-03-21 18:22:28 +08:00
Harry Bomrah
0444b1f5e5
Major tinyscrollbar update
2013-03-21 18:22:06 +08:00
91d3e1d92c
add pagination for personal plugin
2013-03-21 18:16:08 +08:00
fb8407dbe3
fixed bug
2013-03-21 18:10:55 +08:00
Harry Bomrah
9963c9fb68
insert and remove columns
2013-03-21 18:09:39 +08:00
Harry Bomrah
7b2e7f5297
Major tinyscrollbar update
2013-03-21 18:09:39 +08:00
Harry Bomrah
df83c6fff7
all none fixed
2013-03-21 18:09:38 +08:00
b864cc0268
Changes in I18n (except personal_conference and personal_journal)
2013-03-12 18:13:48 +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
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
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
Harry Bomrah
3182f5c9a8
merging
2013-03-05 11:20:01 +08:00
4e24223c78
desktop CSS update
2013-03-05 09:39:01 +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
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
9a32732ae4
layout fix
2013-03-04 14:57:36 +08:00
Harry Bomrah
e69679d3fe
tinyscrollbar_bug fixed
2013-03-04 12:37:29 +08:00
Harry Bomrah
2ead541733
url handling modified.. tinyscrollbar modified… star checkbox fixed..
2013-03-04 12:37:29 +08:00
Harry Bomrah
23c8c28b52
tinyscrollbar fixed
2013-03-04 12:37:29 +08:00
e99fef9404
fixed paper title and journal title bug
2013-03-04 11:45:39 +08:00
Harry Bomrah
c1cb5e5ffb
tinyscrollbar_bug fixed
2013-03-01 17:49:58 +08:00
Harry Bomrah
9b8ab2a2c1
url handling modified.. tinyscrollbar modified… star checkbox fixed..
2013-03-01 14:45:20 +08:00
Harry Bomrah
c82e9a646d
tinyscrollbar fixed
2013-02-27 18:55:26 +08:00
f431ab9ab5
give back and cancel button a link for personal journal
2013-02-26 18:37:33 +08:00
fb931b0a4a
Merge remote-tracking branch 'origin/desktop' into desktop
...
* origin/desktop:
Remove Gemfile.lock
sort conference and type
add conferene list order function
css minor changes.
gridster, url code fixed, views removed.
Fix selection of sub_menu for widget (the value wasn't set)
Fix bug in widget selection
css minor changes.
Fix public_r_tag selection
gridster, url code fixed, views removed.
2013-02-26 17:02:01 +08:00
6c9e2a7249
fixed journal co author bug
2013-02-26 16:57:08 +08:00
4ac0f19011
generate journal page by rails side and fixed model name bug
2013-02-26 15:15:09 +08:00
Harry Bomrah
9f362d9ae6
gridster, url code fixed, views removed.
2013-02-25 11:08:56 +08:00
Rueshyna
Harry Bomrah
chris
devin