Harry Bomrah
0e39de56e2
section page fixed..
2013-03-21 18:25:36 +08:00
f0fbd50261
fixed checkout and start in personal plugin
2013-03-21 18:25:36 +08:00
573270c98c
correct factoried girl for journal
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
4b8c68500a
remove redundant space of co_author sample data
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
38a695d8a9
all none for conf done
2013-03-21 18:09:38 +08:00
Harry Bomrah
df83c6fff7
all none fixed
2013-03-21 18:09:38 +08:00
41311c74d0
Spen's changes in archive
2013-03-21 14:38:04 +08:00
04d3e177d5
Fix typo in core lib
...
Change i18n for more link in announcement init
2013-03-20 17:45:08 +08:00
031cf927d5
Sort archive by top and creation date
2013-03-20 17:22:40 +08:00
e71b002438
Fix archive front end query for multiple categories
2013-03-20 15:37:34 +08:00
90f08c96fc
Fix merge error: add missing delete route
2013-03-20 02:11:29 +08:00
6abf53f34d
change page number of archive
2013-03-19 23:43:28 +08:00
4e151690e9
fixed archive bug, make it have page and category
2013-03-19 23:42:39 +08:00
f3c809fd58
Fix link switch not showing for default front end
2013-03-19 17:49:46 +08:00
f29ad27b56
Fix pagination in archive back end
2013-03-18 21:53:31 +08:00
aacfcf1997
Fix typo in translations
2013-03-18 21:52:52 +08:00
2427bc5b69
Update CSS for archive and put the call in widget index
2013-03-13 17:21:39 +08:00
b864cc0268
Changes in I18n (except personal_conference and personal_journal)
2013-03-12 18:13:48 +08:00
d7d480ac12
archive edit & plugins edit
2013-03-07 21:12:31 +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
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
Harry Bomrah
Rueshyna
chris
Spen
devin