Romain Neutron a805c94524 Merge branch '3.8' ...

Conflicts:
	composer.json
	composer.lock
	lib/classes/task/Scheduler.php

2013-10-21 19:05:37 +02:00

..

API

Merge branch '3.8'

2013-10-15 19:11:39 +02:00

appbox

Fix doc blocks

2013-01-29 18:34:50 +01:00

Bridge

Fix strict standards

2013-09-13 19:51:31 +02:00

cache

Fix doc blocks

2013-01-29 18:34:50 +01:00

caption

Remove dead code

2013-09-04 12:14:50 +02:00

connection

Fix doc blocks

2013-01-29 18:34:50 +01:00

databox

Merge branch '3.8'

2013-10-03 15:29:22 +02:00

deprecated

Remove dead code

2013-09-04 12:14:50 +02:00

eventsmanager

Merge branch '3.8'

2013-09-19 15:10:54 +02:00

Exception

Removed remaining occurrences to Feed_, adapted patch_320f

2013-09-05 13:44:05 +02:00

http

Fix CS lib/classes

2013-01-29 16:39:02 +01:00

media

Update to latest media alchemyst api

2013-06-27 12:43:24 +02:00

module

Fix latest merge

2013-10-03 16:41:59 +02:00

patch

Merge pull request #699 from romainneutron/fix-1500

2013-10-17 04:58:13 -07:00

patchthesaurus

Add typehint on thesaurus functions

2013-09-04 15:30:46 +02:00

record

Merge branch '3.8'

2013-09-18 12:09:20 +02:00

recordutils

Fix CS

2013-09-30 18:26:32 +02:00

Session

Move updateClientInfos functioon to Session_Logger

2013-08-22 10:57:24 +02:00

set

Remove dead code

2013-09-04 12:14:50 +02:00

Setup

Remove get_wrong_email_users() from User_Adapter

2013-08-26 17:48:51 +02:00

system

Fix CS lib/classes

2013-01-29 16:39:02 +01:00

task

Merge branch '3.8'

2013-10-21 19:05:37 +02:00

thesaurus

Fix CS lib/classes

2013-01-29 16:39:02 +01:00

User

Remove calls to dropped orders table

2013-10-07 18:36:52 +02:00

ACL.php

Remove dead code

2013-09-04 12:14:50 +02:00

appbox.php

Merge branch 'feeds-entities' of https://github.com/csaoh/Phraseanet

2013-09-12 13:53:56 +02:00

base.php

Remove doctrine tables from drop advices

2013-09-24 11:03:41 +02:00

Browser.php

Use composer as application autoloader

2013-01-18 17:47:25 +01:00

collection.php

Fix #1528 : Restrict collection ordering on available collections

2013-10-15 14:14:44 +02:00

connection.php

Remove phraseanet services, update configuration

2013-06-11 14:05:44 +02:00

DailymotionWithoutOauth2.php

Fix strict standards

2013-09-13 19:51:31 +02:00

databox.php

Merge branch '3.8'

2013-09-19 14:53:55 +02:00

format.php

Use composer as application autoloader

2013-01-18 17:47:25 +01:00

ftpclient.php

Remove dead code

2013-09-04 12:14:50 +02:00

p4field.php

Use composer as application autoloader

2013-01-18 17:47:25 +01:00

p4file.php

Remove dead code

2013-09-04 12:14:50 +02:00

p4string.php

Fix doc blocks

2013-01-29 18:34:50 +01:00

patchInterface.php

Use composer as application autoloader

2013-01-18 17:47:25 +01:00

phrasea.php

Move static::guest_allowed method to Application

2013-07-12 20:06:31 +02:00

phraseadate.php

Fix CS lib/classes

2013-01-29 16:39:02 +01:00

queries.php

Add UserQuery entity

2013-08-25 13:55:04 +02:00

random.php

Add error pages, fix error handling and PHP conf

2013-06-17 17:01:35 +02:00

recordutils.php

Fix CS lib/classes

2013-01-29 16:39:02 +01:00

registry.php

Remove support of binary paths by registry

2013-06-27 12:43:24 +02:00

registryInterface.php

Bump copyright year

2013-01-21 23:28:58 +01:00

setup.php

Remove dead code

2013-09-04 12:14:50 +02:00

sso.php

syslog + maillog in task / task-manager as service

2013-01-21 12:50:35 +01:00

thesaurus.php

Use composer as application autoloader

2013-01-18 17:47:25 +01:00

unicode.php

Fix CS

2013-05-29 21:21:02 +02:00

uuid.php

Remove tests in loops

2013-09-04 14:20:35 +02:00

ZipArchiveImproved.php

Fix doc blocks

2013-01-29 18:34:50 +01:00