hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-13 13:03:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,484 Commits 268 Branches 107 Tags
6aaa9ab38eaa8a85b45181ce9de595feed2fa397
Commit Graph

49 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
64456a8964 Remove phraseanet registry 2013-12-20 16:44:22 +01:00
Romain Neutron
2ba164701d Use symfony translator 2013-12-03 20:02:40 +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
ea7523f1db Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Admin/Publications.php
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Controller/Lightbox.php
	lib/Alchemy/Phrasea/Controller/Permalink.php
	lib/Alchemy/Phrasea/Controller/Prod/Feed.php
	lib/Alchemy/Phrasea/Controller/Prod/Order.php
	lib/Alchemy/Phrasea/Controller/Prod/Push.php
	lib/Alchemy/Phrasea/Controller/Prod/Share.php
	lib/Alchemy/Phrasea/Controller/Root/Login.php
	lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php
	lib/Alchemy/Phrasea/Controller/Root/Session.php
	lib/Alchemy/Phrasea/Controller/Setup.php
	lib/Alchemy/Phrasea/Core/CLIProvider/LessBuilderServiceProvider.php
	lib/Alchemy/Phrasea/Core/Provider/ORMServiceProvider.php
	lib/Alchemy/Phrasea/Core/Provider/TaskManagerServiceProvider.php
	lib/classes/Feed/Entry/Item.php
	lib/classes/record/adapter.php
	lib/classes/task/Scheduler.php
	lib/classes/task/manager.php
	lib/classes/task/period/RecordMover.php
	lib/classes/task/period/archive.php
	lib/classes/task/period/cindexer.php
	lib/classes/task/period/ftp.php
	lib/classes/task/period/ftpPull.php
	lib/classes/task/period/subdef.php
	lib/classes/task/period/writemeta.php
	tests/Alchemy/Tests/Phrasea/Border/ManagerTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php
	tests/classes/Feed/Entry/Feed_Entry_ItemTest.php
	tests/classes/PhraseanetPHPUnitAbstract.php
 2013-10-31 14:01:44 +01:00
Romain Neutron
9b471fdf76 Fix CS 2013-10-31 11:53:30 +01:00
Romain Neutron
1af022b84f Declare prod controllers as services, remove "call" methods 2013-10-30 18:47:40 +01:00
Romain Neutron
f648ea296f Fix #1488 : Push / Feedback name is now mandatory 2013-10-10 13:39:07 +02:00
Nicolas Le Goff
ce55141917 Fix #1445 Wording & issue while moving record from collections 2013-09-05 12:04:18 +02:00
Romain Neutron
842ad40985 Bump copyright year 2013-01-21 23:28:58 +01:00
Nicolas Le Goff
a2fdcea91b Add string 2012-10-19 17:32:16 +02:00
Nicolas Le Goff
1f4debee45 Fix Tests 
remove useless comment

Add end line

Conflicts:

	templates/web/prod/Share/record.html.twig
 2012-10-18 15:45:52 +02:00
Nicolas Le Goff
cde9ce18ae Add prod refactor 
Fix issue

Conflicts:

	lib/Alchemy/Phrasea/Controller/Prod/Share.php
	lib/Alchemy/Phrasea/Controller/User/Notifications.php
	lib/Alchemy/Phrasea/Controller/User/Preferences.php
	templates/web/common/dialog_export.html.twig
 2012-10-18 15:45:50 +02:00
Romain Neutron
1700565862 Cleanup namepaces, variables uses 2012-10-04 15:44:49 +02:00
Romain Neutron
f68cae2bb4 Cleanup controllers 2012-10-04 15:44:48 +02:00
Romain Neutron
1fc9a78e7f Update prod controllers 2012-10-04 15:31:37 +02:00
Nicolas Le Goff
5e73786192 fix typo 2012-09-07 12:06:05 +02:00
Nicolas Le Goff
623469063f refactor /prod/order/ 
add tests

fix tests

use url_generator & remove debug variable

remove jquery.order.js from  minify

use proper way to pass parameters when building URL with url_generator
 2012-09-07 12:06:05 +02:00
Romain Neutron
9f11445265 Namespaces cleanup 2012-07-27 12:26:12 +02:00
Romain Neutron
89737fb5e4 Remove serializer 2012-07-24 19:01:06 +02:00
Romain Neutron
c278878c9e Merge with Dev 2012-07-19 14:12:38 +02:00
Romain Neutron
b3ac109d71 Fix tooltip display + Fix usrlist route 2012-07-19 14:09:57 +02:00
Romain Neutron
6a695e7e5d Code cleanup 2012-07-18 19:11:25 +02:00
Romain Neutron
3812399a35 Add Phraseanet Service Provider and Phraseanet Application 2012-07-18 18:07:34 +02:00
Nicolas Le Goff
496dd063c9 add end user message when he tries to add element when no active basket 2012-06-26 11:44:17 +02:00
Romain Neutron
7018ba0a24 Update dependencies 
Fix controller declaration

Fix PdfTotext use
 2012-06-19 18:39:33 +02:00
Nicolas Le Goff
4edb26c6c6 fix #728 check if thumbExtractor is supported 
remove fileReader its not needed

fix unit tests

fix typo

remove unecessary message
 2012-06-19 18:08:40 +02:00
Nicolas Le Goff
02f58b9f57 fix PR "notification quarantine" 
fix typo

remove debug message

fix typo
 2012-06-12 11:11:55 +02:00
Nicolas Le Goff
5df877821c avoid closing upload window when download are not finished 2012-06-12 10:59:23 +02:00
Nicolas Le Goff
50bd453e3e #fix 669 check filsize before uploading and handle file entity too large errors 2012-05-28 18:46:37 +02:00
Nicolas Le Goff
7212ec5df5 lazaret UI 2012-05-25 17:11:10 +02:00
Romain Neutron
4afa21d419 Fix CS 2012-05-23 00:01:29 +02:00
Nicolas Le Goff
ae4ee36578 fix typo & translate mustache msg 2012-05-21 21:08:41 +02:00
Nicolas Le Goff
51d7f14eea fix translation message error in mustache template 2012-05-21 21:08:40 +02:00
Romain Neutron
7d9eb63246 Remove unused package annotation 2012-04-26 02:09:59 +02:00
Romain Neutron
70519a471a Update copyright year 2012-04-26 02:06:29 +02:00
Romain Neutron
ade22295ad Fix CS 2012-04-26 00:55:53 +02:00
Romain Neutron
400db81f28 Add notification for editing search / replace 2012-02-16 18:59:08 +01:00
Romain Neutron
bdf0218967 Add string for validation 2012-02-16 18:36:42 +01:00
Romain Neutron
828f97cb52 Upgrade language max selection to 800 2012-02-16 18:01:42 +01:00
Romain Neutron
e839ce6d4e Add language 2012-02-15 11:31:38 +01:00
Romain Neutron
06ba35002a Add feedback user infos 2012-02-08 18:30:23 +01:00
Romain Neutron
bedb6fc181 Add language 2012-02-03 15:46:32 +01:00
Romain Neutron
a9c7ed23cb Coding standards 2012-02-02 15:43:12 +01:00
Romain Neutron
9135de65cf Push & Feedback templates 2012-02-02 15:21:51 +01:00
Romain Neutron
406db0c4e1 Add languages 2012-01-31 22:04:00 +01:00
Romain Neutron
afb42193e7 Merge with master 2012-01-31 12:09:07 +01:00