Rueshyna 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

..

appstore

font awesome update

2012-07-02 11:10:01 +08:00

books

Seminar Pages modified

2012-07-05 16:27:59 +08:00

patents

relpace seminar to conference

2013-02-04 18:01:38 +08:00

research_domain

relpace seminar to conference

2013-02-04 18:01:38 +08:00

research_project

relpace seminar to conference

2013-02-04 18:01:38 +08:00

settings

simple layout tinyscrollbar fixed

2013-03-05 11:04:18 +08:00

allsections.html.erb

tinyscrollbar fixed

2013-03-04 12:37:29 +08:00

app_manager.html.erb

make journal list easy to read

2012-12-06 07:59:42 +08:00

app_view1.html.erb

app update

2012-05-21 15:25:18 +08:00

appstore.html.erb

Desktop updates various

2012-11-21 07:37:44 +08:00

books.html.erb

new desktop framework updates

2012-12-27 18:25:54 +08:00

desktop.html.erb

make journal list easy to read

2012-12-06 07:59:42 +08:00

index.html.erb

fixed desktop several bug

2013-03-05 17:31:57 +08:00

orbit.html.erb

Timeline design and timescale update

2012-07-06 16:11:03 +08:00

research_d.html.erb

Desktop updates various

2012-11-21 07:37:44 +08:00

research_p.html.erb

Desktop updates various

2012-11-21 07:37:44 +08:00

settings.html.erb

change settings table default display

2012-12-06 07:59:42 +08:00