hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 23:43:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,953 Commits 268 Branches 107 Tags
0cdedbfd5cf8ffc2bc6c99f5e19be29d3c60a94c
Commit Graph

10953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jygaulier
0cdedbfd5c Merge pull request #1794 from jygaulier/PHRAS-1055_rebase-4.0 
PHRAS-1055 backport to 4.0
 2016-04-06 17:14:53 +02:00
jygaulier
429155bb16 Merge branch '4.0' into PHRAS-1055_rebase-4.0 2016-04-06 16:50:49 +02:00
Jean-Yves Gaulier
bc7fa44cf1 PHRAS-1055 #time 15m 
- fix fatal error "getName()"
 2016-04-06 16:46:54 +02:00
Thibaud Fabre
f455123abd Merge pull request #1793 from aztech-dev/fix/event-processor 
Fix event processor memory usage
 2016-04-06 16:34:45 +02:00
Thibaud Fabre
c05cac4800 Hydrate events one by one to preserve memory 2016-04-06 16:16:47 +02:00
jygaulier
334dcff6bf Merge pull request #1792 from jygaulier/PHRAS-1055_rebase-4.0 
PHRAS-1055 rebase on 4.0
 2016-04-06 15:20:44 +02:00
Jean-Yves Gaulier
e6b1ad4f2f PHRAS-1055 #time 1h 
- no bug concerning --max_record
- add try/catch so the job don't stop on errors

PHRAS-1055 #time 5h
- add option --dry
- add verbose print (-v)
- add "ALL" for type and subdef arguments
- fix "substitute" options
- fix show sql with arguments

PHRAS-1055 #time 5h
- better error handling
- argument "databox" can be specified as id, dbname or viewname
- add option "--partition=n/N"
- argument "type" changed to option "--record_type=a,b,c" (can also be set as "--record_type=a,b --record_type=c")
- argument "subdefs" changed to option "--name=x,y,z" (can also be set as "--name=x,y --name=z")
- option "--with-substitution" changed to "--with_substituted"
- option "--substitution-only" changed to "--substituted-only"

PHRAS-1055 #time 2h
- change lone argument (databox) to option "--databox" (mandatory)
- add option "--missing_only" to create missing subdefs after structure change.
- add option "--garbage_collect" to remove orphan subdefs left by structure change.

PHRAS-1055 #time 1m
- cleanup

PHRAS-1055 #time 2h
- cleanup
- add option "--reset_subdef_flag"
- add option "--set_writemeta_flag"

PHRAS-1055 #time 1m
- fix vocabulary (flag)
 2016-04-06 11:36:00 +02:00
Thibaud Fabre
7ebbff44e6 Merge pull request #1774 from aztech-dev/fix/collection-watermark-4.0 
Fix watermark getter
 2016-03-23 18:20:26 +01:00
Thibaud Fabre
2e1ef8e279 Fix watermark getter 2016-03-23 18:02:48 +01:00
Thibaud Fabre
d1e8582c05 Merge pull request #1772 from aztech-dev/feature/subdef-webhook-events-4.0 
Feature/subdef webhook events 4.0
 2016-03-23 13:28:32 +01:00
Thibaud Fabre
b619bf7bba Change failed to createion_failed 2016-03-23 12:42:31 +01:00
Thibaud Fabre
773a31d4f8 Add extra event types in webhooks 2016-03-23 12:42:31 +01:00
Benoît Burnichon
0332f37537 Merge pull request #1767 from lostdalek/hotfix/PHRAS-1038 
PHRAS-1038
 2016-03-22 17:27:25 +01:00
Florian BLOUET
755aac9e3e PHRAS-1038 - fix story navigation in workzone context 2016-03-22 17:17:01 +01:00
Benoît Burnichon
4910beb251 Merge pull request #1769 from bburnichon/bug/orders-security-issue-v40-PHRAS-1042 
orders security issue
 2016-03-22 17:13:25 +01:00
Benoît Burnichon
25745732b6 Fix OrderElement accept/deny todo count 2016-03-22 16:16:09 +01:00
Benoît Burnichon
96295eab7b Extract CollectionReferenceCollection class from ACL. 2016-03-22 16:15:44 +01:00
Benoît Burnichon
79119fe10a some PHPCS fixing 2016-03-22 16:15:43 +01:00
Benoît Burnichon
83b8baa327 Reduce duplication for OrderController 2016-03-22 16:15:38 +01:00
Benoît Burnichon
a547a04aa6 Move Order controllers to same namespace 2016-03-22 16:14:08 +01:00
Benoît Burnichon
65550e8bd1 Refactor OrderTest 2016-03-22 16:13:23 +01:00
Benoît Burnichon
a5f9ace717 fix Basket owning setting when providing it 2016-03-22 16:13:22 +01:00
Benoît Burnichon
5b03159245 Add basket owning logic in Order 2016-03-22 16:13:22 +01:00
Benoît Burnichon
a0983d39b2 WIP 2016-03-22 16:13:22 +01:00
Benoît Burnichon
b150cd8925 Allow some Acl method to be used with RecordReference 2016-03-22 16:13:22 +01:00
Benoît Burnichon
f07b7b6722 WIP 2016-03-22 16:13:19 +01:00
Benoît Burnichon
9398891f5c Allow retrieve collection by a collection of base ids 2016-03-22 16:12:01 +01:00
Benoît Burnichon
6b7e28e2bd Change variable name to make it more explicit. 2016-03-22 16:09:41 +01:00
Benoît Burnichon
1a9035c60f Add missing parameters types array in Repository call 2016-03-22 16:09:41 +01:00
Benoît Burnichon
421e62d136 Typos in Users in RegenerateSqliteDb command. 
PHPCS of tests
 2016-03-22 16:09:38 +01:00
Benoît Burnichon
4d65085b46 Extract OrderFiller 2016-03-22 15:55:54 +01:00
Benoît Burnichon
1982d0a625 Prepare extraction of class from OrderController 2016-03-22 15:55:54 +01:00
Benoît Burnichon
cb87d7c0f1 Refactor OrderController 2016-03-22 15:55:54 +01:00
Benoît Burnichon
2b5557ac7c Add lookup by order master to collection reference repository 2016-03-22 15:55:54 +01:00
Benoît Burnichon
51519ce4a2 Avoid N+1 in User_Query 2016-03-22 15:55:53 +01:00
Benoît Burnichon
63d4923292 Remove some unused statements 2016-03-22 15:55:51 +01:00
Benoît Burnichon
0d6c44fac3 Add some missing copyrights 2016-03-22 15:54:32 +01:00
Benoît Burnichon
53ec1cb076 Merge pull request #1766 from lostdalek/hotfix/PHRAS-1039 
PHRAS-1039
 2016-03-21 11:18:42 +01:00
Florian BLOUET
ba646fa733 PHRAS-1039 - fix preview backward navigation 2016-03-21 10:20:56 +01:00
Thibaud Fabre
15b9f371fa Merge pull request #1762 from bburnichon/bug/invalid-collection-order-PHRAS-917 
Added new Twig filter to sort a collection set.
 2016-03-17 13:33:28 +01:00
Benoît Burnichon
7c65b2a7e9 Extract method from Twig PhraseanetExtension 2016-03-17 12:23:19 +01:00
Benoît Burnichon
9313f3da2b Added new Twig filter to sort a collection set. 
Only currently used in admin/tree.html.twig but could be used in collection rights.
 2016-03-17 11:24:59 +01:00
Benoît Burnichon
817b72c0b0 Merge pull request #1761 from bburnichon/feature/add-flag-slug-in-admin 
add flag slug in admin edit status
 2016-03-15 19:36:12 +01:00
Benoît Burnichon
cd80e9e1ed Remove unused appbox parameter 2016-03-15 19:11:56 +01:00
Benoît Burnichon
814cf30b3e Add slugified flag name in admin 2016-03-15 18:03:24 +01:00
Benoît Burnichon
57aab7aa85 Fixup PHPCS 2016-03-15 17:47:13 +01:00
Benoît Burnichon
b8a506d3b2 Improve readability of Thesaurus Helper 2016-03-15 17:31:01 +01:00
Benoît Burnichon
daf2cf6150 replace StringUtils::slugify by a proper instance 
Previous implementation had a flaw when using a different separating character. New implementation should be well tested.
 2016-03-15 16:59:53 +01:00
Benoît Burnichon
210920c31f Fix missing requirement to intl extension 
Found usage of Transliterator which is part of the intl extension
 2016-03-15 16:57:07 +01:00
Benoît Burnichon
643b7d2501 Require new cocur/slugify library to replace buggy implementation 2016-03-15 16:42:55 +01:00