Romain Neutron f955163edb Merge branch '3.7' into 3.8 ...

Conflicts:
	lib/Alchemy/Phrasea/Application/Api.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/conf.d/_GV_template.inc

2013-09-14 02:02:56 +02:00

..

API

Merge branch '3.7' into 3.8

2013-09-14 02:02:56 +02:00

appbox

Fix doc blocks

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

Bridge

Add error pages, fix error handling and PHP conf

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

cache

Fix doc blocks

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

caption

Fix #1369 : Retrieve fields by structure order

2013-07-23 18:41:26 +02:00

connection

Fix doc blocks

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

databox

Fix #1377 Can not delete status bit

2013-08-05 14:53:25 +02:00

deprecated

Add labels to databoxes

2013-06-13 09:45:43 +02:00

eventsmanager

Fix validation reminder

2013-07-17 19:31:53 +02:00

Exception

Add error pages, fix error handling and PHP conf

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

Feed

Remove registry's GV_RootPath calls

2013-06-19 19:25:16 +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 tmp directories cleanup

2013-09-04 17:14:53 +02:00

patch

Merge branch '3.7' into 3.8

2013-09-14 02:02:56 +02:00

patchthesaurus

Thesaurus refactor

2013-02-28 16:14:33 +01:00

record

Move substituion logger from class method to controllers

2013-08-08 16:25:15 +02:00

recordutils

Merge pull request #607 from romainneutron/fix-1426

2013-09-02 08:14:18 -07:00

Session

Remove phraseanet services, update configuration

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

set

Fix CS

2013-06-28 22:31:33 +02:00

Setup

Fix install

2013-05-23 18:52:41 +02:00

system

Fix CS lib/classes

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

task

Fix archive task default settings

2013-09-13 10:42:17 +02:00

thesaurus

Fix CS lib/classes

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

User

Remove deprecated code

2013-07-23 17:20:23 +02:00

ACL.php

Apply time limits on template application

2013-06-14 09:47:30 +02:00

appbox.php

Fix tmp directories cleanup

2013-09-04 17:14:53 +02:00

base.php

Remove registry's GV_RootPath calls

2013-06-19 19:25:16 +02:00

Browser.php

Use composer as application autoloader

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

collection.php

Remove deprecated code

2013-07-23 17:20:23 +02:00

connection.php

Remove phraseanet services, update configuration

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

DailymotionWithoutOauth2.php

Fix doc blocks

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

databox.php

Fix #1243 Phraseanet enabled languages is now configurable

2013-07-17 21:22:01 +02:00

format.php

Use composer as application autoloader

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

ftpclient.php

Fix CS lib/classes

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

p4field.php

Use composer as application autoloader

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

p4file.php

Bump copyright year

2013-01-21 23:28:58 +01: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

Fix CS lib/classes

2013-01-29 16:39:02 +01: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

Use PhpExecutableFinder to find PHP binary

2013-07-23 16:56:23 +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

Use composer as application autoloader

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

ZipArchiveImproved.php

Fix doc blocks

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