hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-16 22:43:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,001 Commits 268 Branches 107 Tags
53b8ca40872a04579822b23e2b51b43b30cc652f
Commit Graph

1765 Commits

Author SHA1 Message Date
Nicolas Le Goff
bc4a58bf15 Delete api_* class tests 2014-03-24 12:28:18 +01:00
Nicolas Le Goff
c107bc9cb9 Delete references to API_OAuth2_Token class 2014-03-24 12:28:18 +01:00
Nicolas Le Goff
fd38ec9b79 Delete references to API_OAuth2_Account class 2014-03-24 12:28:17 +01:00
Nicolas Le Goff
d1d936d8b8 Update ApiApplication method call 2014-03-24 12:28:17 +01:00
Nicolas Le Goff
5d6ee3718a Fix typo 2014-03-24 12:28:17 +01:00
Nicolas Le Goff
53dda0b09e Delete references to API_OAuth2_Application class 2014-03-24 12:28:17 +01:00
Nicolas Le Goff
e317f86c51 Fix CS 2014-03-23 23:07:01 +01:00
Nicolas Le Goff
e45d7edbc3 Fix latest merge 2014-03-23 23:04:59 +01:00
Nicolas Le Goff
b3bd70fff1 Fix tests 2014-03-23 22:46:21 +01:00
Nicolas Le Goff
42cac0d3c4 Fix unit tests 2014-03-23 22:46:21 +01:00
Nicolas Le Goff
5e07b68780 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Authentication/Phrasea/NativeAuthentication.php
	lib/Alchemy/Phrasea/Controller/Report/Root.php
	templates/web/report/ajax_dashboard_content_child.html.twig
	templates/web/report/all_content.html.twig
	templates/web/report/report_layout_child.html.twig
	tests/Alchemy/Tests/Phrasea/Controller/Report/RootTest.php
 2014-03-23 19:49:12 +01:00
Nicolas Le Goff
8638bfb3d4 Add possibility to restrict aggregated feeds to a set of feeds 2014-03-21 17:52:12 +01:00
Nicolas Le Goff
db21aecd1d Fix unit tests 2014-03-20 02:14:43 +01:00
Nicolas Le Goff
5e1830eb1f Merge branch '3.8' 
Conflicts:
	lib/classes/task/period/archive.php
 2014-03-10 14:00:40 +01:00
Nicolas Le Goff
6e98568711 Merge pull request #1019 from jygaulier/3.8-fix1713 
fix #1713
 2014-03-10 11:58:21 +01:00
Romain Neutron
92db3e9f8d Merge pull request #1017 from nlegoff/edit-preset-entity 
[Ready][3.9] Transform thesaurus preset into doctrine Entity
 2014-03-06 11:10:08 +01:00
Romain Neutron
02d6da2f80 Merge pull request #1027 from romainneutron/setup-upgrader 
[3.9] Remove unused code
 2014-03-06 11:09:19 +01:00
Nicolas Le Goff
4af7dbddb1 Transform thesaurus preset into doctrine Entity 2014-03-06 01:31:43 +01:00
Nicolas Le Goff
02f8357f18 Merge pull request #1026 from romainneutron/json-response 
[Ready][3.9] Use symfony JsonResponse for API
 2014-03-06 01:31:32 +01:00
Romain Neutron
567e66087d Merge pull request #985 from nlegoff/autobahn_inte 
[3.9] Bind backbone task manager application to websocket
 2014-03-06 01:17:29 +01:00
Romain Neutron
a5deac6147 Use symfony JsonResponse for API 2014-03-05 16:55:54 +01:00
Romain Neutron
3583b71935 Remove unused code 2014-03-05 16:53:03 +01:00
Nicolas Le Goff
d9183d2f4f Add tests & Fix task manager tests 2014-03-05 15:33:22 +01:00
Romain Neutron
8b6cb53a36 Add token entities 2014-03-05 15:27:43 +01:00
Romain Neutron
d3bf3f747e Fix unit tests 2014-03-05 15:27:24 +01:00
Romain Neutron
92b1ee1b52 Merge branch 'master' of github.com:alchemy-fr/Phraseanet 2014-03-05 15:00:05 +01:00
Romain Neutron
e3fbe08890 Merge branch '3.8' 
Conflicts:
	tests/classes/PhraseanetPHPUnitAbstract.php
 2014-03-05 14:59:41 +01:00
Romain Neutron
49f1de8fe4 Revert changes in tests 2014-03-05 14:57:20 +01:00
Romain Neutron
b8654fdb43 Merge pull request #1016 from nlegoff/log-user-query 
[Ready][3.9] Use user manipulator to log user query
 2014-03-05 12:28:54 +01:00
Romain Neutron
f9174caab3 Merge branch '3.8' 
Conflicts:
	lib/classes/system/server.php
	tests/classes/system/serverTest.php
 2014-03-05 12:23:27 +01:00
Nicolas Le Goff
c7810502a5 Merge pull request #1025 from romainneutron/master-cleanup 
[Ready][3.9] Remove unused functions
 2014-03-05 11:51:07 +01:00
Nicolas Le Goff
3e7a36cff3 Merge pull request #1024 from romainneutron/3.8-cleanup 
[Ready][3.8] Remove unused files
 2014-03-05 11:49:33 +01:00
Romain Neutron
8e80271a51 Merge branch '3.8' 
Conflicts:
	tests/classes/PhraseanetPHPUnitAbstract.php
 2014-03-05 11:06:48 +01:00
Romain Neutron
b48d95d6a5 Remove unused functions 2014-03-05 02:45:10 +01:00
Romain Neutron
f0ca05e720 Remove unused files 2014-03-05 02:41:06 +01:00
Romain Neutron
297a08492a Reset exception handler in tests setup 2014-03-05 02:18:18 +01:00
Nicolas Le Goff
1d8b6edc46 Use user manipulator to log user query 2014-03-04 19:53:07 +01:00
Jean-Yves Gaulier
9d9bd99078 fix #1713 2014-03-04 18:27:54 +01:00
Romain Neutron
975e8bd3c5 Merge pull request #1010 from nlegoff/fix-homepage-feed 
[Ready][3.8] Fix #1606 & #1712 Homepage does not display when deleting a feed
 2014-03-04 18:26:34 +01:00
Romain Neutron
32534f7871 Merge branch '3.8' 
Conflicts:
	tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration-setup.yml
	tests/Alchemy/Tests/Phrasea/Core/Configuration/Fixtures/configuration.yml
	tests/classes/PhraseanetPHPUnitAbstract.php
 2014-03-04 15:54:58 +01:00
Romain Neutron
c48b20edb7 Fix tests 2014-03-04 15:53:34 +01:00
Romain Neutron
8d2009cfef Add error reporting setting 
Conflicts:
	tests/classes/PhraseanetTestCase.php
 2014-03-04 15:40:33 +01:00
Nicolas Le Goff
1ce11430fe Fix #1606 & #1712 Homepage does not display when deleting a feed 2014-03-04 14:16:26 +01:00
Nicolas Le Goff
6c3cdfc52e Merge pull request #1006 from romainneutron/fix-connection-master 
[Ready][3.9] Add reconnectable connection
 2014-03-04 11:19:44 +01:00
Romain Neutron
4695054dcf Fix unit tests when running without phrasea2 extension 2014-03-03 19:26:44 +01:00
Romain Neutron
122692f1e6 Fix latest merge 2014-03-03 17:49:06 +01:00
Romain Neutron
46141b3cc6 Add error reporting setting 2014-03-03 17:31:13 +01:00
Romain Neutron
48dc4ce1d5 Fix latest merge 2014-03-03 17:26:56 +01:00
Romain Neutron
1713c23c59 Merge branch '3.8' 
Conflicts:
	bin/console
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Controller/Prod/Edit.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/API/V1/Interface.php
	lib/classes/API/V1/adapter.php
	lib/classes/Feed/XML/Abstract.php
	lib/classes/Feed/XML/Cooliris.php
	lib/classes/User/Adapter.php
	lib/classes/media/Permalink/Adapter.php
	lib/classes/media/abstract.php
	lib/classes/media/subdef.php
	lib/classes/p4file.php
	lib/classes/record/preview.php
	lib/conf.d/_GV_template.inc
	tests/Alchemy/Tests/Phrasea/Controller/Api/ApiTestCase.php
	tests/Alchemy/Tests/Phrasea/Core/Provider/FileServeServiceProviderTest.php
	tests/classes/media/Permalink/media_Permalink_AdapterTest.php
 2014-03-03 17:00:17 +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