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
7,673 Commits 268 Branches 107 Tags
bbbc8f7e0268f15ebde3ca0e21cfe39c7892ca23
Commit Graph

1160 Commits

Author SHA1 Message Date
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
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
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
Nicolas Le Goff
0a2d4fe04d Bind task manager backbone app to websocket using autobahn 2014-03-05 15:33:21 +01:00
Romain Neutron
5c5afc8f64 Bump to version 3.9.0-alpha.15 2014-03-05 15:27:43 +01:00
Romain Neutron
8b6cb53a36 Add token entities 2014-03-05 15:27:43 +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
1823e4be5b Remove verbosity 2014-03-05 12:22:42 +01:00
Nicolas Le Goff
1d8b6edc46 Use user manipulator to log user query 2014-03-04 19:53:07 +01:00
Nicolas Le Goff
3e46657d7c Twigify thesaurus presets rendering 2014-03-04 18:25:48 +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
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
Romain Neutron
6ba1e61546 Reduce connection overhead 2014-03-03 15:10:39 +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
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
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
c0fe2c2d94 Avoid guest login name collisions 2014-03-02 14:09:58 +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
894c5fe620 Fix unit tests 2014-03-01 14:37:56 +01:00
Romain Neutron
06f29575c7 Fix hidden use of repositories 2014-02-28 20:02:24 +01:00
Romain Neutron
6a06492679 Add feed-publisher repository as a service 2014-02-28 20:02:23 +01:00
Romain Neutron
00f067f092 Add usr-list-owner repository as a service 2014-02-28 20:02:23 +01:00
Romain Neutron
579fdbc0b2 Add aggregate-token repository as a service 2014-02-28 20:02:23 +01:00
Romain Neutron
3d433adb59 Add feed-item repository as a service 2014-02-28 20:02:23 +01:00
Romain Neutron
bedd2d7f45 Add lazaret-file repository as a service 2014-02-28 20:02:23 +01:00
Romain Neutron
fe54343f0e Add story-wz repository as a service 2014-02-28 20:01:58 +01:00
Romain Neutron
7c5038e9d7 Add usr-list repository as a service 2014-02-28 20:01:58 +01:00
Romain Neutron
6aaa9ab38e Add feed 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
0e95357060 Add task repository as a service 2014-02-28 19:59:50 +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