hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 07:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,673 Commits 268 Branches 107 Tags
bbbc8f7e0268f15ebde3ca0e21cfe39c7892ca23
Commit Graph

4583 Commits

Author SHA1 Message Date
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
f72d102ace Revert fetching tooltip dependency with bower 2014-03-05 15:33:23 +01:00
Nicolas Le Goff
cf2105865b Fix tests 2014-03-05 15:33:23 +01:00
Nicolas Le Goff
218da9a091 Add tests 2014-03-05 15:33:23 +01:00
Nicolas Le Goff
c7962531fa Add jquery.treeview, jquery.tooltip as dependency trought bower 2014-03-05 15:33:21 +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
f9174caab3 Merge branch '3.8' 
Conflicts:
	lib/classes/system/server.php
	tests/classes/system/serverTest.php
 2014-03-05 12:23:27 +01:00
Romain Neutron
1823e4be5b Remove verbosity 2014-03-05 12:22:42 +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
Romain Neutron
e8ec3801e8 Remove unused files 2014-03-05 02:58:52 +01:00
Romain Neutron
b48d95d6a5 Remove unused functions 2014-03-05 02:45:10 +01:00
Romain Neutron
f0ca05e720 Remove unused files 2014-03-05 02:41:06 +01:00
Romain Neutron
82bd617477 Add compatibility with elasticsearch 1 2014-03-05 02:19:18 +01:00
Nicolas Le Goff
1d8b6edc46 Use user manipulator to log user query 2014-03-04 19:53:07 +01:00
Jean-Yves Gaulier
9d9bd99078 fix #1713 2014-03-04 18:27:54 +01:00
Nicolas Le Goff
3e46657d7c Twigify thesaurus presets rendering 2014-03-04 18:25:48 +01:00
Romain Neutron
4d1bd8417e Fix typo 2014-03-04 14:50:50 +01:00
Nicolas Le Goff
1ce11430fe Fix #1606 & #1712 Homepage does not display when deleting a feed 2014-03-04 14:16:26 +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
4695054dcf Fix unit tests when running without phrasea2 extension 2014-03-03 19:26:44 +01:00
Nicolas Le Goff
01a4b97f7a Merge pull request #1008 from romainneutron/final-methods 
[Ready][3.9] Make doctrine migration up and down method final
 2014-03-03 17:49:48 +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
2d683d97b7 Add logger to reconnectable connection 2014-03-03 15:10:39 +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
c724465d79 Make doctrine migration up and down method final 2014-03-03 14:21:14 +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
c0fe2c2d94 Avoid guest login name collisions 2014-03-02 14:09:58 +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
b271c4ed9a Add missing proxy and repository 2014-03-01 14:46:22 +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
543b943285 Bump to version 3.8.4-alpha.1 2014-02-28 20:18:40 +01:00
Romain Neutron
a3b941c3ec Add H264 pseudo streaming tools 2014-02-28 20:18:40 +01:00