Christophe Vilayphiou ef49df448d Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team ...

Conflicts:
	app/helpers/admin/item_helper.rb

2012-05-11 18:09:34 +08:00

..

assets

Ray's changes for drag and drop in structure's side_bar

2012-05-11 17:54:33 +08:00

controllers

Fix bugs for shift_to and change items.rake for the missing position in db

2012-05-11 17:56:26 +08:00

helpers

Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team

2012-05-11 18:09:34 +08:00

jobs

Patch from ldap: Test version for DB sync schedule job

2012-05-08 21:14:57 +08:00

mailer

Add mail_settings

2012-05-09 11:38:29 +08:00

models

Fix bugs for shift_to and change items.rake for the missing position in db

2012-05-11 17:56:26 +08:00

uploaders

Modifications for images in html code

2011-10-18 11:21:24 +08:00

views

Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team

2012-05-11 18:09:34 +08:00