hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,303 Commits 268 Branches 107 Tags
5b246640013b2ba69fe9a1163186c40d6859de7a
Commit Graph

132 Commits

Author SHA1 Message Date
Mathieu Darse
5b24664001 Merge branch 'master' into elastic-indexer 
Conflicts:
	bin/console
 2014-10-15 12:18:44 +02:00
Nicolas Le Goff
10a83bc6c4 Fix latest merge 2014-10-13 12:58:20 +02:00
Nicolas Le Goff
28eecf6a09 Merge branch '3.8' 
Conflicts:
	.gitignore
	bin/console
	composer.json
	composer.lock
	hudson/fixtures.sql
	lib/Alchemy/Phrasea/Command/Developer/IniReset.php
	lib/Alchemy/Phrasea/Command/Setup/Install.php
	lib/Alchemy/Phrasea/Controller/Api/Oauth2.php
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Controller/Prod/Export.php
	lib/Alchemy/Phrasea/Controller/Root/Login.php
	lib/Alchemy/Phrasea/Core/Provider/PhraseanetServiceProvider.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/Alchemy/Phrasea/Helper/DatabaseHelper.php
	lib/Alchemy/Phrasea/Helper/Prod.php
	lib/classes/API/OAuth2/Application.php
	lib/classes/API/V1/Interface.php
	lib/classes/API/V1/adapter.php
	lib/classes/Setup/Upgrade.php
	lib/classes/media/subdef.php
	lib/classes/task/period/RecordMover.php
	templates/web/prod/index.html.twig
	templates/web/setup/step2.html.twig
	tests/Alchemy/Tests/Phrasea/Controller/Admin/RootTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php
	tests/classes/api/v1/api_v1_adapterTest.php
	tests/db-ref.sqlite
	vagrant/vms/phraseanet-php54-nginx/puphpet/config.yaml
	vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-once/setup
 2014-10-09 19:40:33 +02:00
Damien Alexandre
5f7edb5be9 Merge branch 'master' into elastic-indexer 
Conflicts:
	.gitignore
 2014-10-06 18:24:58 +02:00
Mathieu Darse
de8e9e3bfc Refactor search engine provider 2014-09-10 16:45:22 +02:00
Nicolas Le Goff
2c023f4bca Remove command 2014-09-10 11:23:29 +02:00
Nicolas Le Goff
2c6ba6b99f Add static file mode to deliver thumbnails 2014-09-10 11:23:29 +02:00
Nicolas Le Goff
7eb1a506fa Merge branch '3.8' 
Conflicts:
	.gitignore
	.travis.yml
	Vagrantfile
	lib/Alchemy/Phrasea/Controller/Datafiles.php
	lib/Alchemy/Phrasea/Controller/Setup.php
	lib/Alchemy/Phrasea/Helper/DatabaseHelper.php
	lib/classes/connection/pdo.php
	lib/classes/task/period/subdef.php
	lib/classes/task/period/writemeta.php
	locale/de_DE/LC_MESSAGES/phraseanet.mo
	locale/de_DE/LC_MESSAGES/phraseanet.po
	locale/en_GB/LC_MESSAGES/phraseanet.mo
	locale/en_GB/LC_MESSAGES/phraseanet.po
	locale/fr_FR/LC_MESSAGES/phraseanet.mo
	locale/fr_FR/LC_MESSAGES/phraseanet.po
	locale/nl_NL/LC_MESSAGES/phraseanet.mo
	locale/nl_NL/LC_MESSAGES/phraseanet.po
	locale/phraseanet.pot
	templates/web/setup/step2.html.twig
	vagrant/vms/phraseanet-php54-nginx/puphpet/config.yaml
	vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-always/setup
	vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-once/setup
	vagrant/vms/phraseanet-php54-nginx/puphpet/shell/important-notices.txt
	vagrant/vms/phraseanet-php54-nginx/puphpet/shell/self-promotion.txt
 2014-09-09 15:05:13 +02:00
Nicolas Le Goff
8189010d9b Move crossdomain generator command to bin/setup 2014-09-08 23:37:30 +02:00
Damien Alexandre
ab07cb8e17 Merge branch 'master' into elastic-indexer 
Conflicts:
	.gitignore
 2014-09-08 11:39:02 +02:00
Mathieu Darse
d187bfe80d WIP Indexer 2014-08-26 16:42:48 +02:00
Nicolas Le Goff
b9bb9f5f0e Merge branch '3.8' 
Conflicts:
	.gitignore
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/databox.php
	lib/classes/task/abstract.php
	lib/classes/task/manager.php
	lib/classes/task/period/subdef.php
	lib/classes/task/period/writemeta.php
	lib/conf.d/bases_structure.xml
	templates/web/admin/tasks/list.html.twig
 2014-08-26 13:38:01 +02:00
Nicolas Le Goff
bc88d0f474 Add crossdomain file generator command 2014-08-19 16:35:57 +02:00
Nicolas Le Goff
46da7be65d Merge branch '3.8' 
Conflicts:
	.travis.yml
	bin/developer
	build-env.sh
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Core/Provider/LocaleServiceProvider.php
	tests/Alchemy/Tests/Phrasea/Command/Setup/XSendFileMappingGeneratorTest.php
	tests/Alchemy/Tests/Phrasea/Controller/SetupTest.php
	tests/Alchemy/Tests/Phrasea/Form/Login/PhraseaRegisterFormTest.php
 2014-08-19 15:30:25 +02:00
Nicolas Le Goff
9e2083dfe4 Add init command 2014-08-13 18:21:57 +02: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
Romain Neutron
a3b941c3ec Add H264 pseudo streaming tools 2014-02-28 20:18:40 +01:00
Romain Neutron
fb693836d5 Add enable/disable plugins commands 2014-02-21 16:41:11 +01:00
Nicolas Le Goff
b4a07c1469 Merge pull request #944 from romainneutron/websockets 
[3.9] Add websocket server
 2014-02-17 12:02:56 +01:00
Romain Neutron
811be51b3d Add WebsocketServer command 2014-02-15 11:38:51 +01:00
Nicolas Le Goff
7025e756bc Use backbone to display taskmanager front end 2014-02-14 16:55:45 +01:00
Nicolas Le Goff
bd1e4516bd Merge branch '3.8' 
Conflicts:
	config/configuration.sample.yml
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/module/console/schedulerStart.php
	lib/classes/module/console/taskrun.php
	lib/conf.d/configuration.yml
	templates/mobile/common/index.html.twig
 2014-02-03 19:02:22 +01:00
Romain Neutron
a66f158dbb Fix #1661 : Use bin/setup for plugin manipulation to avoid plugin failures 2014-02-03 17:24:57 +01:00
Nicolas Le Goff
30078730ab Merge branch '3.8' 
Conflicts:
	bin/console
	composer.lock
 2014-01-31 14:59:53 +01:00
Romain Neutron
6b81b2b39e Add plugin:list command 2014-01-29 18:17:34 +01:00
Romain Neutron
97d96a6b32 Add elastic-search engine support 2014-01-27 20:12:13 +01:00
Romain Neutron
c6059c4a00 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/CLI.php
 2014-01-07 10:40:47 +01:00
Romain Neutron
947b746ca1 Minor tweaks on CLI application 2014-01-06 16:04:07 +01:00
Romain Neutron
354232f61a Bump copyright year 2014-01-06 15:40:56 +01:00
Romain Neutron
680643c0fc Fix unit tests and arrays declaration 2013-12-03 20:06:49 +01:00
Romain Neutron
458aac8dd8 Add JMS translation tools 2013-12-03 20:05:20 +01:00
Romain Neutron
6ab51d55f8 Add missing headers 2013-11-20 19:03:55 +01:00
Romain Neutron
7e0a3c7338 Use configuration property accessor 2013-11-18 18:48:27 +01:00
Nicolas Le Goff
5b955b2a22 Fix neutron's comments 2013-11-18 16:22:28 +01:00
Nicolas Le Goff
4c58b141ee Fix neutron comments 2013-11-18 14:37:16 +01:00
Nicolas Le Goff
99d4895f57 Add DoctrineMigration Patch 2013-11-18 14:35:38 +01:00
Nicolas Le Goff
431d2532e2 UseDoctrineMigrationServiceProvider 2013-11-18 14:33:44 +01:00
Romain Neutron
56b373ee6e Use short array declaration 2013-11-18 13:57:33 +01:00
Romain Neutron
13915dc1a8 Rename "phraseanet.configuration" service to "configuration" 2013-11-15 22:08:07 +01:00
Romain Neutron
c0ab4944f9 Rename commands 2013-10-29 18:46:37 +01:00
Romain Neutron
afd9d33b9a Update task manager commands 2013-10-29 18:46:34 +01:00
Romain Neutron
6345fcc83a Add uninstaller for development purposes 2013-10-07 10:08:11 +02:00
Romain Neutron
0a950b0ae6 Add uninstaller for development purposes 2013-10-04 17:29:13 +02:00
Romain Neutron
1dfbff5666 Merge branch '3.8' 
Conflicts:
	CHANGELOG.md
	bin/developer
	lib/classes/module/console/systemUpgrade.php
	www/skins/report/jquery-ui.css
 2013-10-03 15:29:22 +02:00
Romain Neutron
abae32ca5f Fix #1489 : Let errors happen when they occur 2013-10-02 18:30:48 +02:00
Nicolas Le Goff
ba6e060b44 Remove javascript builder command 2013-08-19 14:35:56 +02:00
Romain Neutron
f07ace58bc Add plugins reset command 2013-08-08 15:35:46 +02:00
Romain Neutron
899549d45a Fix #1242 : Commands description check, move generate:template command to developer console 2013-07-17 20:14:23 +02:00
Romain Neutron
303aadad57 Make developer commands runnable without install 2013-07-16 19:36:18 +02:00
Romain Neutron
056ac28120 Refactor command line utilities 2013-07-16 16:01:17 +02:00