5178ce3bde
modify nil of email string and sort
2013-04-17 11:04:52 +08:00
95128a3465
remove redundant space of co_author sample data
2013-04-17 11:04:52 +08:00
8783b8e5fe
make index of list can be hightline list when click cancel button
2013-04-17 11:04:52 +08:00
a3de4cc2d4
fixed author sample data generation and model method
2013-04-17 11:04:52 +08:00
625f2e9ad6
have done conference author filter, journal haven't been done, yet
2013-04-17 11:04:52 +08:00
e9ddb85734
add pagination for personal plugin
2013-04-17 10:56:49 +08:00
Harry Bomrah
1d06bcaae7
Major tinyscrollbar update
2013-04-17 10:54:38 +08:00
Harry Bomrah
6cd97adf21
all none for conf done
2013-04-17 10:54:38 +08:00
Harry Bomrah
0189d1c2c0
all none fixed
2013-04-17 10:54:38 +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
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
a6ca308a5e
using refine tiny scroll bar js for personal plugin
2013-03-04 16:35:09 +08:00
Harry Bomrah
0c659e5a9b
layout fix
2013-03-04 16:31:37 +08:00
Harry Bomrah
6ae4e4d0ef
layout fix
2013-03-04 15:48:24 +08:00
Harry Bomrah
9a32732ae4
layout fix
2013-03-04 14:57:36 +08:00
Harry Bomrah
23c8c28b52
tinyscrollbar fixed
2013-03-04 12:37:29 +08:00
8f1d7b55ab
authors auto-complete
2013-03-04 12:16:46 +08:00
Harry Bomrah
c82e9a646d
tinyscrollbar fixed
2013-02-27 18:55:26 +08:00
4bc3a57862
give back and cancel button a link for personal conference
2013-02-26 18:37:58 +08:00
d0b54a4d6c
done conferece seeds
2013-02-26 15:52:42 +08:00
c55f64f3c6
correct view permission of conference
2013-02-26 15:17:09 +08:00
8b0ffe747c
sort conference and type
2013-02-25 11:46:20 +08:00
6929d30b5d
add conferene list order function
2013-02-25 11:46:11 +08:00
cd98f9c889
member plugin init add frontend
2013-02-22 18:21:11 +08:00
8704fb30d5
Fix init name/key
2013-02-22 14:46:22 +08:00
9a63adedde
Remove seminar from conference init
2013-02-22 11:57:10 +08:00
680d7908b9
member plugin init edit
2013-02-21 17:53:08 +08:00
d46abd7caf
member list edit
2013-02-21 14:13:46 +08:00
4ee85a8c09
add coauthor and coauthor relation function
2013-02-21 13:58:47 +08:00
13c757e8a9
clean add/edit page and add conference list page
2013-02-21 13:58:30 +08:00
16fda25ace
done personal conference add/edit page
2013-02-21 13:53:50 +08:00
6d65af0312
done personal conference list page, but it need to js.
2013-02-21 13:53:50 +08:00
2afbae7c08
make a fake data for personal conference plugin
2013-02-21 13:53:50 +08:00
1c4b696052
add add/edit form page and controller
2013-02-21 13:53:50 +08:00
54b12a193a
add translation configuration
2013-02-21 13:53:47 +08:00
158fd8ffff
fixed conference icon and rename _p to _window of conference view
2013-02-21 13:51:42 +08:00
f1db7be14e
remove test and change for personal journal
2013-02-21 13:51:37 +08:00
a61ec183c9
change add/edit url of personal_conference
2013-02-21 13:50:12 +08:00
f59da3ce81
member plugin init edit
2013-02-20 18:05:09 +08:00
bc44d38948
member plugin edit
2013-02-20 17:25:20 +08:00
61648d23e1
Change delete_all to destroy_all
2013-02-19 17:39:42 +08:00
3676de8a14
Change validation for url: can include IPs
2013-02-19 17:39:42 +08:00
0a115906f1
fix i18n,reload problems
2013-02-19 14:21:54 +08:00
a6f6dc271c
fix i18n,reload problems
2013-02-18 15:13:31 +08:00
3791046e5a
Add missing link to writing conference index
2013-02-04 18:01:42 +08:00
8f334f6948
modularize conference
2013-02-04 18:01:42 +08:00
d4df7c82d3
relpace seminar to conference
2013-02-04 18:01:38 +08:00
Rueshyna
Harry Bomrah
chris
Spen
devin
spen
unknown
Fu Matthew