0 Fork 0

T

Rueshyna 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

app

highlighting fixed…

2013-03-04 17:57:32 +08:00

config

fix widget field reload

2013-02-27 10:51:41 +08:00

split db/seeds.rb file to local plugin and done journal

2013-02-26 15:52:20 +08:00

doc

init rails 2.3.2

2009-05-08 00:53:18 +08:00