Nicolas Le Goff 7fb44d2b43 Fix merge

2014-02-19 17:29:27 +01:00

..

Collection.php

Address PR comments

2014-02-19 17:29:27 +01:00

ConnectedUsers.php

Add a namespace to Phraseanet doctrine entities

2014-02-18 19:32:08 +01:00

Dashboard.php

Address PR comments

2014-02-19 17:29:27 +01:00

Databox.php

Merge branch '3.8'

2014-02-05 19:42:22 +01:00

Databoxes.php

Merge branch '3.8'

2014-02-05 19:42:22 +01:00

Fields.php

Merge branch '3.8'

2014-02-05 19:42:22 +01:00

Publications.php

Fix merge

2014-02-19 17:29:27 +01:00

Root.php

Merge branch '3.8'

2014-02-05 19:42:22 +01:00

SearchEngine.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

Setup.php

Merge branch '3.8'

2014-01-06 15:38:14 +01:00

Subdefs.php

Merge branch '3.8'

2014-02-05 19:42:22 +01:00

TaskManager.php

Use backbone to display taskmanager front end

2014-02-14 16:55:45 +01:00

Users.php

Address PR comments

2014-02-19 17:29:27 +01:00