hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-08 18:44:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,165 Commits 268 Branches 107 Tags
PHRAS-4157-Elasticsearch-ulimits-configuration
Commit Graph

104 Commits

Author SHA1 Message Date
Romain Neutron
e233e5afa6 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Command/Developer/JavascriptBuilder.php
	lib/Alchemy/Phrasea/Controller/Prod/Basket.php
	lib/Alchemy/Phrasea/Core/Provider/TaskManagerServiceProvider.php
	lib/classes/Exception/Feed/ItemNotFound.php
	lib/classes/Exception/Feed/PublisherNotFound.php
	lib/classes/Feed/Abstract.php
	lib/classes/Feed/Adapter.php
	lib/classes/Feed/Aggregate.php
	lib/classes/Feed/Collection.php
	lib/classes/Feed/CollectionInterface.php
	lib/classes/Feed/Entry/Adapter.php
	lib/classes/Feed/Entry/Collection.php
	lib/classes/Feed/Entry/Interface.php
	lib/classes/Feed/Entry/Item.php
	lib/classes/Feed/Entry/ItemInterface.php
	lib/classes/Feed/Interface.php
	lib/classes/Feed/Link.php
	lib/classes/Feed/LinkInterface.php
	lib/classes/Feed/Publisher/Adapter.php
	lib/classes/Feed/Publisher/Interface.php
	lib/classes/Feed/Token.php
	lib/classes/Feed/TokenAggregate.php
	lib/classes/Feed/XML/Abstract.php
	lib/classes/Feed/XML/Atom.php
	lib/classes/Feed/XML/Cooliris.php
	lib/classes/Feed/XML/Interface.php
	lib/classes/Feed/XML/RSS.php
	lib/classes/Feed/XML/RSS/ImageInterface.php
	lib/classes/http/request.php
	lib/classes/module/console/schedulerStart.php
	lib/classes/module/console/schedulerState.php
	lib/classes/module/console/schedulerStop.php
	lib/classes/module/console/taskState.php
	lib/classes/module/console/tasklist.php
	lib/classes/module/console/taskrun.php
	lib/classes/registry.php
	lib/classes/registryInterface.php
	lib/classes/set/order.php
	lib/classes/system/url.php
	lib/classes/task/Scheduler.php
	lib/classes/task/appboxAbstract.php
	lib/classes/task/databoxAbstract.php
	lib/classes/task/manager.php
	lib/classes/task/period/RecordMover.php
	lib/classes/task/period/apibridge.php
	lib/classes/task/period/archive.php
	lib/classes/task/period/cindexer.php
	lib/classes/task/period/emptyColl.php
	lib/classes/task/period/ftp.php
	lib/classes/task/period/ftpPull.php
	lib/classes/task/period/subdef.php
	lib/classes/task/period/test.php
	lib/classes/task/period/writemeta.php
	lib/conf.d/PhraseaFixture/AbstractWZ.php
	lib/conf.d/PhraseaFixture/Basket/LoadFiveBaskets.php
	lib/conf.d/PhraseaFixture/Basket/LoadOneBasket.php
	lib/conf.d/PhraseaFixture/Basket/LoadOneBasketEnv.php
	lib/conf.d/PhraseaFixture/Lazaret/LoadOneFile.php
	lib/conf.d/PhraseaFixture/Story/LoadOneStory.php
	lib/conf.d/PhraseaFixture/UsrLists/ListAbstract.php
	lib/conf.d/PhraseaFixture/UsrLists/UsrList.php
	lib/conf.d/PhraseaFixture/UsrLists/UsrListEntry.php
	lib/conf.d/PhraseaFixture/UsrLists/UsrListOwner.php
	lib/conf.d/PhraseaFixture/ValidationParticipant/LoadOneParticipant.php
	lib/conf.d/PhraseaFixture/ValidationParticipant/LoadParticipantWithSession.php
	lib/conf.d/PhraseaFixture/ValidationSession/LoadOneValidationSession.php
 2014-01-06 15:38:14 +01:00
Romain Neutron
d519c13e56 Bump copyright year 2014-01-06 15:28:12 +01:00
Romain Neutron
6c45e8d40a Add improvements to unit tests 2013-12-20 10:51:35 +01:00
Romain Neutron
680643c0fc Fix unit tests and arrays declaration 2013-12-03 20:06:49 +01:00
Romain Neutron
2ba164701d Use symfony translator 2013-12-03 20:02:40 +01:00
Romain Neutron
6ab51d55f8 Add missing headers 2013-11-20 19:03:55 +01:00
Romain Neutron
051d9f4035 Remove license comments 2013-11-20 16:49:29 +01:00
Romain Neutron
56b373ee6e Use short array declaration 2013-11-18 13:57:33 +01:00
Romain Neutron
9b471fdf76 Fix CS 2013-10-31 11:53:30 +01:00
Nicolas Le Goff
9fc8fbc194 Fix API password grant type authentication 2013-10-03 17:12:46 +02:00
Romain Neutron
d294e553d8 Fix office plugin class name 2013-09-30 18:25:41 +02:00
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
Romain Neutron
3649d89b81 Cleanup CS 2013-09-09 13:31:31 +02:00
Romain Neutron
871fa40553 Add Office Plugin client id and secret 2013-09-09 13:31:31 +02:00
Romain Neutron
42db38d055 Add error pages, fix error handling and PHP conf 2013-06-17 17:01:35 +02:00
Romain Neutron
76413165ff Update authentication to service provider 2013-05-29 14:22:51 +02:00
Romain Neutron
c184278b40 Fix doc blocks 2013-01-29 18:34:50 +01:00
Romain Neutron
4414892b91 Fix CS lib/classes 2013-01-29 16:39:02 +01:00
Romain Neutron
842ad40985 Bump copyright year 2013-01-21 23:28:58 +01:00
Romain Neutron
2069d40544 Use composer as application autoloader 2013-01-18 17:47:25 +01:00
Romain Neutron
1700565862 Cleanup namepaces, variables uses 2012-10-04 15:44:49 +02:00
Romain Neutron
0ac8a9d8ae Fix tests on PHP 5.4 2012-10-04 15:43:35 +02:00
Romain Neutron
0b5a6d15f2 Fix OAuth2 code object 2012-10-04 15:43:33 +02:00
Romain Neutron
f40764a2a3 Update Oauth2 application 2012-10-04 15:43:13 +02:00
Nicolas Le Goff
6cb75ecec5 add /developers/ route 2012-07-18 17:15:54 +02:00
Nicolas Le Goff
b4ff14f3e4 update API 
revert bad merge

fix cs
 2012-07-10 11:54:05 +02:00
Romain Neutron
e28184167e Fix CS 2012-06-19 10:40:14 +02:00
Romain Neutron
4afa21d419 Fix CS 2012-05-23 00:01:29 +02:00
Nicolas Le Goff
fc61c289a9 fix issue when app creator is null 2012-04-27 18:55:35 +02:00
Romain Neutron
093869d3d0 Add devices in API answer / CS / Fixes 
Add tests to media subdefs
Fix CS
Add Mplayer to build
Fix Alchemy\Phrasea\Exceptions
Add media_subdef etags
 2012-04-27 16:46:52 +02:00
Romain Neutron
47636c4faa Fix build 2012-04-27 12:19:56 +02:00
Nicolas Le Goff
d443c12a5a fix coding standard 2012-04-26 19:14:47 +02:00
Nicolas Le Goff
90b3870901 add grant_type password for oauth2Client, handle trusted client such as Phraseanet Navigator 2012-04-26 18:23:44 +02:00
Nicolas Le Goff
9ec4535832 check if oAuth2 client has password grant type enable for password grant_type authentication flow 2012-04-26 14:33:42 +02:00
Nicolas Le Goff
3e8ffac725 add activated and grant_password property 2012-04-26 14:32:18 +02:00
Romain Neutron
70519a471a Update copyright year 2012-04-26 02:06:29 +02:00
Romain Neutron
adc74dc1d8 Add curly braces 2012-04-26 02:00:18 +02:00
Romain Neutron
33b10d6746 Add curly braces 2012-04-26 01:55:12 +02:00
Romain Neutron
ade22295ad Fix CS 2012-04-26 00:55:53 +02:00
Romain Neutron
dd994a9bd6 Fix CS 2012-04-25 17:38:49 +02:00
Nicolas Le Goff
b3d37ca7b0 Merge branch 'fix_native_auth' into Dev 2012-04-13 15:50:02 +02:00
Nicolas Le Goff
636f6dc21d fix native auth flow 2012-04-13 15:47:29 +02:00
Nicolas Le Goff
527b3639b5 implements oauth2.0 v9.0 Resource Owner Basic Credentials 2012-04-13 15:44:39 +02:00
Romain Neutron
81e5d4c230 Switch PHPMailer, MoovRelocator, Zend Gdata, TCPDF, Oauth2, PhlickR, PHPShortener from git submodules to Composer 2012-03-30 20:13:40 +02:00
Romain Neutron
9e640c27cf Switch PHPMailer, MoovRelocator, Zend Gdata, TCPDF, Oauth2, PhlickR, PHPShortener from git submodules to Composer 2012-03-30 20:13:40 +02:00
Romain Neutron
82d9eeef7b Coding standards 2012-03-09 12:49:13 +01:00
Nicolas Le Goff
33b225a290 fix oauth app creation bug 2012-02-22 16:55:50 +01:00
Nicolas Le Goff
f0fa06f51f delete 2012-02-16 18:54:18 +01:00
Nicolas Le Goff
792d00efcb fix desktop application creation issue 2012-02-16 15:14:38 +01:00
Romain Neutron
a9c7ed23cb Coding standards 2012-02-02 15:43:12 +01:00