Nicolas Le Goff
|
de7988689e
|
Update directory structure & allow to configure paths (tmp, log, cache)
|
2014-09-05 15:57:00 +02:00 |
|
Mathieu Darse
|
7db59052d6
|
[TEMP] Remove broken WSConnection
|
2014-08-26 16:44:37 +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 |
|
Mathieu Darse
|
1fbddfec3e
|
PoC query parser
With Jison PHP port
|
2014-08-25 10:25:37 +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
|
e0c749d69a
|
Merge pull request #1098 from nlegoff/some-385
[3.8.6] Fix some minor bugs
|
2014-07-25 18:11:13 +02:00 |
|
Nicolas Le Goff
|
c9adc6fd08
|
PHRAS-202 #fix deletion of diffusion list in IE
|
2014-07-23 19:42:11 +02:00 |
|
Nicolas Le Goff
|
12ae2c8245
|
PHRAS-187 #fix push name validation
|
2014-07-23 19:21:13 +02:00 |
|
Nicolas Le Goff
|
c8c10f2776
|
PHRAS-205 #fix validation reorder
|
2014-07-23 19:02:42 +02:00 |
|
Nicolas Le Goff
|
3565d1c795
|
Merge branch '3.8' into fix-latest-merge
Conflicts:
CHANGELOG.md
bower.json
composer.json
composer.lock
lib/Alchemy/Phrasea/Controller/Api/V1.php
lib/Alchemy/Phrasea/Controller/Prod/Push.php
lib/Alchemy/Phrasea/Controller/Prod/Records.php
lib/Alchemy/Phrasea/Core/Version.php
lib/Alchemy/Phrasea/Media/Subdef/Image.php
lib/conf.d/_GV_template.inc
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
templates/web/prod/Story/Reorder.html.twig
templates/web/prod/WorkZone/Macros.html.twig
templates/web/prod/actions/Download/prepare.html.twig
templates/web/prod/templates/push.html.twig
|
2014-07-11 17:19:39 +02:00 |
|
Nicolas Le Goff
|
9042fdee98
|
PHRAS-183 #fix report
|
2014-07-07 14:52:09 +02:00 |
|
Nicolas Le Goff
|
067e41ade4
|
Fix tooltip position
|
2014-06-25 18:33:34 +02:00 |
|
Nicolas Le Goff
|
0851381378
|
Merge pull request #1115 from nlegoff/fix-tooltip-position
[3.8.4] Fix tooltip image resize factor
|
2014-06-25 16:30:58 +02:00 |
|
Nicolas Le Goff
|
8cd2fb7a5c
|
Fix tooltip image resize factor
|
2014-06-25 16:22:51 +02:00 |
|
Nicolas Le Goff
|
3c66d62764
|
PHRAS-175 #fix overlay position
|
2014-06-25 13:49:02 +02:00 |
|
Nicolas Le Goff
|
5e2dd0216a
|
Fix latest merge
|
2014-06-24 14:56:09 +02:00 |
|
Nicolas Le Goff
|
4b033353bf
|
Fix JS tests
|
2014-06-24 01:32:25 +02:00 |
|
Nicolas Le Goff
|
3bdb63f94e
|
Fix latest merge
|
2014-06-24 00:34:07 +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
|
b92370cca2
|
Merge pull request #1021 from nlegoff/api-doctrine
[READY][3.9] Transform api_* tables to doctrine entities
|
2014-06-13 14:13:23 +02:00 |
|
Nicolas Le Goff
|
274192ae71
|
Fix PHRAS-128 register fields mapping issue
|
2014-05-30 11:21:53 +02:00 |
|
Nicolas Le Goff
|
5721aae8c8
|
Fix PHRAS-134 Reportage is selected as wall in edit mode
|
2014-05-30 11:21:18 +02:00 |
|
Nicolas Le Goff
|
e269f64b23
|
Fix dashboard javascript & title issue
|
2014-05-28 15:48:34 +02:00 |
|
Jean-Yves Gaulier
|
3434e4cab2
|
added patch, redirect parm, translations
|
2014-05-23 14:43:46 +02:00 |
|
Jean-Yves Gaulier
|
192c2fbb55
|
PHRAS-46 #fix
PHRAS-16 #time 40h
|
2014-05-23 14:43:46 +02:00 |
|
Nicolas Le Goff
|
daa4de93cc
|
Merge pull request #1086 from nlegoff/fix-phras-132
[3.8] [PHRAS-132] Set adavanced search dialog box to full size
|
2014-05-22 19:20:55 +02:00 |
|
Nicolas Le Goff
|
388cda9c60
|
Fix PHRAS-132 Set adavanced search dialog box to full size
|
2014-05-22 16:14:40 +02:00 |
|
Nicolas Le Goff
|
ab5f7d4492
|
Fix PHRAS-123 Fix tooltip content display
|
2014-05-22 14:48:58 +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
|
4f806ab3f7
|
Fix hidding of callback field when clicking desktop type application
|
2014-05-06 10:53:29 +02:00 |
|
Nicolas Le Goff
|
f6eb665c6a
|
Add possibility to modify webhook url in template
|
2014-05-06 10:53:29 +02:00 |
|
Nicolas Le Goff
|
9f50226301
|
Merge pull request #1066 from nlegoff/phras-49
[3.8] phras-49 Add information for user list popup when push records
|
2014-04-23 14:47:37 +02:00 |
|
Nicolas Le Goff
|
9a3561a890
|
Fix phras-49 Add information for user list popup when push records
|
2014-04-22 19:20:48 +02:00 |
|
Nicolas Le Goff
|
d3c7b376e3
|
Fix [PHRAS-72] lazy loading images
|
2014-04-15 18:15:38 +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
|
e97ed2b3f1
|
Merge branch '3.8'
Conflicts:
composer.json
composer.lock
lib/Alchemy/Phrasea/Application.php
lib/Alchemy/Phrasea/Controller/Admin/Publications.php
lib/Alchemy/Phrasea/Controller/Admin/Users.php
lib/Alchemy/Phrasea/Controller/Client/Root.php
lib/Alchemy/Phrasea/Controller/Prod/Feed.php
lib/Alchemy/Phrasea/Controller/Prod/Root.php
lib/Alchemy/Phrasea/Controller/Report/Activity.php
lib/Alchemy/Phrasea/Controller/Report/Export.php
lib/Alchemy/Phrasea/Controller/Report/Informations.php
lib/Alchemy/Phrasea/Controller/Report/Root.php
lib/classes/API/V1/adapter.php
lib/classes/Feed/Aggregate.php
lib/classes/Feed/Collection.php
lib/classes/format.php
tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php
tests/Alchemy/Tests/Phrasea/Controller/Report/ExportTest.php
tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php
tests/classes/Feed/Feed_CollectionTest.php
tests/classes/api/v1/api_v1_adapterTest.php
|
2014-03-30 09:00:17 +02:00 |
|
Nicolas Le Goff
|
bdde87718c
|
Fix authorize oauth2 application
|
2014-03-24 12:29:39 +01:00 |
|
Nicolas Le Goff
|
617c59a4ba
|
Fix CSV report generation mess
|
2014-03-23 22:46:20 +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
|
266592213b
|
Report dashboard is now loaded on demand
|
2014-03-18 16:59:03 +01:00 |
|
Nicolas Le Goff
|
777315aa0f
|
Fix account less path compilation
|
2014-03-13 17:37:23 +01:00 |
|
Nicolas Le Goff
|
4af7dbddb1
|
Transform thesaurus preset into doctrine Entity
|
2014-03-06 01:31:43 +01:00 |
|
Nicolas Le Goff
|
f72d102ace
|
Revert fetching tooltip dependency with bower
|
2014-03-05 15:33:23 +01:00 |
|
Nicolas Le Goff
|
10421b3819
|
Refactor mocha tests kickstarter
|
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
|
2e40205bc3
|
Remove deletion of target for tree links
|
2014-03-05 15:33:23 +01:00 |
|
Nicolas Le Goff
|
218da9a091
|
Add tests
|
2014-03-05 15:33:23 +01:00 |
|