Nicolas Le Goff
|
589169299c
|
Fix merge 3.8
|
2014-12-09 14:01:00 +01:00 |
|
Nicolas Le Goff
|
9f38823f27
|
Merge branch '3.8'
Conflicts:
composer.lock
lib/Alchemy/Phrasea/Application.php
lib/Alchemy/Phrasea/Command/Setup/H264MappingGenerator.php
lib/Alchemy/Phrasea/Controller/AbstractDelivery.php
lib/Alchemy/Phrasea/Controller/Prod/DoDownload.php
lib/Alchemy/Phrasea/Controller/Prod/Edit.php
lib/Alchemy/Phrasea/Controller/Prod/Story.php
lib/Alchemy/Phrasea/Controller/Prod/Upload.php
lib/Alchemy/Phrasea/Controller/Report/Activity.php
lib/Alchemy/Phrasea/Controller/Report/Root.php
lib/Alchemy/Phrasea/Controller/Root/Account.php
lib/Alchemy/Phrasea/Core/PhraseaEvents.php
lib/Alchemy/Phrasea/Core/Version.php
lib/classes/API/V1/adapter.php
lib/classes/User/Adapter.php
lib/classes/databox.php
lib/classes/media/subdef.php
lib/classes/module/report.php
lib/classes/module/report/activity.php
lib/classes/module/report/connexion.php
lib/classes/module/report/download.php
lib/classes/module/report/nav.php
lib/classes/module/report/question.php
lib/classes/module/report/sqlaction.php
lib/classes/module/report/sqlconnexion.php
lib/classes/module/report/sqldownload.php
lib/classes/module/report/sqlfilter.php
lib/classes/task/abstract.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/prod/index.html.twig
tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php
tests/classes/api/v1/api_v1_adapterTest.php
tests/classes/report/activityTest.php
tests/classes/report/editTest.php
|
2014-12-09 13:59:29 +01:00 |
|
Nicolas Le Goff
|
d65e81ebf2
|
PHRAS-334 #fix connected users module display
|
2014-11-12 19:04:21 +01: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 |
|
Jean-Yves Gaulier
|
4441eae4a5
|
PHRAS-64 #time 1h
fix "subdefs to be done" in admin/base
|
2014-09-09 11:23:23 +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 |
|
Jean-Yves Gaulier
|
33b8451978
|
PHRAS-64 #time 1,5j
delete progress bars for tasks / add subdefs stats for base
|
2014-08-20 14:06:18 +02:00 |
|
Nicolas Le Goff
|
4fa1f613e4
|
Fix latest merge
|
2014-08-13 17:40:40 +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
|
a0d0b8f03c
|
Merge pull request #1124 from nlegoff/fix-198
[3.8.6][PHRAS-198] add possibility to disable taskmanager per instance
|
2014-07-28 15:22:39 +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
|
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
|
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
|
291512ff34
|
Fix empty of collection
|
2014-06-06 16:42:24 +02:00 |
|
Nicolas Le Goff
|
94fc8c4c03
|
Fix PHRAS-130 autofill admin password in setup panel
|
2014-05-30 11:21:47 +02:00 |
|
Nicolas Le Goff
|
76a80439e3
|
Fix unmount database button js issue
|
2014-05-28 15:47:22 +02:00 |
|
Nicolas Le Goff
|
83e63e731a
|
Fix tests
|
2014-05-23 14:43:47 +02:00 |
|
Jean-Yves Gaulier
|
192c2fbb55
|
PHRAS-46 #fix
PHRAS-16 #time 40h
|
2014-05-23 14:43:46 +02:00 |
|
Nicolas Le Goff
|
df85fcf2a9
|
Fix PHRAS-125 User right issue
|
2014-05-22 18:49:23 +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
|
96f77f99cd
|
Fix PHRAS-22 Force latest IE rendering engine
|
2014-04-10 18:15:08 +02: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 |
|
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
|
218da9a091
|
Add tests
|
2014-03-05 15:33:23 +01:00 |
|
Nicolas Le Goff
|
4f66003425
|
Fix url path
|
2014-03-05 15:33:23 +01:00 |
|
Nicolas Le Goff
|
b354b063ee
|
Remove hard code url
|
2014-03-05 15:33:23 +01:00 |
|
Nicolas Le Goff
|
0299250097
|
Refactor require.js config
|
2014-03-05 15:33:22 +01:00 |
|
Nicolas Le Goff
|
79b4c93de5
|
One lined assets declaration
|
2014-03-05 15:33:22 +01:00 |
|
Nicolas Le Goff
|
1b0aac5963
|
Bind subscriberManager object to task manager application
|
2014-03-05 15:33:22 +01:00 |
|
Nicolas Le Goff
|
93e17c2752
|
Refactor admin javascript to backbone application
|
2014-03-05 15:33:21 +01:00 |
|
Nicolas Le Goff
|
133e5f3d19
|
Add application to admin
|
2014-03-05 15:33:21 +01:00 |
|
Nicolas Le Goff
|
3a5e309dee
|
Rename task option from configuration to status
|
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
|
9536aacab7
|
Fix users modelOf and lastModel wording
|
2014-02-28 03:03:53 +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 |
|
Nicolas Le Goff
|
4946e35516
|
Fix tests, CS && typo
|
2014-02-26 12:06:34 +01:00 |
|
Nicolas Le Goff
|
52f3baac05
|
Fix neutron's comment
|
2014-02-26 12:06:34 +01:00 |
|
Nicolas Le Goff
|
75fac19e73
|
Migrate demand table to doctrine entity && refactor registration API
|
2014-02-26 12:06:34 +01:00 |
|
Romain Neutron
|
50aa029fc7
|
Merge branch '3.8'
|
2014-02-24 12:27:49 +01:00 |
|
Nicolas Le Goff
|
8eb46eacec
|
Fix missing trans filter
|
2014-02-21 18:51:32 +01:00 |
|
Nicolas Le Goff
|
eaa1feb765
|
Address PR comments
|
2014-02-19 17:29:27 +01:00 |
|
Nicolas Le Goff
|
ab9362dd60
|
Fix neutron comment's
|
2014-02-19 17:29:27 +01:00 |
|
Nicolas Le Goff
|
7c0d1e3d8d
|
Fix user migration
|
2014-02-19 17:29:26 +01:00 |
|
Nicolas Le Goff
|
b341495c88
|
Fix tests
|
2014-02-19 17:29:26 +01:00 |
|