hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-13 21:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,475 Commits 268 Branches 107 Tags
dcb8da99aa097bd588495b99f49dc46ec7f23c57
Commit Graph

2227 Commits

Author SHA1 Message Date
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
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
bb7267eafb Use rhumsaa/uuid instead of custom uuid implementation 2014-03-03 11:29:23 +01:00
Romain Neutron
8cf73891c0 Add reconnectable connection 2014-03-03 01:00:15 +01:00
Romain Neutron
5d843ab370 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Border/Manager.php
	lib/Alchemy/Phrasea/Controller/Prod/Tools.php
	lib/Alchemy/Phrasea/Core/Provider/BorderManagerServiceProvider.php
	lib/Alchemy/Phrasea/Core/Provider/PhraseanetServiceProvider.php
	lib/Alchemy/Phrasea/Helper/User/Manage.php
	lib/classes/User/Adapter.php
	lib/classes/connection.php
	lib/classes/connection/abstract.php
	lib/classes/connection/interface.php
	lib/classes/connection/pdo.php
	lib/classes/patch/370alpha7a.php
	lib/classes/patch/370alpha8a.php
	lib/classes/record/adapter.php
	lib/classes/task/period/RecordMover.php
	tests/Alchemy/Tests/Phrasea/Authentication/Phrasea/NativeAuthenticationTest.php
	tests/Alchemy/Tests/Phrasea/Core/Provider/BorderManagerServiceProviderTest.php
	tests/Alchemy/Tests/Phrasea/Core/Provider/PhraseanetServiceProviderTest.php
	tests/classes/PhraseanetPHPUnitAbstract.php
 2014-03-03 00:05:11 +01:00
Romain Neutron
92a4c35340 Substitute random string generator by Randomlib 2014-03-02 21:13:57 +01:00
Nicolas Le Goff
4711675f52 Merge pull request #998 from romainneutron/fix-1705 
[Ready][3.8] Fix #1705 : MySQL connection might be lost after long operations
 2014-03-02 19:21:31 +01:00
Nicolas Le Goff
b3238808bd Merge pull request #1001 from romainneutron/fix-1707 
[Ready][3.8] Fix #1707 : Update technical informations and metadata fields on record substitution
 2014-03-02 19:14:06 +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
3cd43708b0 Merge pull request #990 from romainneutron/repositories-as-services 
[Ready][3.9] Repositories as services
 2014-03-01 15:49:24 +01:00
Romain Neutron
d8e4ea5a41 Use short array notation 2014-03-01 14:44:53 +01:00
Romain Neutron
b836dc8632 Fix CS 2014-03-01 14:40:03 +01:00
Romain Neutron
894c5fe620 Fix unit tests 2014-03-01 14:37:56 +01:00
Romain Neutron
a3b941c3ec Add H264 pseudo streaming tools 2014-02-28 20:18:40 +01:00
Romain Neutron
06f29575c7 Fix hidden use of repositories 2014-02-28 20:02:24 +01:00
Romain Neutron
3d433adb59 Add feed-item repository as a service 2014-02-28 20:02:23 +01:00
Romain Neutron
fd53a38b0f Add order-element repository as a service 2014-02-28 20:01:58 +01:00
Romain Neutron
fe54343f0e Add story-wz repository as a service 2014-02-28 20:01:58 +01:00
Romain Neutron
20aea6de2a Add feed-entry repository as a service 2014-02-28 20:01:23 +01:00
Romain Neutron
a6a2d3d268 Add basket-element repository as a service 2014-02-28 20:00:28 +01:00
Romain Neutron
a72d8ccabc Add registration and basket repositories as a service 2014-02-28 20:00:27 +01:00
Romain Neutron
8f87e8b1c8 Add user repository as a service 2014-02-28 19:58:12 +01:00
Romain Neutron
c641ab7841 Merge branch '3.8' 
Conflicts:
	lib/classes/Bridge/Api/Dailymotion.php
	lib/classes/Bridge/Api/Flickr.php
	lib/classes/Bridge/Api/Interface.php
	lib/classes/DailymotionWithoutOauth2.php
 2014-02-28 19:37:54 +01:00
Romain Neutron
5585d7f7bd Fix #1707 : Update technical informations and metadata fields on record substitution 2014-02-28 19:10:23 +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
c853f37c89 Fix city setter on user_adapter 2014-02-28 17:48:37 +01:00
Romain Neutron
af9259d0cc Update technical data on HD substitution 2014-02-28 12:57:42 +01:00
Nicolas Le Goff
241c31a26b Merge pull request #987 from romainneutron/users-wording 
[3.9] Fix users modelOf and lastModel wording
 2014-02-28 12:56:05 +01:00
Nicolas Le Goff
491385cb06 Fix #1703 bridge is broken 2014-02-28 12:31:34 +01:00
Romain Neutron
9536aacab7 Fix users modelOf and lastModel wording 2014-02-28 03:03:53 +01:00
Romain Neutron
08efd8ff72 Cleanup API 2014-02-28 00:38:12 +01:00
Romain Neutron
2df0f9d659 Merge branch '3.8' 2014-02-28 00:28:06 +01:00
Romain Neutron
9a2875f46b Fix registration table name 2014-02-27 16:57:31 +01:00
Romain Neutron
c3ec4ab857 Merge pull request #900 from nlegoff/replace_demand 
[3.9] Migrate registration table to doctrine entity && refactor registration API
 2014-02-27 16:08:17 +01:00
Romain Neutron
5856992262 Remove disk IO on media_subdef::get_size 2014-02-27 15:53:44 +01:00
Romain Neutron
7f2be7d9aa Use Guzzle\Http\Url for medias 2014-02-27 13:54:08 +01:00
Nicolas Le Goff
ed24b3e6d8 Merge pull request #978 from romainneutron/fix-patches 
[3.9] Fix patches inheritance
 2014-02-26 13:11:56 +01:00
Nicolas Le Goff
03b05783bd Merge pull request #970 from romainneutron/host-configuration-access-restriction 
[3.9] Add access restriction based on host configuration
 2014-02-26 13:11:38 +01:00
Romain Neutron
a0fc4b2360 Fix CS 2014-02-26 12:44:32 +01:00
Nicolas Le Goff
2ec4ffdbcc Refactor && Typo && Use plain objects as function parameters instead of ids 2014-02-26 12:10:54 +01:00
Nicolas Le Goff
c98fe4c23d Adressed Neutron's comments 2014-02-26 12:06:34 +01:00
Nicolas Le Goff
4946e35516 Fix tests, CS && typo 2014-02-26 12:06:34 +01:00
Nicolas Le Goff
52f3baac05 Fix neutron's comment 2014-02-26 12:06:34 +01:00
Nicolas Le Goff
75fac19e73 Migrate demand table to doctrine entity && refactor registration API 2014-02-26 12:06:34 +01:00
Romain Neutron
bff2d22932 Fix patchs inheritance 2014-02-26 10:37:26 +01:00
Romain Neutron
878c96f6d4 Add access restriction 2014-02-25 19:00:53 +01:00
Nicolas Le Goff
2028871f34 Fix Cs 2014-02-25 16:33:43 +01:00