hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-15 14:03:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,475 Commits 268 Branches 107 Tags
dcb8da99aa097bd588495b99f49dc46ec7f23c57
Commit Graph

136 Commits

Author SHA1 Message Date
Damien Alexandre
ab07cb8e17 Merge branch 'master' into elastic-indexer 
Conflicts:
	.gitignore
 2014-09-08 11:39:02 +02:00
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
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
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
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
212c4fdf09 Add sucriberManager Test 2014-03-05 15:33:22 +01:00
Nicolas Le Goff
5d3fd6f987 Add hasCallbacks method 2014-03-05 15:33:22 +01:00
Nicolas Le Goff
ba2a73d8c2 Add squire js to mock require js module 2014-03-05 15:33:22 +01:00
Nicolas Le Goff
5df7c37bf0 Throws exception instead of returning null 2014-03-05 15:33:22 +01:00
Nicolas Le Goff
0299250097 Refactor require.js config 2014-03-05 15:33:22 +01:00
Nicolas Le Goff
1e2cc2692e Replace hasSession by isConnected 2014-03-05 15:33:22 +01:00
Nicolas Le Goff
af526beb41 Remove unused && improve dependencies detection 2014-03-05 15:33:22 +01:00
Nicolas Le Goff
e5106abd0b Load sinon & sinochai from tmp assets 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
79cf2b7241 Add subscriber manager 2014-03-05 15:33:21 +01:00
Nicolas Le Goff
3207f24f80 Remove getters & setters 2014-03-05 15:33:21 +01:00
Nicolas Le Goff
ef5b3fadb7 WSConnection is not a singleton anymore 2014-03-05 15:33:21 +01:00
Nicolas Le Goff
5216e8fc9c Remove unnecessary dependencies 2014-03-05 15:33:21 +01:00
Nicolas Le Goff
947545620a Use new WS Connection object in task Manager App 2014-03-05 15:33:21 +01:00
Nicolas Le Goff
1d8c0e86cf Add WS Connection object 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
Nicolas Le Goff
c38c3eaa09 Remove dev dependencies from package tasks 2014-02-27 19:23:59 +01:00
Nicolas Le Goff
7025e756bc Use backbone to display taskmanager front end 2014-02-14 16:55:45 +01:00
Nicolas Le Goff
fe2300e6ca Fix #1639 logs error in mocha phantom js 2014-02-13 12:02:58 +01:00
Romain Neutron
e233e5afa6 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Command/Developer/JavascriptBuilder.php
	lib/Alchemy/Phrasea/Controller/Prod/Basket.php
	lib/Alchemy/Phrasea/Core/Provider/TaskManagerServiceProvider.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/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/ImageInterface.php
	lib/classes/http/request.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/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/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
 2014-01-06 15:38:14 +01:00
Romain Neutron
d519c13e56 Bump copyright year 2014-01-06 15:28:12 +01:00
Romain Neutron
09c74afab6 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Prod/Export.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/Alchemy/Phrasea/Helper/Prod.php
	lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php
	lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php
	lib/classes/User/Adapter.php
	lib/classes/caption/Field/Value.php
	lib/classes/collection.php
	lib/classes/module/report/filter.php
	lib/classes/task/period/ftp.php
	templates/web/common/dialog_export.html.twig
	templates/web/report/ajax_dashboard_content_child.html.twig
	tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php
 2013-12-18 12:12:58 +01:00
Nicolas Le Goff
3e574207e2 Add tests 2013-12-16 14:35:38 +01:00
Nicolas Le Goff
060d6d9fdb Fix #1623 Can not display empty admin fields list 2013-12-16 14:10:03 +01:00
Romain Neutron
4f31cfeefc Merge branch '3.8' 
Conflicts:
	bower.json
	templates/web/common/index_bootstrap.html.twig
	templates/web/common/menubar.html.twig
	templates/web/login/layout/base-layout.html.twig
	templates/web/prod/Baskets/Reorder.html.twig
 2013-12-02 18:17:38 +01:00
Nicolas Le Goff
afde85140f Fix #1600 Can not save a deleted field in admin field app 2013-11-28 11:08:42 +01:00
Romain Neutron
dca6667052 Merge branch '3.8' 2013-11-13 17:07:45 +01:00
Nicolas Le Goff
7c36829f11 Fix #1570 Remove accept tou link if there are no TOU 2013-11-12 19:59:54 +01:00
Romain Neutron
1a2487d398 Fix JS codestyle 2013-11-12 15:07:16 +01:00
Romain Neutron
3cf2cbd6f1 Merge branch '3.8' 2013-11-12 13:26:15 +01:00
Romain Neutron
9fa95db23c Fix JS codestyle 2013-11-12 12:49:23 +01:00
Romain Neutron
89fb774f96 Merge branch '3.8' 2013-11-12 12:10:40 +01:00
Romain Neutron
dc5c12a592 Fix JS code style 2013-11-11 11:25:52 +01:00
Romain Neutron
2072f9e0e0 Merge branch '3.8' 
Conflicts:
	composer.lock
	lib/Alchemy/Phrasea/Core/Version.php
 2013-11-08 19:04:26 +01:00
Romain Neutron
ea6b93b88a Fix typo 2013-11-08 18:48:58 +01:00
Nicolas Le Goff
b24b4fdb00 Fix #1578 Checks field source validation 2013-11-08 18:48:58 +01:00
Romain Neutron
f27fa53d4c Merge branch '3.8' 
Conflicts:
	.travis.yml
	templates/web/setup/wrapper.html.twig
	tests/Alchemy/Tests/Phrasea/Authentication/AuthenticatorTest.php
 2013-11-05 15:20:35 +01:00