hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,277 Commits 268 Branches 107 Tags
054a23734b903da9c4ea82bc843e410ceccfa029
Commit Graph

86 Commits

Author SHA1 Message Date
Mike Ng
5fbe76e6e4 refactor dialog of add user template 2018-06-01 13:22:54 +04:00
Mike Ng
431d9dc46a migrating dependencies from bower to npm 2018-01-16 09:42:29 +04:00
Mike Ng
e0063d00c0 Porting custom-links to 4.1 2017-12-11 17:44:55 +04:00
Florian BLOUET
527cb2708a Bump phraseanet-production-client 
fix jquery ui dependency,
fix ftp export,
fix thesaurus search actions,
misc fixes
 2016-03-24 11:57:24 +01:00
Florian BLOUET
52b06b208e css cleanup: main menu, misc - admin: fixes js issues 2015-12-02 17:35:40 +01:00
Florian BLOUET
1010f1820c fix admin tinymce init, misc admin fixes 2015-12-02 17:35:40 +01:00
Florian BLOUET
0e97e4a0ae moved skins/icon to assets/common/images/icons 2015-12-02 17:35:37 +01:00
Florian BLOUET
d729ac441b refactor build as components, wip: gathering js, css, images, ... 2015-12-02 17:35:36 +01:00
Florian BLOUET
285edaf504 wip - refactoring frontend dependency and build tools - removed deprecated features (client interface) 2015-12-02 17:35:36 +01:00
Benoît Burnichon
4880f2bf5a Add getAuthenticator usage 
Replace $app['authentication']->getUser() by $app->getAuthenticatedUser()
replace twig app['authentication'].getUser() with corresponding method
 2015-07-02 12:33:18 +02:00
Olivier Mayer
30d9bccbf2 Issues Monday + more 2015-03-30 19:28:33 +09:00
Olivier Mayer
19bb1f180e Admin menu position 
fix #20
 2015-03-20 16:29:39 +09:00
Nicolas Le Goff
4e5dca3720 Fix javascript issues 2015-02-06 19:14:21 +01:00
Nicolas Le Goff
555e8ce906 Fix tinymce path 2015-02-06 14:16:44 +01: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
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
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
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
c156f842c7 Remove User_Adapter 2014-02-19 17:28:53 +01:00
Nicolas Le Goff
7025e756bc Use backbone to display taskmanager front end 2014-02-14 16:55:45 +01:00
Nicolas Le Goff
6ba5ce6669 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Admin/Root.php
	lib/classes/module/console/schedulerStart.php
	lib/classes/module/console/taskrun.php
	lib/classes/task/Scheduler.php
	lib/classes/task/abstract.php
	lib/classes/task/databoxAbstract.php
	templates/web/admin/collection/collection.html.twig
	templates/web/admin/databox/databox.html.twig
	templates/web/email-template.html.twig
 2014-01-24 18:52:14 +01:00
Nicolas Le Goff
18708c46b2 Fix #1667 Admin tree is not reloaded when empty action is triggered 2014-01-22 12:06:17 +01:00
Romain Neutron
64456a8964 Remove phraseanet registry 2013-12-20 16:44:22 +01:00
Romain Neutron
e7421e1fdd Fix twig tags 2013-12-03 20:02:39 +01:00
Romain Neutron
b973e40577 Merge branch '3.8' 
Conflicts:
	CHANGELOG.md
	bower.json
	lib/Alchemy/Phrasea/Core/Version.php
 2013-11-15 19:04:45 +01:00
Romain Neutron
60d4ee03e6 Fix html escaping 2013-11-15 16:09:43 +01:00
Romain Neutron
432252f5f8 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Controller/Root/Account.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/User/Adapter.php
	lib/classes/eventsmanager/broker.php
	lib/classes/eventsmanager/notify/autoregister.php
	lib/classes/eventsmanager/notify/order.php
	lib/classes/eventsmanager/notify/register.php
	lib/classes/eventsmanager/notify/uploadquarantine.php
	lib/classes/eventsmanager/notify/validationdone.php
	templates/web/admin/index.html.twig
 2013-11-12 19:19:13 +01:00
Romain Neutron
9f2f1a4217 Fix #1573 : Propose rights reset prior apply template 
Conflicts:
	templates/web/admin/index.html.twig
 2013-11-12 13:29:30 +01:00
Romain Neutron
865e89bf64 Update templates 2013-10-29 18:41:43 +01:00
Nicolas Le Goff
d46583f824 Add tinymce 2013-08-17 17:12:58 +02:00
Nicolas Le Goff
7d8e93bddd Fix assets path 2013-08-17 17:12:57 +02:00
Nicolas Le Goff
b556ecc337 Fix #1342 & #1390 & #1391 Can not edit CGUS in IE7 & Can not download import user file CSV example 2013-08-07 14:23:29 +02:00
Nicolas Le Goff
ca57a3848b Fix #1374 Enhance logo choice for statusbit 2013-08-07 14:23:29 +02:00
Nicolas Le Goff
e5719f9f92 Fix #1342 & #1390 & #1391 Can not edit CGUS in IE7 & Can not download import user file CSV example 2013-08-05 14:53:25 +02:00
Nicolas Le Goff
5ef603138e Fix #1374 Enhance logo choice for statusbit 2013-08-05 14:53:25 +02:00
Nicolas Le Goff
554d2e98b5 Fix #1397 Terms of use edition & add tinymce 2013-08-05 11:26:55 +02:00
Romain Neutron
93db8d79db Fix #1339 : Fix admin file upload callback 2013-07-17 12:18:43 +02:00
Nicolas Le Goff
3034ce1d78 Add city retrieval from geonamed id on input creation 2013-07-04 14:20:23 +02:00
Nicolas Le Goff
ea47c5cd7c Use default lightbox css jquery theme for geonames plugin autocomplete 2013-07-03 18:38:17 +02:00
Nicolas Le Goff
764fa42f14 Update to jquery ui 1.10.3 
Fix conflict & ui bugs

Remove debug
 2013-06-21 13:46:16 +02:00
Nicolas Le Goff
4ed16a8f75 Use html5 to validate setup form, use html5 fallback if client does not support this feature 
Add modernizr to admin group
 2013-06-14 20:13:16 +02:00
Romain Neutron
4161ef2e31 Use url generator everywhere 2013-06-13 09:44:16 +02:00