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,095 Commits 268 Branches 107 Tags
67381fa19832fe233e3b1cfe3aec5185e1dd155a
Commit Graph

117 Commits

Author SHA1 Message Date
Sandeep
77352e59ef PHRAS-1856_PORT-PHRAS-1347 2018-02-26 11:30:55 +04:00
Benoît Burnichon
ac2351bd19 fixup several issues 2016-04-12 12:11:13 +02:00
Benoît Burnichon
6cdc9d7a31 Remove some deprecated methods calls 2016-03-06 23:05:55 +01:00
Thibaud Fabre
450adb0847 Application bootstrap refactor 
- Extract environment properties in Environment class
- Replaces initialisation closure by ApplicationLoader class
- Removes undesirable error handling/PHP settings modifications
 2016-01-22 17:12:21 +01:00
Benoît Burnichon
08c7382750 Remove use of self::$DI[app] and self::$DI[client] in LightboxTest 2015-07-15 11:36:01 +02:00
Benoît Burnichon
b272ce5aac Add some groups legacy, functional, web, authenticated 2015-06-15 19:30:51 +02:00
Benoît Burnichon
79ddd6c54e Update test to ensure permalink is created before accessing it. 2015-05-07 11:46:32 +02:00
Nicolas Le Goff
7596ddc5d2 Fix tests 2015-03-12 17:13:53 +01:00
Benoît Burnichon
118bb2f03c Some fixup for ES instance 2015-03-11 15:22:20 +01:00
Nicolas Le Goff
9a3e92ed9c Multiple ORMs for all database 2015-02-12 17:58:45 +01:00
Nicolas Le Goff
9f38823f27 Merge branch '3.8' 
Conflicts:
	composer.lock
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Command/Setup/H264MappingGenerator.php
	lib/Alchemy/Phrasea/Controller/AbstractDelivery.php
	lib/Alchemy/Phrasea/Controller/Prod/DoDownload.php
	lib/Alchemy/Phrasea/Controller/Prod/Edit.php
	lib/Alchemy/Phrasea/Controller/Prod/Story.php
	lib/Alchemy/Phrasea/Controller/Prod/Upload.php
	lib/Alchemy/Phrasea/Controller/Report/Activity.php
	lib/Alchemy/Phrasea/Controller/Report/Root.php
	lib/Alchemy/Phrasea/Controller/Root/Account.php
	lib/Alchemy/Phrasea/Core/PhraseaEvents.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/API/V1/adapter.php
	lib/classes/User/Adapter.php
	lib/classes/databox.php
	lib/classes/media/subdef.php
	lib/classes/module/report.php
	lib/classes/module/report/activity.php
	lib/classes/module/report/connexion.php
	lib/classes/module/report/download.php
	lib/classes/module/report/nav.php
	lib/classes/module/report/question.php
	lib/classes/module/report/sqlaction.php
	lib/classes/module/report/sqlconnexion.php
	lib/classes/module/report/sqldownload.php
	lib/classes/module/report/sqlfilter.php
	lib/classes/task/abstract.php
	locale/de_DE/LC_MESSAGES/phraseanet.mo
	locale/de_DE/LC_MESSAGES/phraseanet.po
	locale/en_GB/LC_MESSAGES/phraseanet.mo
	locale/en_GB/LC_MESSAGES/phraseanet.po
	locale/fr_FR/LC_MESSAGES/phraseanet.mo
	locale/fr_FR/LC_MESSAGES/phraseanet.po
	locale/nl_NL/LC_MESSAGES/phraseanet.mo
	locale/nl_NL/LC_MESSAGES/phraseanet.po
	locale/phraseanet.pot
	templates/web/prod/index.html.twig
	tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php
	tests/classes/api/v1/api_v1_adapterTest.php
	tests/classes/report/activityTest.php
	tests/classes/report/editTest.php
 2014-12-09 13:59:29 +01:00
Nicolas Le Goff
34ef9079ef Fix tests 2014-12-02 18:09:33 +01:00
Nicolas Le Goff
701a91e5c2 fix tests 2014-11-13 12:22:49 +01:00
Nicolas Le Goff
3d0b4398ae Update Api Version 2014-10-10 11:26:06 +02:00
Nicolas Le Goff
042748e044 Apply user rights on sub-definition 2014-08-13 16:20:08 +02:00
Nicolas Le Goff
66fa05f4ee Fix CS 2014-07-17 15:17:04 +02:00
Nicolas Le Goff
fcdc10c554 Fix latest merge 2014-07-17 15:11:26 +02:00
Nicolas Le Goff
1250f8ab0b Fix latest merge 2014-06-19 16:11:27 +02:00
Nicolas Le Goff
e5b8817c46 PHP CS fix 2014-05-30 15:22:00 +02:00
Nicolas Le Goff
e15a2ffd92 Fix tests 2014-05-23 14:43:47 +02:00
Romain Neutron
8b6cb53a36 Add token entities 2014-03-05 15:27:43 +01:00
Romain Neutron
4695054dcf Fix unit tests when running without phrasea2 extension 2014-03-03 19:26:44 +01:00
Nicolas Le Goff
b8d2702975 Merge pull request #1002 from romainneutron/fix-1710 
[Ready][3.8] Fix 1710 : Add /me route + add user entities in API response
 2014-03-03 16:23:08 +01:00
Nicolas Le Goff
a55c23c013 Merge pull request #984 from romainneutron/h264 
[Ready][3.8] Add H264 pseudo stream configuration
 2014-03-03 15:03:31 +01:00
Romain Neutron
035576cefc Fix #1705 : MySQL connection might be lost after long operations 2014-03-02 02:19:13 +01:00
Romain Neutron
28acde0882 Add user entities in API responses 2014-02-28 19:03:33 +01:00
Romain Neutron
1952910c83 Add /me route on API v1 2014-02-28 17:48:49 +01:00
Romain Neutron
08efd8ff72 Cleanup API 2014-02-28 00:38:12 +01:00
Romain Neutron
7f2be7d9aa Use Guzzle\Http\Url for medias 2014-02-27 13:54:08 +01:00
Nicolas Le Goff
7fb44d2b43 Fix merge 2014-02-19 17:29:27 +01:00
Nicolas Le Goff
eaa1feb765 Address PR comments 2014-02-19 17:29:27 +01:00
Nicolas Le Goff
c10c78f740 Fix unit tests 2014-02-19 17:29:26 +01:00
Nicolas Le Goff
b341495c88 Fix tests 2014-02-19 17:29:26 +01:00
Nicolas Le Goff
4cc82af980 Fix settings 2014-02-19 17:29:26 +01:00
Nicolas Le Goff
53ae0ccc24 Remove User_Adapter Inteface References 2014-02-19 17:29:25 +01:00
Nicolas Le Goff
678f741660 Use Short Array notation 2014-02-19 17:28:54 +01:00
Nicolas Le Goff
c156f842c7 Remove User_Adapter 2014-02-19 17:28:53 +01:00
Romain Neutron
2de870c3f9 Add a namespace to Phraseanet doctrine entities 2014-02-18 19:32:08 +01:00
Nicolas Le Goff
6053a03b87 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Prod/Records.php
	lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.php
	tests/Alchemy/Tests/Phrasea/Application/ApiTestCase.php
	tests/classes/PhraseanetPHPUnitAbstract.php
 2014-02-11 09:02:29 +01:00
Romain Neutron
28d1ea0142 Fix #1690 : Avoid tests failure because a second 2014-02-10 23:19:02 +01:00
Nicolas Le Goff
4cae02aed3 Merge branch '3.8' 
Conflicts:
	lib/classes/module/console/schedulerStart.php
	lib/classes/module/console/taskrun.php
 2014-02-04 17:25:40 +01:00
Romain Neutron
72344662d4 Fix #1682 : Add OPTIONS HTTP method over permalinks for Office AddIn media discovery 2014-02-04 14:02:56 +01:00
Romain Neutron
e840df0b36 Decouple caption and its serialization 2014-01-27 20:12:13 +01:00
Romain Neutron
91cf9705ab Add subdef substituer 2014-01-14 15:05:44 +01:00
Romain Neutron
d7f7e1c92c Fix CS 2014-01-14 12:04:38 +01:00
Romain Neutron
64456a8964 Remove phraseanet registry 2013-12-20 16:44:22 +01:00
Romain Neutron
6c45e8d40a Add improvements to unit tests 2013-12-20 10:51:35 +01:00
Romain Neutron
89dc1c5129 Add fixtures to sqlite db 2013-12-18 23:34:06 +01:00
Romain Neutron
8b0a73ce2d Love for unit tests 2013-12-10 01:29:02 +01:00
Romain Neutron
66e762a1d1 Fix unit test names 2013-12-10 01:29:02 +01:00