d5f1d13670
* 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 |
||
---|---|---|
.. | ||
ad_banner | ||
announcement | ||
archive | ||
calendar | ||
gallery | ||
location | ||
miss_module/config/locales | ||
page_content | ||
personal_book | ||
personal_conference | ||
personal_diploma | ||
personal_experience | ||
personal_honor | ||
personal_journal | ||
personal_lab | ||
personal_patent | ||
personal_project | ||
personal_research | ||
web_resource |