hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-10 11:33:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,452 Commits 268 Branches 107 Tags
2df0f9d659d10064c20239b33280a059bee33cc6
Commit Graph

65 Commits

Author SHA1 Message Date
Romain Neutron
2df0f9d659 Merge branch '3.8' 2014-02-28 00:28:06 +01:00
Romain Neutron
51b9a7f89a Improve Xsendfile tools, allow dump whenever the conf is disabled 2014-02-26 18:47:31 +01:00
Romain Neutron
5a5da77662 Use Doctrine DBAL instead of custom connection 2014-02-22 23:55:12 +01:00
Nicolas Le Goff
383ff77449 Merge branch '3.8' 
Conflicts:
	.travis.yml
	lib/Alchemy/Phrasea/Controller/Permalink.php
	lib/classes/API/OAuth2/Adapter.php
	lib/classes/databox.php
 2014-01-27 17:23:03 +01:00
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
Nicolas Le Goff
d1537fd168 Fix #1672 Fix uninitialized variable in XsendFileMapiingGenerator 2014-01-24 12:11:49 +01:00
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
7e0a3c7338 Use configuration property accessor 2013-11-18 18:48:27 +01:00
Romain Neutron
56b373ee6e Use short array declaration 2013-11-18 13:57:33 +01:00
Romain Neutron
13915dc1a8 Rename "phraseanet.configuration" service to "configuration" 2013-11-15 22:08:07 +01:00
Romain Neutron
4c90f168a7 Remove unused use statements 2013-09-04 14:25:01 +02:00
Romain Neutron
f07ace58bc Add plugins reset command 2013-08-08 15:35:46 +02:00
Nicolas Le Goff
61581c5c99 adressed @romainneutron's comments 2013-08-07 12:01:58 +02:00
Nicolas Le Goff
7959b4bd66 Fix #1375 Add possibility to choose data path in interactive mode 2013-08-05 14:53:25 +02:00
Romain Neutron
899549d45a Fix #1242 : Commands description check, move generate:template command to developer console 2013-07-17 20:14:23 +02:00
Romain Neutron
056ac28120 Refactor command line utilities 2013-07-16 16:01:17 +02:00
Nicolas Le Goff
5b0bc8b284 Add recess binary 
Set recess binary to config
 2013-07-12 20:06:32 +02:00
Romain Neutron
396a7809ac Merge pull request #509 from romainneutron/config-test 
[3.8] Refactor configuration check
 2013-07-12 11:02:06 -07:00
Romain Neutron
c4b977469d Refactor configuration check 2013-07-12 18:40:12 +02:00
Romain Neutron
6be4e789b5 Optimize xsendfile mapping generator, use the factory to generate mapping 2013-07-12 17:08:17 +02:00
Romain Neutron
a231826ab0 Fix #1290 : Download xith xsendfile activated fails 2013-07-11 12:49:41 +02:00
Romain Neutron
20621f4040 Add more precision for available template languages 2013-07-10 14:27:00 +02:00
Romain Neutron
4265ee3fea Initialize $template value 2013-07-10 14:24:09 +02:00
Romain Neutron
ca7501f9c1 Hide passwords in bin/setup system:install command 2013-07-10 14:23:41 +02:00
Romain Neutron
3648a0f52a Rename XSendFile commands 2013-07-09 18:20:33 +02:00
Romain Neutron
10556b90a7 Fix CS 2013-07-04 18:49:21 +02:00
Romain Neutron
5b9a8f4055 Add XSenfFile mapping generator 2013-07-04 17:31:42 +02:00
Romain Neutron
242b2c0f71 Remove dependency on convert and composite 2013-07-04 14:10:57 +02:00
Romain Neutron
afcdf0f976 Bump to PHP-XPDF 0.2 2013-07-03 12:22:54 +02:00
Nicolas Le Goff
8e31a692cb Enhance XSendFileMapping to handle apache 
Update xsendfile
 2013-07-02 17:33:12 +02:00
Romain Neutron
6d70394d28 Pimp xsendfile dumpers 2013-06-28 23:24:19 +02:00
Romain Neutron
fb8d345940 Add Etag and Link headers when using XsendFile 2013-06-28 23:24:18 +02:00
Nicolas Le Goff
b5dbd37740 Adress last comment 2013-06-28 00:16:34 +02:00
Nicolas Le Goff
0ab66c095f Explicitly set HTTP cache to public when delivering thumbnail 2013-06-28 00:16:34 +02:00
Nicolas Le Goff
01a36ee9f7 Use power of symfony binary file response 
Add commands

Fix typo

Remove extra line
 2013-06-28 00:16:34 +02:00
Nicolas Le Goff
f30bca91a9 Adressed PR comment's 
Fix tests

Add dot at end of senetences

Fix typo
 2013-06-13 14:05:33 +02:00
Nicolas Le Goff
853477177b Add exception if less file doest not exists or destination dir is not writable 
Fix tests
 2013-06-13 14:05:33 +02:00
Romain Neutron
b783577f1b Add javascript builder 2013-06-13 13:52:03 +02:00
Romain Neutron
bfa28e0fd0 Bump to jquery ui 1.8.24, fix JS and CSS load issues 2013-06-13 13:52:03 +02:00
Romain Neutron
4161ef2e31 Use url generator everywhere 2013-06-13 09:44:16 +02:00
Romain Neutron
aebc63a01c Move phraseanet_indexer setting in configuration 2013-06-11 16:02:43 +02:00
Romain Neutron
38f38290c8 Fix CS 2013-05-29 21:21:02 +02:00
Romain Neutron
190f9a8f0e Remove extra line 2013-05-29 14:23:21 +02:00
Nicolas Le Goff
1167f8f485 Reorder & cleanup directory structure 2013-05-29 14:23:15 +02:00
Nicolas Le Goff
e602c9bf54 Move CSS builded by less into a specific directory 2013-05-29 14:23:15 +02:00
Romain Neutron
f9d319f6e1 Add errors display to LessCompile command 2013-05-29 14:23:12 +02:00
Nicolas Le Goff
52490d6e8f Add command to build less files 2013-05-29 14:22:53 +02:00
Romain Neutron
9285536d0d Fix install 2013-05-23 18:52:41 +02:00
Romain Neutron
87bbd914f5 Add correct return values for check:system 2013-05-13 19:25:05 +02:00