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,159 Commits 268 Branches 107 Tags
37883ed1aee22d2c09f10ad1c8eedcda9e1e9fb2
Commit Graph

11159 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benoît Burnichon
37883ed1ae Remove useless method in SearchEngineInterface 2016-03-29 19:08:09 +02:00
Benoît Burnichon
973826eeb3 Remove dependency on CaptionRecord get_record() method. 2016-03-29 18:59:04 +02:00
Benoît Burnichon
d33a1d0dcc PHPCS fixing 2016-03-29 18:58:54 +02:00
Benoît Burnichon
cdd37110bb Remove useless interface 2016-03-29 16:48:29 +02:00
Benoît Burnichon
11abedd0ed Convert some SQL to HEREDOCS 2016-03-29 15:28:42 +02:00
Benoît Burnichon
e10e83dd36 Fix issue with improper count SQL 2016-03-29 15:28:19 +02:00
Benoît Burnichon
3597ebc7c2 Search should always use multiple retrival strategy 2016-03-29 14:57:44 +02:00
Benoît Burnichon
c580b55c3e Remove one N+1 by fetching TechnicalDataSets 2016-03-29 14:57:44 +02:00
Benoît Burnichon
6bfe235bfa Scrutinizers proposed patches 2016-03-29 14:57:44 +02:00
Benoît Burnichon
57c32fcdbd Merge pull request #1776 from jygaulier/PHRAS-1052_DOWNLOAD-WINDOW-BROKEN 
PHRAS-1052 Download window is broken
 2016-03-29 14:47:37 +02:00
Benoît Burnichon
03e90239d9 Merge pull request #1778 from lostdalek/feature/externalProductionClient 
Bump Phraseanet-production-client
 2016-03-29 14:30:55 +02:00
Florian BLOUET
6ac9c0fc32 Bump Phraseanet-production-client 
- PHRAS-1052 - fix export dialog
 - Components reorg/ misc fixes
 2016-03-29 12:20:25 +02:00
Florian BLOUET
9dcc4b2fd6 clean and remove thesaurus dead code 2016-03-29 12:20:25 +02:00
Benoît Burnichon
c3deeb11e5 Merge pull request #1777 from bburnichon/feature/add-sql-logs 
Feature/add sql logs
 2016-03-25 14:33:51 +01:00
Benoît Burnichon
a2ef046808 Merge pull request #1 from alchemy-fr/scrutinizer-patch-1 
Scrutinizer Auto-Fixes
 2016-03-25 14:15:40 +01:00
Scrutinizer Auto-Fixer
68da0ac0ed Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2016-03-25 13:14:51 +00:00
Benoît Burnichon
5a83a9c1c5 PHPCS 2016-03-25 13:18:52 +01:00
Benoît Burnichon
3c71914394 Enable All Queries logging in WebProfiler 2016-03-25 13:18:52 +01:00
Benoît Burnichon
cc3d5cc249 Bump Sorien WebProfiler to handle multiple connections 2016-03-25 13:18:52 +01:00
Jean-Yves Gaulier
adf4968711 PHRAS-1052 #time 1h 
-fix : added escaping to js context strings (translation contains a quote)
 2016-03-24 19:43:41 +01:00
Benoît Burnichon
99473a65bf Merge pull request #1775 from jygaulier/PHRAS-1045_DELETE-STORY-AND-CONTENT 
PHRAS-1045
 2016-03-24 16:28:39 +01:00
jygaulier
e2b4d9ec41 Update RecordController.php 2016-03-24 16:01:02 +01:00
Jean-Yves Gaulier
0da3c8112a PHRAS-1045 #time 4h 
-fix : when a story is deleted with "Delete also content..." checked, the content and the story is deleted
 2016-03-24 15:16:15 +01:00
Benoît Burnichon
bdad4a9890 Merge pull request #1771 from lostdalek/feature/externalProductionClient 
frontent refactoring - move account and auth into phraseanet-production-client
 2016-03-24 14:33:00 +01:00
Florian BLOUET
f8018df289 fix lightbox initialization 2016-03-24 14:05:42 +01:00
Florian BLOUET
527cb2708a Bump phraseanet-production-client 
fix jquery ui dependency,
fix ftp export,
fix thesaurus search actions,
misc fixes
 2016-03-24 11:57:24 +01:00
Florian BLOUET
06760d8a79 frontent refactoring - move account into phraseanet-production-client 2016-03-24 11:52:14 +01:00
Florian BLOUET
ffaead9da3 frontent refactoring - move authentication into phraseanet-production-client 2016-03-24 11:52:14 +01:00
Benoît Burnichon
d151abc71d Add oauth authentication to permalink route 2016-03-23 19:49:47 +01:00
Benoît Burnichon
29be3a6dc6 fix ApiOrderController per_page functionality 2016-03-23 19:49:06 +01:00
Benoît Burnichon
5f8b293222 Merge branch '4.0' 2016-03-23 18:24:47 +01: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
Benoît Burnichon
73bdcd2144 fixup method name in DownloadTest 2016-03-23 15:49:53 +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
Benoît Burnichon
58ed9f3dc6 update fixture configuration.yml to match default 2016-03-23 13:22:49 +01:00
Benoît Burnichon
c46f0e1129 Improve Prod/RootTest by removing client 2016-03-23 13:20:17 +01:00
Benoît Burnichon
0bf1340067 Fixup typo in acl stub method name 2016-03-23 13:14:12 +01:00
Benoît Burnichon
38e184ec25 fix creation of search engine mock 
Remove useless test in SearchEngine.
 2016-03-23 13:05:38 +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
25222234f8 Issue in CollectionHelper ordering. 
Also make helper class final.
 2016-03-23 11:32:47 +01:00
Benoît Burnichon
1f47d1a7aa Merge branch '4.0' 2016-03-22 17:45:18 +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
Benoît Burnichon
a2a259e390 Merge pull request #1768 from lostdalek/feature/externalProductionClient 
frontent refactoring - move lighbox into phraseanet-production-client
 2016-03-22 17:18:34 +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