hazza/Phraseanet

mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00

Go to file

Nicolas Le Goff 6ba5ce6669 Merge branch '3.8'

Conflicts:
	lib/Alchemy/Phrasea/Controller/Admin/Root.php
	lib/classes/module/console/schedulerStart.php
	lib/classes/module/console/taskrun.php
	lib/classes/task/Scheduler.php
	lib/classes/task/abstract.php
	lib/classes/task/databoxAbstract.php
	templates/web/admin/collection/collection.html.twig
	templates/web/admin/databox/databox.html.twig
	templates/web/email-template.html.twig

2014-01-24 18:52:14 +01:00

Merge branch '3.8'

2014-01-07 10:40:47 +01:00

Session management is now part of Phraseanet configuration

2014-01-13 17:44:47 +01:00

Add placeholder

2012-10-04 23:12:58 +02:00

Merge branch '3.8'

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

project properties

2012-02-23 14:25:55 +01:00

functionnal-tests/api

Use short array declaration

2013-11-18 13:57:33 +01:00

Remove phraseanet registry

2013-12-20 16:44:22 +01:00

Merge branch '3.8'

2014-01-24 18:52:14 +01:00

Adding some folders

2011-12-07 17:42:08 +01:00

Move entities to Phrasea namespace

2013-10-29 16:56:49 +01:00

resources/locales

Use xliff instead of po files

2013-12-03 20:05:21 +01:00

Merge branch '3.8'

2014-01-24 18:52:14 +01:00

Add subdef substituer

2014-01-14 15:05:44 +01:00

Move Doctrine proxies

2013-12-18 18:40:11 +01:00

Merge branch '3.8'

2014-01-24 18:52:14 +01:00

.bowerrc

Rename assets directory to tmp-asset

2013-08-19 14:36:06 +02:00

.gitignore

Remove user specific files from gitignore

2013-11-13 17:55:31 +01:00

.travis.yml

Merge branch '3.8'

2014-01-06 16:06:38 +01:00

AUTHORS

Update authors and contributors

2012-11-09 14:38:50 +01:00

behat.yml.sample

Add selenium configuration example

2013-05-29 14:23:08 +02:00

bower.json

Remove json3 dependency

2013-12-02 18:59:18 +01:00

build-env.sh

Fix latest merges

2013-10-07 15:06:59 +02:00

builder.php

Use short array declaration

2013-11-18 13:57:33 +01:00

CHANGELOG.md

Session management is now part of Phraseanet configuration

2014-01-13 17:44:47 +01:00

composer.json

Update to latest monolog

2014-01-17 16:55:42 +01:00

composer.lock

Update to latest monolog

2014-01-17 16:55:42 +01:00

CONTRIBUTORS

Update CONTRIBUTORS

2012-11-13 00:02:05 +01:00

Gruntfile.js

Remove json3 dependency

2013-12-02 18:59:18 +01:00

launchpadToLocales.php

Use short array declaration

2013-11-18 13:57:33 +01:00

LICENSE

V 3.5 RC 1

2011-12-05 00:23:28 +01:00

localesToLaunchPad.php

Use short array declaration

2013-11-18 13:57:33 +01:00

package.json

Update version stability

2013-08-29 14:52:16 +02:00

phpunit.xml.dist

Add improvements to unit tests

2013-12-20 10:51:35 +01:00

README.md

Add a Bitdeli badge to README

2013-08-14 23:09:54 +00:00

UPGRADE-3.8.md

Add note about database upgrade and cleanup

2013-06-18 15:37:19 +02:00

UPGRADE-3.9.md

Bump master to version 3.9-dev

2013-08-06 11:36:55 +02:00

README.md

Phraseanet 3.9 - Digital Asset Management application

#Features :

Metadatas Management (include Thesaurus and DublinCore Mapping)
Search Engine (Sphinx Search Integration)
RestFull APIS (See Developer Documentation https://docs.phraseanet.com/Devel)
Bridge to Youtube/Dailymotion/Flickr

#Documentation :

https://docs.phraseanet.com/

#Installation

You must not download the source from GitHub, but download a packaged version here :

https://sourceforge.net/projects/phraseanet/files/

And follow the install steps described at https://docs.phraseanet.com/Admin/

#License

Phraseanet is licensed under GPL-v3 license.

Languages

PHP 68.6%

Twig 12.8%

JavaScript 11.4%

SCSS 3.9%

HTML 2.1%

Other 1%