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
9,042 Commits 268 Branches 107 Tags
d9b1a54e5589bf94c0577a48acedff86dba2eacf
Commit Graph

1396 Commits

Author SHA1 Message Date
Nicolas Le Goff
291512ff34 Fix empty of collection 2014-06-06 16:42:24 +02:00
Nicolas Le Goff
d42f27ad40 Fix PHRAS-146 Order of a basket generates an error when the content comes from two different collections 2014-05-30 17:36:02 +02:00
Nicolas Le Goff
e5b8817c46 PHP CS fix 2014-05-30 15:22:00 +02:00
Nicolas Le Goff
093d4f2cd1 Fix PHRAS-133 acknowledgment of receipt is not setted 2014-05-30 11:21:42 +02:00
Nicolas Le Goff
83e63e731a Fix tests 2014-05-23 14:43:47 +02:00
Jean-Yves Gaulier
192c2fbb55 PHRAS-46 #fix 
PHRAS-16 #time 40h
 2014-05-23 14:43:46 +02:00
Nicolas Le Goff
ab5f7d4492 Fix PHRAS-123 Fix tooltip content display 2014-05-22 14:48:58 +02:00
Nicolas Le Goff
858bbf5dc9 Fix PHRAS-118 Status editing is broken 2014-05-14 16:25:59 +02:00
Nicolas Le Goff
9c84ab5de4 Merge pull request #1074 from nlegoff/phras-47-push 
[3.8] Adds options to force authentication to see push content
 2014-05-06 17:25:27 +02:00
Nicolas Le Goff
45ec715eea Fix phras-47 Force authentication to see push content 2014-05-06 15:20:05 +02:00
Nicolas Le Goff
cd51e9922b Add route to modify apllication webhook urls 2014-05-06 10:53:28 +02:00
Nicolas Le Goff
2f7e9bb14a Merge pull request #1059 from nlegoff/fix-csv-import 
[3.8] fix [PHRAS-75] csv user import is broken
 2014-04-24 17:03:03 +02:00
Nicolas Le Goff
ef1b7e0774 Fix php 53 support 2014-04-24 16:04:26 +02:00
Nicolas Le Goff
9f50226301 Merge pull request #1066 from nlegoff/phras-49 
[3.8] phras-49 Add information for user list popup when push records
 2014-04-23 14:47:37 +02:00
Nicolas Le Goff
9a3561a890 Fix phras-49 Add information for user list popup when push records 2014-04-22 19:20:48 +02:00
Jean-Yves Gaulier
09a199b535 PHRAS-9 #close 
PHRAS-9 #time 4h
 2014-04-16 14:05:28 +02:00
Nicolas Le Goff
0883c95fb4 fix [PHRAS-75] csv user import is broken 2014-04-15 17:59:41 +02:00
Nicolas Le Goff
1054483ae9 Fix latest merge 2014-03-30 21:17:46 +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
dce9269d86 Add setLastused function to OauthTokenManipulator 2014-03-24 12:29:39 +01:00
Nicolas Le Goff
fa9189f78a Add oauth2 adapter as a service 2014-03-24 12:29:38 +01:00
Nicolas Le Goff
8926244153 Fix typo issue 2014-03-24 12:29:38 +01:00
Nicolas Le Goff
63b6de5fc8 Remove one to one relation beetween account and token & add lastUsed field for token 2014-03-24 12:29:37 +01:00
Nicolas Le Goff
ab2d03530e Replace id attribute by application 2014-03-24 12:28:19 +01:00
Nicolas Le Goff
9411e57c15 Fix missing namespace & organize data for the view 2014-03-24 12:28:19 +01:00
Nicolas Le Goff
de3795c8ea Fix method calls 2014-03-24 12:28:19 +01:00
Nicolas Le Goff
36cabf2d6a Delete Alchemy\Phrasea\Controller\Api\Logger class 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
378857f168 Update OAuth2 Controller to use new entities & manipulator 2014-03-24 12:28:17 +01:00
Nicolas Le Goff
a9fbeeffd5 Refactor V1 controller to use api entities 2014-03-24 12:28:16 +01:00
Nicolas Le Goff
4cb735b4f1 Fix array declaration 2014-03-23 23:12:01 +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
42cac0d3c4 Fix unit tests 2014-03-23 22:46:21 +01:00
Nicolas Le Goff
417ae47f9f Fix namespaces 2014-03-23 22:46:21 +01:00
Nicolas Le Goff
617c59a4ba Fix CSV report generation mess 2014-03-23 22:46:20 +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
266592213b Report dashboard is now loaded on demand 2014-03-18 16:59:03 +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
cf2105865b Fix tests 2014-03-05 15:33:23 +01:00
Nicolas Le Goff
7c0f7c4411 Fix init 2014-03-05 15:33:21 +01:00