hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 15:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,063 Commits 268 Branches 107 Tags
f3340a85a1403989a42faeccbc24f3b30f46fedf
Commit Graph

11063 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benoît Burnichon
7399e3de56 record_preview PHPCS and property typo fix 2016-03-06 23:30:39 +01:00
Benoît Burnichon
b9f1f84020 More deprecation removal 2016-03-06 23:30:12 +01:00
Benoît Burnichon
6cdc9d7a31 Remove some deprecated methods calls 2016-03-06 23:05:55 +01:00
Benoît Burnichon
ba4274eb28 Merge branch '4.0' 2016-03-04 18:11:51 +01:00
Benoît Burnichon
8ef0b096fb Merge pull request #1743 from bburnichon/bug/video-tools-subdef-rebuild-PHRAS-1030 
Subdef substitution rebuilds all sub-definitions
 2016-03-04 17:40:52 +01:00
Benoît Burnichon
6bf390b47e fix ability to prevent subdef reconstruction on document substitution 2016-03-04 17:19:55 +01:00
Benoît Burnichon
218507c611 fix rebuild of subdefs when a subdef is substituted. 2016-03-04 16:49:10 +01:00
Benoît Burnichon
dc0b7c8a14 Add proper typehints in ToolsController 2016-03-04 16:48:49 +01:00
Benoît Burnichon
e5cd712879 Merge pull request #1742 from bburnichon/feature/api-list-orders-PHRAS-1003 
api list orders
 2016-03-04 15:53:15 +01:00
Benoît Burnichon
a59b6e333f Fix Typehinting against interface, not implementation 2016-03-04 15:40:23 +01:00
Benoît Burnichon
d9d6944878 Bump rest-bundle to stable version 2016-03-04 15:39:35 +01:00
Benoît Burnichon
25fd47fa7b Added RecordReferenceCollection utility method 2016-03-04 15:27:00 +01:00
Benoît Burnichon
a894faf1fa Add show action to OrderController 
Also refactor OrderController
 2016-03-04 14:21:23 +01:00
Benoît Burnichon
20bc04979f Add api_v2_orders_index route 2016-03-04 14:21:23 +01:00
Benoît Burnichon
671ea7a92b Change OrderElementTransformer to return a record, not a record_id 2016-03-04 14:21:22 +01:00
Benoît Burnichon
b7cda69182 Use recently added getDataboxConnection method 2016-03-04 14:21:22 +01:00
Benoît Burnichon
8e599e554c Add RecordReference into record_adapter 2016-03-04 14:21:22 +01:00
Benoît Burnichon
0a38dcaca5 fix json-schema to include proper date-time definition 2016-03-04 14:21:22 +01:00
Benoît Burnichon
ac78b7c3fa Add Fractal Manager to serialize includes 2016-03-04 14:21:22 +01:00
Benoît Burnichon
bcf9bd84d9 Properly return serialized Order 2016-03-04 14:21:22 +01:00
Benoît Burnichon
82dbd03387 Merge pull request #1741 from jygaulier/PHRAS-997_Ticks 
change "ticks" to 1000
 2016-03-03 18:14:22 +01:00
jygaulier
1ab785dab1 Merge branch 'master' into PHRAS-997_Ticks 2016-03-03 17:40:41 +01:00
Jean-Yves Gaulier
b8f2b8b012 change "ticks" to 1000 
todo : fix vendor(s)...
#PHRAS-997 time 5m
 2016-03-03 17:38:38 +01:00
Benoît Burnichon
f164709e04 Merge pull request #1730 from bburnichon/feature/api-create-order-PHRAS-1001 
API create order
 2016-03-02 14:50:19 +01:00
Benoît Burnichon
4b40dd0d8b Change variable name to make it more explicit. 2016-03-02 14:40:46 +01:00
Benoît Burnichon
585c0519b9 Add missing parameters types array in Repository call 2016-03-02 14:34:50 +01:00
Benoît Burnichon
91424b2883 Typos in Users in RegenerateSqliteDb command. 
PHPCS of tests
 2016-03-02 14:34:50 +01:00
Benoît Burnichon
ed04f66548 Add Api Order Controller 2016-03-02 14:34:50 +01:00
Benoît Burnichon
d9f8270eee Extract OrderFiller 2016-03-02 14:34:50 +01:00
Benoît Burnichon
0a187978bd Prepare extraction of class from OrderController 2016-03-02 14:34:50 +01:00
Benoît Burnichon
1ecc6f7b54 Refactor OrderController 2016-03-02 14:34:50 +01:00
Benoît Burnichon
871dd58ea4 Add lookup by order master to collection reference repository 2016-03-02 14:34:50 +01:00
Benoît Burnichon
fd66b408b8 Avoid N+1 in User_Query 2016-03-02 14:34:50 +01:00
Benoît Burnichon
a8a00d735a Remove some unused statements 2016-03-02 14:34:50 +01:00
Benoît Burnichon
8044a1ce40 Add some missing copyrights 2016-03-02 14:34:50 +01:00
Benoît Burnichon
1af0455e89 Merge pull request #1739 from bburnichon/bug/PHRAS-1025 
Fixes default embed-bundle configuration
 2016-03-02 11:42:57 +01:00
Benoît Burnichon
8ac4b3671b Fix invalid process comparison 2016-03-02 11:34:08 +01:00
Benoît Burnichon
cee418d0b8 Backport circleci configuration 2016-03-02 11:34:07 +01:00
Benoît Burnichon
fab4491fe5 Fixes default embed-bundle configuration 
PHRAS-1025
 2016-03-02 11:34:07 +01:00
Benoît Burnichon
be0cc9f893 Fixup circleci issue when multiple tests are run. 2016-03-01 19:15:46 +01:00
Benoît Burnichon
0a151ec247 Merge branch '4.0' 2016-03-01 18:59:04 +01:00
Benoît Burnichon
02addd821c Merge pull request #1738 from bburnichon/task/bump-dependencies 
Bump dependencies using now released versions
 2016-03-01 17:58:42 +01:00
Benoît Burnichon
ea8f9ca556 Remove overridden BinaryFileResponse 2016-03-01 16:55:28 +01:00
Benoît Burnichon
e3807a8244 Bump dependencies 2016-03-01 16:51:11 +01:00
Benoît Burnichon
5a571f2f1b Merge pull request #1736 from bburnichon/improvement/php-70-tests 
PHRAS-1022 #time 1d
 2016-03-01 15:13:31 +01:00
Benoît Burnichon
7cab0b8f13 Remove PHP7 from allowed failures 2016-03-01 14:37:31 +01:00
Benoît Burnichon
82d7415df5 GooglePlus testing flow is broken. Skipping test. 2016-03-01 14:32:10 +01:00
Benoît Burnichon
c4daafc5e6 Remove undefined variable in GooglePlus Authentication Provider 2016-03-01 13:59:41 +01:00
Benoît Burnichon
8a577beb37 Fix invalid process comparison 2016-03-01 12:42:37 +01:00
Benoît Burnichon
2cef849b68 Skip improper Authentication success tests 2016-03-01 12:42:10 +01:00