hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 12:33:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,700 Commits 268 Branches 107 Tags
7f97445b51f32446cb8befe01db66df6aac635c7
Commit Graph

2444 Commits

Author SHA1 Message Date
Nicolas Le Goff
cc49f51cfa Merge pull request #1063 from nlegoff/phras-55 
[3.8] PHRAS-55 Rename status icon filename
 2014-04-23 14:46:39 +02:00
Nicolas Le Goff
031de51044 Fix PHRAS-24 Use https endpoint to display google charts 2014-04-22 17:48:29 +02:00
Nicolas Le Goff
d0d83cd705 Add migration patch 2014-04-22 11:20:36 +02:00
Nicolas Le Goff
9d10c68446 Rename icone status 2014-04-22 11:20:17 +02:00
Nicolas Le Goff
721fd9e909 Merge pull request #1039 from jygaulier/fix-bounce-and-highlight 
[3.8][PHRAS-74] Fix thesaurus bounce
 2014-04-15 15:45:50 +02:00
Nicolas Le Goff
f9ee940526 Fix API feeds pagination 2014-04-15 12:03:41 +02:00
Nicolas Le Goff
424fea8c8e Clean up the code 2014-04-14 14:58:55 +02:00
Jean-Yves Gaulier
761437154c Fix thesaurus bounce 2014-04-14 14:54:14 +02:00
Nicolas Le Goff
68861f546b PHRAS-70 Set default etags 2014-04-10 18:05:31 +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
bf3f870a91 Store UNIX timestamp for token expiration 2014-03-24 12:29:39 +01:00
Nicolas Le Goff
ad4c265cdf Fix migration patch 2014-03-24 12:29:39 +01:00
Nicolas Le Goff
383107b954 Update migration patch 2014-03-24 12:29:39 +01:00
Nicolas Le Goff
137cacea0b Fix sets of expiration time 2014-03-24 12:29:38 +01:00
Nicolas Le Goff
dce52c26d8 Add proper expire date to oauth code token 2014-03-24 12:29:38 +01:00
Nicolas Le Goff
fa9189f78a Add oauth2 adapter as a service 2014-03-24 12:29:38 +01:00
Nicolas Le Goff
40ff8968e9 Raise bad request exception if uri is malformed && Fix use statement 2014-03-24 12:29:38 +01:00
Nicolas Le Goff
e0d538c2c9 Split route field value & sets expie date to null 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
2cc2387c87 Fix migration SQLs 2014-03-24 12:29:37 +01:00
Nicolas Le Goff
426816e2d3 Checks if api tables exists before apllaying patch 2014-03-24 12:29:37 +01:00
Nicolas Le Goff
ec07e33c9f Fix patch 2014-03-24 12:29:37 +01:00
Nicolas Le Goff
ce41455e45 Update ORM's tables 2014-03-24 12:29:37 +01:00
Nicolas Le Goff
5145848161 Add Migration patch 2014-03-24 12:28:47 +01:00
Nicolas Le Goff
3ef081ec12 Fix typo 2014-03-24 12:28:20 +01:00
Nicolas Le Goff
1cd5237363 Fix typos 2014-03-24 12:28:19 +01:00
Nicolas Le Goff
d91cba1e8e Fix method calls 2014-03-24 12:28:19 +01:00
Nicolas Le Goff
c107bc9cb9 Delete references to API_OAuth2_Token class 2014-03-24 12:28:18 +01:00
Nicolas Le Goff
c7d100ce89 Delete references to API_OAuth2_RefreshToken class 2014-03-24 12:28:18 +01:00
Nicolas Le Goff
a6db51a806 Delete references to API_OAuth2_Code 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
5873b2c261 Delete API_OAuth2_Application 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
b50734fb50 Remove dead code 2014-03-24 12:28:16 +01:00
Nicolas Le Goff
bc92e8049d Refactor lib/classes/API/OAuth2/Adapter.php to use api entities 2014-03-24 12:28:16 +01:00
Nicolas Le Goff
3468b2acc2 Add feed title in feed entry json schema 2014-03-24 12:26:55 +01:00
Nicolas Le Goff
e317f86c51 Fix CS 2014-03-23 23:07:01 +01:00
Nicolas Le Goff
5a14fb850d Delete old format class 2014-03-23 22:46:20 +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
e4e71cc7e3 Add 390alpha18a patch 2014-03-16 02:12:24 +01:00
Nicolas Le Goff
01aedd3326 Check if 'servername' key exists 2014-03-16 02:11:56 +01:00
Nicolas Le Goff
633fad7c75 Fix Orders migration 2014-03-14 11:37:12 +01:00
Nicolas Le Goff
66e1832357 Fix edit_preset table migration 2014-03-14 11:37:12 +01:00
Nicolas Le Goff
a23bf7a4ac Fix tokens table migration 2014-03-14 11:37:12 +01:00
Nicolas Le Goff
6421508551 Fix rename of api logs table 2014-03-14 11:37:12 +01:00
Nicolas Le Goff
ea248e0e31 Fix Feeds Migration 2014-03-14 11:37:12 +01:00
Nicolas Le Goff
f84f8f17fd Fix missing namespaces 2014-03-14 11:37:11 +01:00
Nicolas Le Goff
244a845752 Merge branch '3.8' 
Conflicts:
	lib/classes/task/period/archive.php
 2014-03-10 17:13:02 +01:00
Nicolas Le Goff
92ac485899 Fix status calculation form xml card index 2014-03-10 14:04:24 +01:00