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
13,857 Commits 268 Branches 107 Tags
f6349afdeb1e59c2211d01609fd8cb1bea7abcf7
Commit Graph

1832 Commits

Author SHA1 Message Date
Nicolas Le Goff
35d1c55009 Fix PHRAS-77 Set proper filename metadata attribute 2014-04-22 17:39:51 +02:00
Jean-Yves Gaulier
bb9376fb60 Drop highlight support 2014-04-15 12:20:11 +02:00
Nicolas Le Goff
424fea8c8e Clean up the code 2014-04-14 14:58:55 +02:00
Nicolas Le Goff
db8e25f081 Fix unit tests 2014-04-14 14:54:14 +02:00
Nicolas Le Goff
d2dc99baf8 PHRAS-58 Add CORS feature 2014-04-13 19:31:13 +02:00
Nicolas Le Goff
e97ed2b3f1 Merge branch '3.8' 
Conflicts:
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Controller/Admin/Publications.php
	lib/Alchemy/Phrasea/Controller/Admin/Users.php
	lib/Alchemy/Phrasea/Controller/Client/Root.php
	lib/Alchemy/Phrasea/Controller/Prod/Feed.php
	lib/Alchemy/Phrasea/Controller/Prod/Root.php
	lib/Alchemy/Phrasea/Controller/Report/Activity.php
	lib/Alchemy/Phrasea/Controller/Report/Export.php
	lib/Alchemy/Phrasea/Controller/Report/Informations.php
	lib/Alchemy/Phrasea/Controller/Report/Root.php
	lib/classes/API/V1/adapter.php
	lib/classes/Feed/Aggregate.php
	lib/classes/Feed/Collection.php
	lib/classes/format.php
	tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Report/ExportTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php
	tests/classes/Feed/Feed_CollectionTest.php
	tests/classes/api/v1/api_v1_adapterTest.php
 2014-03-30 09:00:17 +02:00
Nicolas Le Goff
aa07eba97f Merge pull request #1041 from nlegoff/api-enhancement 
[3.8][READY] Add some API enhancement
 2014-03-25 14:43:13 +01:00
Nicolas Le Goff
2140efec7f Add repositories tests 2014-03-24 16:07:59 +01:00
Nicolas Le Goff
bf3f870a91 Store UNIX timestamp for token expiration 2014-03-24 12:29:39 +01:00
Nicolas Le Goff
16d9b0e61c Updates tests 2014-03-24 12:29:39 +01:00
Nicolas Le Goff
6b50ee15a7 Add tests 2014-03-24 12:29:38 +01:00
Nicolas Le Goff
178da6a3a6 Fix tests 2014-03-24 12:29:38 +01:00
Nicolas Le Goff
d09cbbb8cf Add ApiLog Manipulator tests 2014-03-24 12:29:37 +01:00
Nicolas Le Goff
c00c10822e Add ApiAccountManipulator tests 2014-03-24 12:29:37 +01:00
Nicolas Le Goff
a3e63f7cb2 Add ApiApplicationManipulator tests 2014-03-24 12:29:37 +01:00
Nicolas Le Goff
2c19ec546d Add providers tests 2014-03-24 12:28:47 +01:00
Nicolas Le Goff
80bf2a2f57 Fix tests 2014-03-24 12:28:20 +01:00
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