Mathieu Darse
|
9b02b90353
|
Fix engine type in default configuration
|
2014-11-10 15:17:22 +01: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 |
|
Nicolas Le Goff
|
df013d4f21
|
Allow to specify symlink directory
|
2014-09-10 11:25:31 +02:00 |
|
Nicolas Le Goff
|
e72a8ebda3
|
Update configuration
|
2014-09-10 11:24:43 +02:00 |
|
Nicolas Le Goff
|
0e807b2b0f
|
Add aggregable property to metadata fields
|
2014-09-08 14:53:23 +02:00 |
|
Nicolas Le Goff
|
de7988689e
|
Update directory structure & allow to configure paths (tmp, log, cache)
|
2014-09-05 15:57:00 +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
|
d44eea20a6
|
Merge pull request #1105 from nlegoff/crossdomain
[READY][3.8.6][PHRAS-25] Crossdomain command generator
|
2014-08-22 18:52:40 +02:00 |
|
Nicolas Le Goff
|
baf3172fab
|
Fix configuration template
|
2014-08-21 14:15:11 +02:00 |
|
Jean-Yves Gaulier
|
eddbc39a05
|
PHRAS-64 #time 1h
patch changed to structure
|
2014-08-20 16:09:22 +02:00 |
|
Nicolas Le Goff
|
bc88d0f474
|
Add crossdomain file generator command
|
2014-08-19 16:35:57 +02:00 |
|
Nicolas Le Goff
|
2899f152fb
|
Merge branch '3.8' into fix-latest-merge
Conflicts:
README.md
composer.json
composer.lock
config/configuration.sample.yml
lib/Alchemy/Phrasea/Application/Api.php
lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
lib/Alchemy/Phrasea/Controller/Api/Oauth2.php
lib/Alchemy/Phrasea/Controller/Prod/Basket.php
lib/Alchemy/Phrasea/Core/Event/Subscriber/ApiExceptionHandlerSubscriber.php
lib/Alchemy/Phrasea/Core/Provider/RegistrationServiceProvider.php
lib/Alchemy/Phrasea/Core/Version.php
lib/classes/API/V1/adapter.php
lib/classes/API/V1/result.php
lib/classes/module/console/schedulerStart.php
lib/classes/module/console/schedulerState.php
lib/classes/module/console/schedulerStop.php
lib/classes/module/console/taskrun.php
lib/classes/set/export.php
lib/conf.d/_GV_template.inc
lib/conf.d/configuration.yml
templates/web/admin/setup.html.twig
templates/web/admin/tasks/list.html.twig
templates/web/api/auth/end_user_authorization.html.twig
templates/web/prod/actions/Feedback/list.html.twig
templates/web/prod/actions/publish/publish.html.twig
templates/web/prod/upload/upload.html.twig
tests/classes/api/v1/api_v1_adapterTest.php
tests/classes/api/v1/api_v1_resultTest.php
|
2014-08-11 20:28:03 +02:00 |
|
Nicolas Le Goff
|
29972fc9d9
|
Allow possibility to disable user notification when publishing
|
2014-08-07 19:36:11 +02:00 |
|
Nicolas Le Goff
|
c752141ff2
|
Use configurtion file instead of GV
|
2014-07-28 11:59:21 +02:00 |
|
Nicolas Le Goff
|
76cb4fad28
|
PHRAS-198 #fix add possibility to disable taskmanager per instance
|
2014-07-25 18:40:00 +02:00 |
|
Nicolas Le Goff
|
66fa05f4ee
|
Fix CS
|
2014-07-17 15:17:04 +02:00 |
|
Nicolas Le Goff
|
caeb383661
|
PHRAS-47 #comment add option to force usage of authenticated push
|
2014-06-25 13:58:52 +02:00 |
|
Nicolas Le Goff
|
0d040519f3
|
Add third party application webhook event
|
2014-06-23 17:48:42 +02:00 |
|
Nicolas Le Goff
|
1250f8ab0b
|
Fix latest merge
|
2014-06-19 16:11:27 +02:00 |
|
Nicolas Le Goff
|
a8da584666
|
Merge branch '3.8'
Conflicts:
composer.json
composer.lock
config/configuration.sample.yml
lib/Alchemy/Phrasea/Application.php
lib/Alchemy/Phrasea/Application/Api.php
lib/Alchemy/Phrasea/Controller/Admin/Collection.php
lib/Alchemy/Phrasea/Controller/Admin/Users.php
lib/Alchemy/Phrasea/Controller/Prod/DoDownload.php
lib/Alchemy/Phrasea/Controller/Prod/Export.php
lib/Alchemy/Phrasea/Controller/Prod/Language.php
lib/Alchemy/Phrasea/Controller/Prod/Push.php
lib/Alchemy/Phrasea/Controller/Prod/Tooltip.php
lib/Alchemy/Phrasea/Controller/Report/Informations.php
lib/Alchemy/Phrasea/Controller/Report/Root.php
lib/Alchemy/Phrasea/Controller/Root/Developers.php
lib/Alchemy/Phrasea/Controller/Root/Login.php
lib/Alchemy/Phrasea/Controller/Root/Session.php
lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.php
lib/Alchemy/Phrasea/Controller/Utils/ConnectionTest.php
lib/Alchemy/Phrasea/Controller/Utils/PathFileTest.php
lib/Alchemy/Phrasea/Core/Version.php
lib/Alchemy/Phrasea/Form/Login/PhraseaAuthenticationForm.php
lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php
lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php
lib/classes/API/OAuth2/Application.php
lib/classes/API/V1/adapter.php
lib/classes/Feed/Adapter.php
lib/classes/Feed/Aggregate.php
lib/classes/Feed/Collection.php
lib/classes/Feed/Entry/Adapter.php
lib/classes/ZipArchiveImproved.php
lib/classes/caption/Field/Value.php
lib/classes/caption/record.php
lib/classes/eventsmanager/notify/feed.php
lib/classes/media/subdef.php
lib/classes/module/report/connexion.php
lib/classes/module/report/download.php
lib/classes/record/adapter.php
lib/classes/registry.php
lib/classes/set/export.php
lib/classes/setup.php
lib/classes/task/abstract.php
lib/classes/task/period/emptyColl.php
lib/classes/uuid.php
lib/conf.d/_GV_template.inc
lib/conf.d/bases_structure.xml
lib/conf.d/configuration.yml
lib/conf.d/minifyGroupsConfig.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/account/account.html.twig
templates/web/account/base.html.twig
templates/web/admin/databox/databox.html.twig
templates/web/admin/index.html.twig
templates/web/admin/setup.html.twig
templates/web/admin/tree.html.twig
templates/web/client/index.html.twig
templates/web/common/caption.html.twig
templates/web/common/caption_templates/answer.html.twig
templates/web/common/caption_templates/basket_element.html.twig
templates/web/common/caption_templates/internal_publi.html.twig
templates/web/common/caption_templates/lazaret.html.twig
templates/web/common/caption_templates/overview.html.twig
templates/web/common/caption_templates/preview.html.twig
templates/web/common/index_bootstrap.html.twig
templates/web/common/indexfloat.html.twig
templates/web/common/thumbnail.html.twig
templates/web/developers/application_form.html.twig
templates/web/lightbox/IE6/feed.html.twig
templates/web/lightbox/IE6/validate.html.twig
templates/web/lightbox/feed.html.twig
templates/web/lightbox/validate.html.twig
templates/web/prod/actions/Download/prepare.html.twig
templates/web/prod/actions/publish/publish.html.twig
templates/web/prod/index.html.twig
templates/web/prod/preview/caption.html.twig
templates/web/prod/results/answerlist.html.twig
templates/web/thesaurus/accept.html.twig
templates/web/thesaurus/export-text-dialog.html.twig
templates/web/thesaurus/export-text.html.twig
templates/web/thesaurus/export-topics-dialog.html.twig
templates/web/thesaurus/export-topics.html.twig
templates/web/thesaurus/index.html.twig
templates/web/thesaurus/link-field-step1.html.twig
templates/web/thesaurus/link-field-step2.html.twig
templates/web/thesaurus/link-field-step3.html.twig
templates/web/thesaurus/new-term.html.twig
templates/web/thesaurus/properties.html.twig
templates/web/thesaurus/search.html.twig
templates/web/thesaurus/thesaurus.html.twig
tests/Alchemy/Tests/Phrasea/Application/ApiJsonTest.php
tests/Alchemy/Tests/Phrasea/Application/ApiYamlTest.php
tests/Alchemy/Tests/Phrasea/Application/LightboxTest.php
tests/Alchemy/Tests/Phrasea/Application/OAuth2Test.php
tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php
tests/Alchemy/Tests/Phrasea/Authentication/PersistentCookie/ManagerTest.php
tests/Alchemy/Tests/Phrasea/Cache/RedisCacheTest.php
tests/Alchemy/Tests/Phrasea/Command/Compile/ConfigurationTest.php
tests/Alchemy/Tests/Phrasea/Controller/Admin/FieldsTest.php
tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php
tests/Alchemy/Tests/Phrasea/Controller/Admin/SubdefsTest.php
tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php
tests/Alchemy/Tests/Phrasea/Controller/Api/ApiJSONPTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/BasketTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/BridgeTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/EditTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/LanguageTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/MoveCollectionTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/PrinterTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/PushTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/RootTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/StoryTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/ToolsTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/TooltipTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/UploadTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/UsrListsTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/WorkZoneTest.php
tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php
tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php
tests/Alchemy/Tests/Phrasea/Controller/Utils/ConnectionTestTest.php
tests/Alchemy/Tests/Phrasea/Controller/Utils/PathFileTestTest.php
tests/Alchemy/Tests/Phrasea/Core/Provider/FTPServiceProviderTest.php
tests/Alchemy/Tests/Phrasea/Core/Provider/LocaleServiceProviderTest.php
tests/Alchemy/Tests/Phrasea/Core/Provider/PhraseanetServiceProviderTest.php
tests/Alchemy/Tests/Phrasea/Core/Provider/RegistrationServiceProviderTest.php
tests/Alchemy/Tests/Phrasea/Core/Provider/TaskManagerServiceProviderTest.php
tests/Alchemy/Tests/Phrasea/Http/XSendFile/NginxModeTest.php
tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfEditDateTest.php
tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfMimeTypeTest.php
tests/Alchemy/Tests/Phrasea/SearchEngine/SearchEngineAbstractTest.php
tests/classes/Feed/Feed_AggregateTest.php
tests/classes/PhraseanetPHPUnitAbstract.php
tests/db-ref.sqlite
|
2014-06-17 15:30:41 +02:00 |
|
Nicolas Le Goff
|
e5b8817c46
|
PHP CS fix
|
2014-05-30 15:22:00 +02:00 |
|
Nicolas Le Goff
|
534f69b655
|
Fix missing configuration keys
|
2014-05-28 13:09:14 +02:00 |
|
Jean-Yves Gaulier
|
192c2fbb55
|
PHRAS-46 #fix
PHRAS-16 #time 40h
|
2014-05-23 14:43:46 +02:00 |
|
Nicolas Le Goff
|
dc71055e3b
|
Fix PHRAS-79 Add lastname field as default field for registration process
|
2014-05-22 15:02:43 +02:00 |
|
Nicolas Le Goff
|
9c84ab5de4
|
Merge pull request #1074 from nlegoff/phras-47-push
[3.8] Adds options to force authentication to see push content
|
2014-05-06 17:25:27 +02:00 |
|
Nicolas Le Goff
|
45ec715eea
|
Fix phras-47 Force authentication to see push content
|
2014-05-06 15:20:05 +02:00 |
|
Nicolas Le Goff
|
bcc9745588
|
Add api_webhooks table
|
2014-05-06 10:53:29 +02:00 |
|
Nicolas Le Goff
|
2ff698642b
|
Add new webhook column in api_aplications table
|
2014-05-06 10:53:29 +02:00 |
|
Nicolas Le Goff
|
759a205025
|
Fix phras-46 display passwords fields as 'password' input
|
2014-04-23 16:49:37 +02:00 |
|
Nicolas Le Goff
|
7835451650
|
Merge pull request #1049 from nlegoff/api-cors
[3.8][PHRAS-58] Add CORS feature
|
2014-04-14 11:01:21 +02:00 |
|
Nicolas Le Goff
|
d2dc99baf8
|
PHRAS-58 Add CORS feature
|
2014-04-13 19:31:13 +02:00 |
|
Nicolas Le Goff
|
445ac04b69
|
PHRAS-68 Context menu is disable for menu bar in account template
|
2014-04-10 19:03:53 +02:00 |
|
Nicolas Le Goff
|
6c087f5a40
|
Remove api 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
|
26f8e18f61
|
Remove undeclared migration
|
2014-03-16 01:00:27 +01:00 |
|
Nicolas Le Goff
|
003396aa71
|
Register migrations
|
2014-03-14 11:37:11 +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 |
|
Nicolas Le Goff
|
f72d102ace
|
Revert fetching tooltip dependency with bower
|
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
|
0a2d4fe04d
|
Bind task manager backbone app to websocket using autobahn
|
2014-03-05 15:33:21 +01:00 |
|
Romain Neutron
|
8b6cb53a36
|
Add token entities
|
2014-03-05 15:27:43 +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 |
|
Romain Neutron
|
a3b941c3ec
|
Add H264 pseudo streaming tools
|
2014-02-28 20:18:40 +01:00 |
|
Romain Neutron
|
08efd8ff72
|
Cleanup API
|
2014-02-28 00:38:12 +01:00 |
|
Romain Neutron
|
2f99d9bca9
|
Remove unused tables
|
2014-02-27 16:59:28 +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
|
ce94b80d58
|
Merge branch '3.8'
Conflicts:
lib/conf.d/minifyGroupsConfig.php
templates/web/overview.html.twig
|
2014-02-26 13:17:30 +01:00 |
|
Romain Neutron
|
a0fc4b2360
|
Fix CS
|
2014-02-26 12:44:32 +01:00 |
|
Romain Neutron
|
dd29540578
|
Update flowplayer version
|
2014-02-26 12:22:36 +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 |
|