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

149 Commits

Author SHA1 Message Date
aynsix
12d01afeb0 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2741-worker-service-part1 2019-12-19 16:09:47 +04:00
Jean-Yves Gaulier
915e7bcd32 PHRAS-2859_tests-do-corrupt-conf_4.1 
fix : configuration.yml is not modified by unit-tests anymore
 2019-12-16 18:16:51 +01:00
aynsix
65d7affcb5 export mail : make it event oriented to facilitate worker treatement 2019-09-20 16:15:49 +04:00
Sandeep
77352e59ef PHRAS-1856_PORT-PHRAS-1347 2018-02-26 11:30:55 +04:00
Mike Ng
30f49bdd35 resolve conflict 2018-01-08 15:57:13 +04:00
Mike Ng
a79b72fbaf Port PHRAS-1593 2017-11-24 16:22:31 +04:00
jygaulier
a70bf2fc70 PHRAS-1304_AUTO-COMPLETION_MASTER (#2061) 
* PHRAS-1304_AUTO-COMPLETION_MASTER
ported from 4.0

* PHRAS-1304_AUTO-COMPLETION_MASTER
fix

* PHRAS-1304_AUTO-COMPLETION_MASTER
fix

* PHRAS-1304_AUTO-COMPLETION_MASTER
bump php version to 5.5.31 (5.5.21 is obsolete in cicleci)

* PHRAS-1304_AUTO-COMPLETION_MASTER
bump php version to 5.5.31 : php.ini moved in circelci

* PHRAS-1304_AUTO-COMPLETION_MASTER
add zmq & date to php for circleci

* PHRAS-1304_AUTO-COMPLETION_MASTER
add zmq

* PHRAS-1304_AUTO-COMPLETION_MASTER
bump amqp

* PHRAS-1304_AUTO-COMPLETION_MASTER
downgrade amqp to 1.2 to test compilation against old librabbit 0.4 (ubuntu)

* PHRAS-1304_AUTO-COMPLETION_MASTER
add amqp.so to php.ini, (re)bump amqp to 1.6

* PHRAS-1304_AUTO-COMPLETION_MASTER
build rabittmq from git

* PHRAS-1304_AUTO-COMPLETION_MASTER
build rabittmq from git again

* PHRAS-1304_AUTO-COMPLETION_MASTER
build rabittmq from git again and again

* PHRAS-1304_AUTO-COMPLETION_MASTER
fix test on media rotation 600*400 -> 400*599 !!!

* PHRAS-1304_AUTO-COMPLETION_MASTER
restore facebook sdk to 4.0.1 due to mistake

* PHRAS-1304_AUTO-COMPLETION_MASTER
deleted unwanted file
 2017-02-06 18:26:56 +01:00
Thibaud Fabre
97f2e66698 Merge 4.0 branch 2016-12-05 17:04:54 +01:00
Thibaud Fabre
b5bbb1851f Merge branch 4.0 2016-12-05 15:26:48 +01:00
Jean-Yves Gaulier
642da0fca5 PHRAS-508_acl-cache 
- wip
 2016-10-26 16:13:47 +02:00
Jean-Yves Gaulier
6a2285f66d PHRAS-508_acl-cache 
- wip
 2016-10-26 16:13:47 +02:00
Benoît Burnichon
a92653ec56 Remove useless variable 2016-05-19 14:40:10 +02:00
Benoît Burnichon
f0e2ff2bd1 Backport PHP7 issue fix in Youtube Bridge 2016-05-19 14:08:48 +02:00
Thibaud Fabre
5d01291555 Update mocks in order todo test 2016-05-12 14:36:40 +02:00
Thibaud Fabre
4ae762657e Update tests to mock event subscribers not mailers 2016-05-12 14:22:49 +02:00
Benoît Burnichon
1e18b3e69f This is a combination of 33 commits. 
- Squashed Pull request #1730
- Squashed Pull request #1741
- Squashed Pull request #1742
- Squash merge branch 4.0
- Squashed Pull request #1744
- Squashed Pull request #1746
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed Pull request #1758
- Avoid using imagine/imagine alias as it is causing install issues
- Squashed merge branch 4.0
- Squashed Pull request #1763
- Squashed merge branch 4.0
- Squash of 6 commits
- Squashed merge branch 4.0
- This is a combination of 2 commits.
- Squashed Pull request #1775
- Squashed Pull request #1777
- Squashed Pull request #1779
- Squashed Pull request #1780
- Squashed Pull request #1782
- Adds a Pull request template
- Squased Pull request #1783
- Squash Pull request #1786
- Squashed Pull request #1796
- Squashed merge branch 4.0
- Squash Pull request #1791
- Squashed merge branch 4.0
- Squashed Pull request #1808
- Squashed Pull request #1811
- Squashed Pull request #1809
 2016-04-20 16:22:14 +02:00
Benoît Burnichon
65550e8bd1 Refactor OrderTest 2016-03-22 16:13:23 +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
e22a60afc5 Refactor tests using XmlHttpRequest 2016-03-11 20:00:52 +01:00
Benoît Burnichon
04131a3479 Refactor ExportTest 2016-02-26 16:18:48 +01:00
Thibaud Fabre
74366feac3 Fix failing tests 
- SQL query error
- Reload updated collections in tests (error in test logic)
 2016-01-07 18:57:19 +01:00
Benoît Burnichon
60247cd2ad Missing basket persist. 2015-12-22 17:44:34 +01:00
Benoît Burnichon
765ccac763 Do not use global request service 2015-12-08 19:41:18 +01:00
Benoît Burnichon
f684550ab1 Merge pull request #1555 from bburnichon/rebase-web-gallery-v4 
Rebase web gallery v4
 2015-11-09 17:48:22 +01:00
Benoît Burnichon
8ad5d05e43 Fixup some tests using UserManipulator 2015-11-03 17:41:48 +01:00
Benoît Burnichon
eefd1432ed Fix some translation errors 2015-10-29 22:53:17 +01:00
Benoît Burnichon
c97eedd40f Deprecate is_grouping in favor of isStory 2015-07-13 18:14:51 +02:00
Benoît Burnichon
ff67120388 Fixup some tests that fails with Elasticsearch. 2015-07-02 12:33:19 +02:00
Benoît Burnichon
4cdca486d8 Add getApplication() method PhraseanetTestCase. 2015-07-02 12:33:19 +02:00
Benoît Burnichon
19b8d41dcd Mock AclProvider in pimple AND Application. 
fix CamelCase in `stubbedACL` name.
 2015-07-02 12:33:18 +02:00
Benoît Burnichon
d645b92afa Add AclAware Trait 2015-07-02 12:33:18 +02:00
Benoît Burnichon
4880f2bf5a Add getAuthenticator usage 
Replace $app['authentication']->getUser() by $app->getAuthenticatedUser()
replace twig app['authentication'].getUser() with corresponding method
 2015-07-02 12:33:18 +02:00
Benoît Burnichon
6e651f3b07 Replace app['phraseanet.appbox']->get_databox using trait 2015-07-02 12:27:26 +02:00
Benoît Burnichon
b272ce5aac Add some groups legacy, functional, web, authenticated 2015-06-15 19:30:51 +02:00
Benoît Burnichon
d473a6f69c Fixup tests with proper clearing of cache. 2015-06-10 14:50:29 +02:00
Benoît Burnichon
2ee8fd3c34 Fixup ShareTests after refactoring. 2015-06-01 11:31:17 +02:00
Benoît Burnichon
1342756b84 Rename Controller to ControllerProvider 2015-03-27 12:55:43 +01:00
Benoît Burnichon
a1b490bd3f Slash is now accepted in redirects. 2015-03-25 13:07:45 +01:00
Benoît Burnichon
03b573f19c Some PHPCS fixes. 2015-03-19 15:15:59 +01:00
Nicolas Le Goff
24036bf4ed Fix some tests 2015-03-11 21:50:36 +01:00
Nicolas Le Goff
b536c7ae59 Remove unused function 2015-03-11 21:50:36 +01:00
Benoît Burnichon
118bb2f03c Some fixup for ES instance 2015-03-11 15:22:20 +01:00
Benoît Burnichon
c7fb23d28c Properly Retrieve LazaretFile repo. Update LazaretTests 2015-03-04 19:33:20 +01:00
Nicolas Le Goff
9a3e92ed9c Multiple ORMs for all database 2015-02-12 17:58:45 +01:00
Nicolas Le Goff
bc6b1f593e Fix tests 2015-02-06 19:47:00 +01:00
Nicolas Le Goff
10a83bc6c4 Fix latest merge 2014-10-13 12:58:20 +02:00
Nicolas Le Goff
2ad315cfb2 Set User_Query object as a service 2014-09-09 21:21:38 +02:00
Nicolas Le Goff
7c62038b7d Fix unit tests 2014-09-09 21:21:38 +02:00
Nicolas Le Goff
de7988689e Update directory structure & allow to configure paths (tmp, log, cache) 2014-09-05 15:57:00 +02:00
Nicolas Le Goff
4fa1f613e4 Fix latest merge 2014-08-13 17:40:40 +02:00