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

78 Commits

Author SHA1 Message Date
Romain Neutron
12f9575a8b Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php
	lib/classes/API/OAuth2/Adapter.php
	lib/classes/API/V1/adapter.php
	lib/classes/Feed/Adapter.php
	lib/classes/Feed/Collection.php
	lib/classes/Feed/Entry/Adapter.php
	lib/classes/Feed/Entry/Item.php
	lib/classes/Feed/Publisher/Adapter.php
	lib/classes/User/Adapter.php
	lib/classes/base.php
	lib/classes/connection.php
	lib/classes/databox/cgu.php
	lib/classes/eventsmanager/notify/autoregister.php
	lib/classes/eventsmanager/notify/bridgeuploadfail.php
	lib/classes/eventsmanager/notify/order.php
	lib/classes/eventsmanager/notify/orderdeliver.php
	lib/classes/eventsmanager/notify/ordernotdelivered.php
	lib/classes/eventsmanager/notify/push.php
	lib/classes/eventsmanager/notify/register.php
	lib/classes/eventsmanager/notify/validate.php
	lib/classes/eventsmanager/notify/validationdone.php
	lib/classes/eventsmanager/notify/validationreminder.php
	lib/classes/module/console/taskState.php
	lib/classes/module/console/taskrun.php
	lib/classes/record/adapter.php
	lib/classes/registry.php
	lib/classes/set/order.php
	lib/classes/task/abstract.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/ftp.php
	lib/classes/task/period/ftpPull.php
	templates/web/prod/upload/lazaret.html.twig
 2014-02-20 16:05:23 +01:00
Romain Neutron
2af21c064c Avoid errors by explicitely namespacing root exception 2014-02-20 11:28:31 +01:00
Romain Neutron
d7f7e1c92c Fix CS 2014-01-14 12:04:38 +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
bb9eff5935 Merge pull request #792 from romainneutron/configuration 
[3.9] Move registry to configuration
 2013-12-20 08:44:10 -08:00
Romain Neutron
d147d4e39d Merge branch '3.8' 2013-12-20 16:46:35 +01:00
Romain Neutron
64456a8964 Remove phraseanet registry 2013-12-20 16:44:22 +01:00
Nicolas Le Goff
ba21ed5d9f Fix #1637 Pagination is not working in report 2013-12-20 14:30:47 +01:00
Romain Neutron
1cc3885656 Fix #1624 : Some report locales might be broken 2013-12-17 19:41:58 +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
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
Nicolas Le Goff
1fdf30c6af Use ACL service provider to get user's ACL 2013-11-05 12:21:42 +01:00
Romain Neutron
642a1a5657 Fix CS 2013-10-03 15:24:15 +02:00
Romain Neutron
eb590780ca Fix CS 2013-09-30 18:26:32 +02:00
Romain Neutron
0b9c8b64ac Merge branch '3.8' 2013-09-19 14:53:55 +02:00
Romain Neutron
b9a0b9c12c Fix serialization 2013-09-18 23:36:19 +02:00
Romain Neutron
45c5276923 Merge branch '3.8' 2013-09-18 12:09:20 +02:00
Romain Neutron
756f6095a7 Minor report updates 2013-09-18 12:07:07 +02:00
Romain Neutron
dbd06e9091 Remove dead code 2013-09-04 12:14:50 +02:00
Romain Neutron
f9b4978569 Merge pull request #390 from romainneutron/databox-labels 
[3.8] Add labels to databoxes
 2013-06-13 07:41:05 -07:00
Romain Neutron
11a55bbd43 Add labels to databoxes 2013-06-13 09:45:43 +02:00
Nicolas Le Goff
c663d9d82d Fix #1101 Add sended record throught mail in report 
Fix typo
 2013-06-12 16:57:11 +02:00
Romain Neutron
32c2d6154a Remove phraseanet services, update configuration 2013-06-11 14:05:44 +02:00
Romain Neutron
c084f20f85 Labelize collections 2013-06-01 01:29:07 +02:00
Romain Neutron
b2604f9223 Merge branch '3.7' 2013-04-22 16:54:15 +02:00
Romain Neutron
516007a641 Fix CS 2013-04-22 16:40:24 +02:00
Nicolas Le Goff
d0c261ff32 Fix #1155 Export CSV truncated 2013-04-22 15:15:30 +02:00
Romain Neutron
5ca3ae8eaa Remove dublicate property declaration 2013-04-17 21:43:21 +02:00
Romain Neutron
31f7bac356 Merge branch '3.7' 2013-04-03 10:50:39 +02:00
Romain Neutron
22919fd8ac Fix report tests 2013-04-03 10:42:00 +02:00
Romain Neutron
6480cefbcd Merge branch '3.7' 2013-03-29 11:05:17 +01:00
Romain Neutron
5d2faa2e94 Fix report tests 2013-03-28 17:19:57 +01:00
Nicolas Le Goff
b796e11b40 Refactor reports into silex controllers 
Refactor reports into silex controllers
 2013-02-14 16:39:23 +01:00
Nicolas Le Goff
c3f8e70fe5 Add some minor adjustments 
Fix CS

Fix CS

Fix CS
 2013-02-12 15:24:50 +01:00
Nicolas Le Goff
c85701cfeb Fix tests 2013-02-11 18:18:16 +01:00
Nicolas Le Goff
43be8b7586 Fix CS 2013-02-11 14:45:39 +01:00
Nicolas Le Goff
4747c6d375 Fix tests 2013-02-11 14:45:38 +01:00
Nicolas Le Goff
88ac202a49 Update SQL 
Update SQLs & remove doc blocks

Update SQL

Update SQL

Update SQL

Update SQL

Update SQL
 2013-02-11 14:45:38 +01:00
Nicolas Le Goff
3c318c5c6e Add force index in report mysql request to avoid full scan table 2013-02-11 14:44:20 +01:00
Nicolas Le Goff
291e46c21a Fix missing log_colls table join 2013-02-11 14:44:20 +01:00
Nicolas Le Goff
777af147e2 Enhance sql add force index 2013-02-11 14:44:20 +01:00
Nicolas Le Goff
dc6976d04a Fix filter issue when phrasea::collFromBase return empty string 2013-02-11 14:44:19 +01:00
Nicolas Le Goff
07300af3f4 Modify collections filter & add JOIN on log_colls table 
Create entries in log_colls table

Fix SQL issue

Fix SQL issues

Update version

Add patch

Remove debug output

Fix CS

Fic CS

Add table schema

Fix Cs

Update patch

Update patch

Update patch

Update patch

Update patch

delete all coll_list call

Fix logger issue

Fix log_colls table structure definition

Rename patch

Fix SQL Issues

Fix patch

Fix test

Fix tests
 2013-02-11 14:44:19 +01: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