hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-13 13:03:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,662 Commits 268 Branches 107 Tags
27433c769fbb5281b17247da99d8ac01c68ffa93
Commit Graph

115 Commits

Author SHA1 Message Date
aynsix
0acb987287 merge master in branch 2021-02-19 09:39:46 +03:00
aynsix
2f6bf46266 PHRAS-3375 port download validity link 2021-02-18 17:59:00 +03:00
aina esokia
7041a11873 PHRAS-2283 port to 4.1 access autorisation windows 2021-02-11 16:48:49 +03:00
aina esokia
427216ec43 PHRAS-3277 validation reminder in percent 2020-12-02 17:31:05 +03:00
aina esokia
9a1f0e4ada change scheme https to http 2020-09-29 10:50:01 +03:00
aynsix
71cc21bb43 custom link section 2020-05-27 11:27:18 +03:00
Harrys Ravalomanana
fdfb4122d5 PHRAS-3073 #comment add basket preference + display doc type #comment 3h 2020-05-20 19:20:59 +04:00
Harrys Ravalomanana
49ce33ceef PHRAS-2997 Rename properties 2020-03-24 18:25:31 +04:00
Harrys Ravalomanana
8e03128544 PHRAS-2997 2020-03-24 17:59:34 +04:00
Harrys Ravalomanana
c9871eb570 PHRAS-2945 #comment Prod-editing : Fix default height/min-height for editing_top_box #time 2h 2020-02-25 14:38:45 +04:00
Harrys Ravalomanana
b232806b8b PHRAS-2933 2020-02-19 18:38:52 +04:00
Xavier Rousset
80b4c9a6a6 PHRAS-2127 | Add https in default geoname server url, remove url formatter in register controller 2019-08-14 15:49:25 +02:00
Jean-Yves Gaulier
3b120fb020 PHRAS-2573_last-query-as-default_4.1 
- set default default user settings to "replay last_query on login"
- set a default (empty) query for first login
 2019-06-04 12:07:32 +02:00
Xavier Rousset
a8ebe5fc43 Update access page design 2018-10-19 19:10:39 +02:00
aina-esokia
89b9ea0b2a change default mod 2018-09-04 17:21:03 +04:00
aina-esokia
288cdbd3e2 update Configuration.php 2018-09-03 15:03:47 +04:00
aina-esokia
354c918a90 admin/setup: change file content instead of recreate config file 2018-09-03 14:58:05 +04:00
aina-esokia
e836c99b54 add checkbox authorize adobecc plugin in admin / setup 2018-07-13 12:06:59 +04:00
Mike Ng
93cc71ffce sort facets value alphabetically or by hits 2018-03-07 11:24:24 +04:00
Nicolas Maillat
1f78adf645 Merge pull request #2500 from aynsix/PHRAS-1832-port-1776-to-master 
PHRAS-1832 port 1776 to master - databox create
 2018-03-06 15:11:20 +01:00
Mike Ng
a517b1d6a3 sort facets via preferences 2018-03-06 13:59:53 +04:00
aina-esokia
9226e5a478 port 1776 databox create to master 2018-03-01 17:41:08 +04:00
Mike Ng
169b4026eb PORT PHRAS-1862 to 4.1 2018-02-28 13:42:43 +04:00
Mike Ng
2644962783 Merge branch 'PHRAS-1734_PORT_PHRAS-1589' into PHRAS-1744_PORT_PHRAS-1578_1579_1621_1675_1404_1336 2018-01-09 11:01:01 +04:00
Mike Ng
4c11cfebd8 Merge remote-tracking branch 'alchemy/master' into PHRAS-1734_PORT_PHRAS-1589 2018-01-09 09:50:57 +04:00
Mike Ng
a08a55b58e Merge branch 'PHRAS-1745_PORT_custom_links' into PHRAS-1735_add_git_log 
# Conflicts:
#	.bowerrc
 2018-01-08 16:37:46 +04:00
Mike Ng
30f49bdd35 resolve conflict 2018-01-08 15:57:13 +04:00
Mike Ng
bddc3781ba resolve conflict 2018-01-08 15:54:47 +04:00
Nicolas Maillat
c2603da5ad Merge pull request #2373 from falylala/PHRAS-1717-PORT_Install_show_available_documentary 
PHRAS-1717- PORT_1296_Show all available structure for install CLI/Graphic mode
 2018-01-08 12:33:19 +01:00
Mike Ng
e9e9a737c3 PORT PHRAS-1559 and PHRAS-1560 to 4.1 2017-12-13 10:26:24 +04:00
Mike Ng
e0063d00c0 Porting custom-links to 4.1 2017-12-11 17:44:55 +04:00
falylala
ea53da9086 Show all available structure for install CLI/Graphic mode 2017-11-20 12:16:54 +04:00
Thibaud Fabre
c39f4117bd PHRAS-1289 Add group rights to compiled configuration 2016-12-06 15:01:12 +01:00
Thibaud Fabre
88a2813843 Refactor setup controller and registry manipulator 2016-11-25 14:03:01 +01:00
Thibaud Fabre
0c8f507abe PHRAS-1236 Add native session handler config option 
Allows use of custom session handlers via php.ini
 2016-10-13 14:29:23 +02:00
Thibaud Fabre
f62c22bc5c Move setting to registry and form type 2016-09-28 20:58:26 +02:00
Benoît Burnichon
1e18b3e69f This is a combination of 33 commits. 
- Squashed Pull request #1730
- Squashed Pull request #1741
- Squashed Pull request #1742
- Squash merge branch 4.0
- Squashed Pull request #1744
- Squashed Pull request #1746
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed Pull request #1758
- Avoid using imagine/imagine alias as it is causing install issues
- Squashed merge branch 4.0
- Squashed Pull request #1763
- Squashed merge branch 4.0
- Squash of 6 commits
- Squashed merge branch 4.0
- This is a combination of 2 commits.
- Squashed Pull request #1775
- Squashed Pull request #1777
- Squashed Pull request #1779
- Squashed Pull request #1780
- Squashed Pull request #1782
- Adds a Pull request template
- Squased Pull request #1783
- Squash Pull request #1786
- Squashed Pull request #1796
- Squashed merge branch 4.0
- Squash Pull request #1791
- Squashed merge branch 4.0
- Squashed Pull request #1808
- Squashed Pull request #1811
- Squashed Pull request #1809
 2016-04-20 16:22:14 +02:00
Benoît Burnichon
beda5d3820 Getting collection calls access_restriction which is not properly cached. 
Remove use of cache in AccessRestriction and use instance memory cache instead.
Beware static keyword declares variable static for the class, not the instance
 2016-01-27 18:55:49 +01:00
Benoît Burnichon
d481d5066a Try clear 'last' query. 
PHRAS-895
 2016-01-07 18:03:17 +01:00
Benoît Burnichon
51023c5533 bump copyright year 2016-01-05 13:38:14 +01:00
Benoît Burnichon
837213cfd0 Clear default Query 
PHRAS-832
 2015-12-02 20:37:22 +01:00
Benoît Burnichon
fb725b3475 Remove Classic Section in MainConfigurationFormType 2015-12-02 19:03:31 +01:00
Benoît Burnichon
a22ef5fa27 Rename AccessRestriction::filterAvailableDataboxes 2015-07-03 18:20:09 +02:00
Benoît Burnichon
00f5f3369e Add DataboxRepository 2015-07-03 18:20:09 +02:00
Benoît Burnichon
2a3e31ffa6 Add default-subdef-url-ttl value 2015-05-20 16:50:08 +02:00
Nicolas Le Goff
949bf06cac Merge branch '3.8' 
Conflicts:
	CHANGELOG.md
	bin/console
	bin/developer
	bin/setup
	bower.json
	composer.json
	composer.lock
	features/bootstrap/FeatureContext.php
	features/bootstrap/GuiContext.php
	lib/Alchemy/Phrasea/Authentication/Token/TokenValidator.php
	lib/Alchemy/Phrasea/Command/BuildMissingSubdefs.php
	lib/Alchemy/Phrasea/Command/CreateCollection.php
	lib/Alchemy/Phrasea/Command/Developer/JavascriptBuilder.php
	lib/Alchemy/Phrasea/Controller/Admin/Collection.php
	lib/Alchemy/Phrasea/Controller/Admin/Databoxes.php
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Controller/Client/Baskets.php
	lib/Alchemy/Phrasea/Controller/Client/Root.php
	lib/Alchemy/Phrasea/Controller/Prod/Basket.php
	lib/Alchemy/Phrasea/Controller/Prod/Export.php
	lib/Alchemy/Phrasea/Controller/Prod/Property.php
	lib/Alchemy/Phrasea/Controller/Prod/Records.php
	lib/Alchemy/Phrasea/Controller/Prod/Tools.php
	lib/Alchemy/Phrasea/Controller/Prod/Upload.php
	lib/Alchemy/Phrasea/Controller/Root/Login.php
	lib/Alchemy/Phrasea/Controller/Thesaurus/Thesaurus.php
	lib/Alchemy/Phrasea/Core/Event/ApiLoadEndEvent.php
	lib/Alchemy/Phrasea/Core/Event/ApiLoadStartEvent.php
	lib/Alchemy/Phrasea/Core/Provider/TaskManagerServiceProvider.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/Alchemy/Phrasea/Exception/XMLParseErrorException.php
	lib/Alchemy/Phrasea/Helper/DatabaseHelper.php
	lib/Alchemy/Phrasea/Helper/User/Edit.php
	lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php
	lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php
	lib/Doctrine/Entities/AuthFailure.php
	lib/Doctrine/Entities/Basket.php
	lib/Doctrine/Entities/BasketElement.php
	lib/Doctrine/Entities/LazaretAttribute.php
	lib/Doctrine/Entities/LazaretCheck.php
	lib/Doctrine/Entities/LazaretFile.php
	lib/Doctrine/Entities/LazaretSession.php
	lib/Doctrine/Entities/Session.php
	lib/Doctrine/Entities/SessionModule.php
	lib/Doctrine/Entities/StoryWZ.php
	lib/Doctrine/Entities/UsrList.php
	lib/Doctrine/Entities/UsrListEntry.php
	lib/Doctrine/Entities/UsrListOwner.php
	lib/Doctrine/Entities/ValidationData.php
	lib/Doctrine/Entities/ValidationParticipant.php
	lib/Doctrine/Entities/ValidationSession.php
	lib/Doctrine/Logger/MonologSQLLogger.php
	lib/Doctrine/Repositories/BasketRepository.php
	lib/Doctrine/Repositories/ValidationParticipantRepository.php
	lib/Doctrine/Types/Binary.php
	lib/Doctrine/Types/Blob.php
	lib/Doctrine/Types/Enum.php
	lib/Doctrine/Types/LongBlob.php
	lib/Doctrine/Types/VarBinary.php
	lib/classes/API/OAuth2/Account.php
	lib/classes/API/OAuth2/Application.php
	lib/classes/API/OAuth2/Application/OfficePlugin.php
	lib/classes/API/OAuth2/AuthCode.php
	lib/classes/API/OAuth2/RefreshToken.php
	lib/classes/API/OAuth2/Token.php
	lib/classes/API/V1/Abstract.php
	lib/classes/API/V1/Interface.php
	lib/classes/API/V1/adapter.php
	lib/classes/API/V1/exception/abstract.php
	lib/classes/API/V1/exception/badrequest.php
	lib/classes/API/V1/exception/forbidden.php
	lib/classes/API/V1/exception/internalservererror.php
	lib/classes/API/V1/exception/maintenance.php
	lib/classes/API/V1/exception/methodnotallowed.php
	lib/classes/API/V1/exception/notfound.php
	lib/classes/API/V1/exception/unauthorized.php
	lib/classes/API/V1/result.php
	lib/classes/Exception/Feed/EntryNotFound.php
	lib/classes/Exception/Feed/ItemNotFound.php
	lib/classes/Exception/Feed/PublisherNotFound.php
	lib/classes/Feed/Abstract.php
	lib/classes/Feed/Adapter.php
	lib/classes/Feed/Aggregate.php
	lib/classes/Feed/Collection.php
	lib/classes/Feed/CollectionInterface.php
	lib/classes/Feed/Entry/Adapter.php
	lib/classes/Feed/Entry/Collection.php
	lib/classes/Feed/Entry/CollectionInterface.php
	lib/classes/Feed/Entry/Interface.php
	lib/classes/Feed/Entry/Item.php
	lib/classes/Feed/Entry/ItemInterface.php
	lib/classes/Feed/Interface.php
	lib/classes/Feed/Link.php
	lib/classes/Feed/LinkInterface.php
	lib/classes/Feed/Publisher/Adapter.php
	lib/classes/Feed/Publisher/Interface.php
	lib/classes/Feed/Token.php
	lib/classes/Feed/TokenAggregate.php
	lib/classes/Feed/XML/Abstract.php
	lib/classes/Feed/XML/Atom.php
	lib/classes/Feed/XML/Cooliris.php
	lib/classes/Feed/XML/Interface.php
	lib/classes/Feed/XML/RSS.php
	lib/classes/Feed/XML/RSS/Image.php
	lib/classes/Feed/XML/RSS/ImageInterface.php
	lib/classes/User/Adapter.php
	lib/classes/User/Interface.php
	lib/classes/appbox/register.php
	lib/classes/connection.php
	lib/classes/connection/abstract.php
	lib/classes/connection/interface.php
	lib/classes/connection/pdo.php
	lib/classes/connection/pdoStatementDebugger.php
	lib/classes/deprecated/countries.php
	lib/classes/deprecated/inscript.api.php
	lib/classes/eventsmanager/event/test.php
	lib/classes/ftpclient.php
	lib/classes/http/request.php
	lib/classes/media/subdef.php
	lib/classes/module/console/schedulerStart.php
	lib/classes/module/console/schedulerState.php
	lib/classes/module/console/schedulerStop.php
	lib/classes/module/console/taskState.php
	lib/classes/module/console/tasklist.php
	lib/classes/module/console/taskrun.php
	lib/classes/patch/320alpha4b.php
	lib/classes/patch/3715alpha1a.php
	lib/classes/patch/379alpha1a.php
	lib/classes/patch/380alpha10a.php
	lib/classes/patch/380alpha11a.php
	lib/classes/patch/380alpha13a.php
	lib/classes/patch/380alpha14a.php
	lib/classes/patch/380alpha15a.php
	lib/classes/patch/380alpha16a.php
	lib/classes/patch/380alpha17a.php
	lib/classes/patch/380alpha18a.php
	lib/classes/patch/380alpha3a.php
	lib/classes/patch/380alpha4a.php
	lib/classes/patch/380alpha6a.php
	lib/classes/patch/380alpha8a.php
	lib/classes/patch/380alpha9a.php
	lib/classes/patch/381alpha1b.php
	lib/classes/patch/381alpha2a.php
	lib/classes/patch/381alpha3a.php
	lib/classes/patch/381alpha4a.php
	lib/classes/patch/383alpha1a.php
	lib/classes/patch/383alpha2a.php
	lib/classes/patch/383alpha3a.php
	lib/classes/patch/383alpha4a.php
	lib/classes/record/adapter.php
	lib/classes/record/preview.php
	lib/classes/recordutils.php
	lib/classes/recordutils/audio.php
	lib/classes/recordutils/document.php
	lib/classes/recordutils/map.php
	lib/classes/recordutils/video.php
	lib/classes/registry.php
	lib/classes/registryInterface.php
	lib/classes/set/order.php
	lib/classes/system/url.php
	lib/classes/task/Scheduler.php
	lib/classes/task/appboxAbstract.php
	lib/classes/task/databoxAbstract.php
	lib/classes/task/manager.php
	lib/classes/task/period/RecordMover.php
	lib/classes/task/period/apibridge.php
	lib/classes/task/period/apiwebhooks.php
	lib/classes/task/period/archive.php
	lib/classes/task/period/cindexer.php
	lib/classes/task/period/emptyColl.php
	lib/classes/task/period/ftp.php
	lib/classes/task/period/ftpPull.php
	lib/classes/task/period/subdef.php
	lib/classes/task/period/test.php
	lib/classes/task/period/writemeta.php
	lib/conf.d/PhraseaFixture/AbstractWZ.php
	lib/conf.d/PhraseaFixture/Basket/LoadFiveBaskets.php
	lib/conf.d/PhraseaFixture/Basket/LoadOneBasket.php
	lib/conf.d/PhraseaFixture/Basket/LoadOneBasketEnv.php
	lib/conf.d/PhraseaFixture/Lazaret/LoadOneFile.php
	lib/conf.d/PhraseaFixture/Story/LoadOneStory.php
	lib/conf.d/PhraseaFixture/UsrLists/ListAbstract.php
	lib/conf.d/PhraseaFixture/UsrLists/UsrList.php
	lib/conf.d/PhraseaFixture/UsrLists/UsrListEntry.php
	lib/conf.d/PhraseaFixture/UsrLists/UsrListOwner.php
	lib/conf.d/PhraseaFixture/ValidationParticipant/LoadOneParticipant.php
	lib/conf.d/PhraseaFixture/ValidationParticipant/LoadParticipantWithSession.php
	lib/conf.d/PhraseaFixture/ValidationSession/LoadOneValidationSession.php
	templates/web/admin/collection/collection.html.twig
	templates/web/common/dialog_export.html.twig
	templates/web/common/menubar.html.twig
	templates/web/prod/actions/Tools/index.html.twig
	templates/web/prod/index.html.twig
	templates/web/prod/upload/upload-flash.html.twig
	templates/web/prod/upload/upload.html.twig
	templates/web/report/report_layout_child.html.twig
	templates/web/setup/step2.html.twig
	templates/web/thesaurus/new-synonym-dialog.html.twig
	templates/web/thesaurus/properties.html.twig
	templates/web/thesaurus/search.html.twig
	tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php
	tests/Alchemy/Tests/Phrasea/Cache/FactoryTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Admin/AdminCollectionTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Client/RootTest.php
 2015-02-05 18:38:49 +01:00
Nicolas Le Goff
d82adbf109 Bump year to 2015 2015-01-20 14:08:25 +01: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
4fa1f613e4 Fix latest merge 2014-08-13 17:40:40 +02:00
Nicolas Le Goff
fcdc10c554 Fix latest merge 2014-07-17 15:11:26 +02:00