f3e40c1405
Merge branch 'desktop' of github.com:Rulingcom/orbit into desktop
...
Conflicts:
Gemfile.lock
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/index.html.erb
2013-03-21 18:39:09 +08:00
Harry Bomrah
6ba840de4a
app manager changed plus some changes
2013-03-21 18:29:22 +08:00
ddf61e5606
fixed co author relation save button
2013-03-21 18:25:37 +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
e5e45f3ada
make index of list can be hightline list when click cancel button
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
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
2746616610
Merge branch 'desktop_work' into desktop
...
* desktop_work:
app manager changed plus some changes
section page fixed..
section page fixed..
add browser compatibility page
Conflicts:
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb
2013-03-14 19:00:06 +08:00
61cc8f0f54
fixed co author relation save button
2013-03-14 18:29:24 +08:00
Harry Bomrah
8ab4e90a06
app manager changed plus some changes
2013-03-14 17:48:45 +08:00
4a2c994401
one abstract one column for personal plugin
2013-03-13 14:05:06 +08:00
b864cc0268
Changes in I18n (except personal_conference and personal_journal)
2013-03-12 18:13:48 +08:00
af6813480a
add pagination for every controller and view in personal plugin
2013-03-12 17:00:42 +08:00
Harry Bomrah
8e369fe819
tinyscrollbar pagination fixed
2013-03-12 11:42:17 +08:00
Harry Bomrah
2b4e53ed1b
insert and remove columns
2013-03-12 11:42:17 +08:00
Harry Bomrah
6d194759fa
Major tinyscrollbar update
2013-03-12 11:42:16 +08:00
d20081157a
modify translation for journal_co_author_relation button
2013-03-12 11:22:11 +08:00
385e043809
make index of list can be hightline list when click cancel button
2013-03-11 17:18:58 +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
4f64ff3568
insert and remove columns
2013-03-08 12:23:15 +08:00
Harry Bomrah
196030b4b4
Major tinyscrollbar update
2013-03-08 12:23:15 +08:00
b2cbcf6629
fixed bug
2013-03-07 10:50:43 +08:00
Harry Bomrah
9931eb7f61
all none fixed
2013-03-06 11:32:53 +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
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
chris
Harry Bomrah
Rueshyna
devin