hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-16 14:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,325 Commits 268 Branches 107 Tags
12f9575a8b93a5f86dd89c42a22ff33c82fbe2c8
Commit Graph

53 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
09c74afab6 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Prod/Export.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/Alchemy/Phrasea/Helper/Prod.php
	lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php
	lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php
	lib/classes/User/Adapter.php
	lib/classes/caption/Field/Value.php
	lib/classes/collection.php
	lib/classes/module/report/filter.php
	lib/classes/task/period/ftp.php
	templates/web/common/dialog_export.html.twig
	templates/web/report/ajax_dashboard_content_child.html.twig
	tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php
 2013-12-18 12:12:58 +01:00
Romain Neutron
1f88435910 Fix tests 2013-12-18 10:47:17 +01:00
Romain Neutron
680643c0fc Fix unit tests and arrays declaration 2013-12-03 20:06:49 +01:00
Romain Neutron
e9e9d149a1 Locale simplification 2013-12-03 20:05:20 +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
d7a68dbec3 Remove http_request 2013-11-12 19:39:22 +01:00
Romain Neutron
f39af8b64e Merge branch '3.8' 2013-11-06 11:26:47 +01:00
Romain Neutron
05485308ae Fix #1567 : Disallow a user to remove himself from DB 2013-11-05 15:51:50 +01:00
Nicolas Le Goff
1fdf30c6af Use ACL service provider to get user's ACL 2013-11-05 12:21:42 +01:00
Romain Neutron
4c90f168a7 Remove unused use statements 2013-09-04 14:25:01 +02:00
Romain Neutron
7c9fbd48e1 Remove tests in loops 2013-09-04 14:20:35 +02:00
Romain Neutron
dbd06e9091 Remove dead code 2013-09-04 12:14:50 +02:00
Romain Neutron
42db38d055 Add error pages, fix error handling and PHP conf 2013-06-17 17:01:35 +02:00
Romain Neutron
906d4ba9c5 Localize status bits 2013-06-14 09:47:54 +02:00
Romain Neutron
f942dc2562 Enable users time restrictions per databox 2013-06-13 19:45:20 +02:00
Romain Neutron
d2bc4f4a23 Add AuthenticationServiceProvider 2013-05-29 14:22:50 +02:00
Romain Neutron
8325c35f91 Add better exception handling for emails 2013-01-29 12:06:02 +01:00
Romain Neutron
aa18c48306 Fix unit tests 2013-01-29 09:34:20 +01:00
Romain Neutron
9cce7ab8f9 Update notifications 2013-01-29 09:34:18 +01:00
Romain Neutron
b5980ab866 First implementation 2013-01-29 09:34:18 +01:00
Romain Neutron
842ad40985 Bump copyright year 2013-01-21 23:28:58 +01:00
Romain Neutron
133595635c [SearchEngine] Finalize search engine refactor 2013-01-17 11:43:36 +01:00
Romain Neutron
0565bce475 Remove user variable assignment 2012-10-04 15:44:49 +02:00
Romain Neutron
86eadb1e9b Update Helpers 2012-10-04 15:43:13 +02:00
Romain Neutron
d022ff69c7 Remove use of databox singleton 2012-07-26 12:29:44 +02:00
Romain Neutron
2a4a3f3ec8 Enable Twig service provider 2012-07-24 13:11:26 +02:00
Romain Neutron
d885dc6b25 Add email notifications 2012-06-22 12:22:02 +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
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
fa698fbdda Coding Standards 2012-03-19 19:04:48 +01:00
Nicolas Le Goff
00ca39126a add reset user rights from admin panel 2012-03-16 20:08:41 +01:00
Romain Neutron
1426b9a6f9 Add feedback availability from basket + User icons 2012-03-05 16:08:49 +01:00
Romain Neutron
ec4ec4931d Refactor Appbox 2012-02-21 16:16:25 +01:00
Romain Neutron
2265884821 Fix gender selection in user admin 2012-02-09 17:32:54 +01:00
Romain Neutron
1626246f7f Merge with master 2012-01-31 18:28:49 +01:00
Romain Neutron
06b8df26b1 Fix coding standards 2012-01-26 12:32:37 +01:00
Nicolas Le Goff
725c69775f correct syntax error 2012-01-23 18:56:05 +01:00
Romain Neutron
0af3396131 Fix Helper Edit 2012-01-19 10:36:10 +01:00
Romain Neutron
73962138fa Refactor Core::request 2012-01-12 14:26:42 +01:00
Romain Neutron
278195fcfd Fix Namespaces bugs 2012-01-11 20:57:27 +01:00
Romain Neutron
8a9b93c1ff Merge with master 2012-01-11 11:29:01 +01:00
Romain Neutron
a709129824 Merge with master 2012-01-05 14:56:13 +01:00
Romain Neutron
af9330b17e Merge 3.5.7 2012-01-03 15:26:07 +01:00