This repository has been archived on 2024-03-16. You can view files and clone it, but cannot push or open issues or pull requests.
orbit-4-1/app
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
..
assets simple layout tinyscrollbar fixed 2013-03-05 11:04:18 +08:00
controllers Merge branch 'development' of github.com:Rulingcom/orbit into development 2013-02-27 11:03:52 +08:00
errors show error message when trying to show a not existed page 2013-01-03 13:50:27 +08:00
helpers fix default widget link 2013-02-27 10:50:47 +08:00
jobs Schedule job for tag_cloud 2013-01-08 12:36:50 +08:00
mailer Add mail_settings 2012-05-09 11:38:29 +08:00
models first version of multi categories and tags 2013-02-27 10:49:48 +08:00
uploaders Merge commit 'fc702a6210d901cd3beea220e72f71a3b7f7d41e' into sidebar_config 2013-01-24 16:30:02 +08:00
views Merge remote-tracking branch 'origin/desktop_work' into desktop 2013-03-05 17:34:28 +08:00