hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-26 19:33:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,226 Commits 268 Branches 107 Tags
aa0bf78ac9ab327a2d458866aeb5817437ef7f17
Commit Graph

91 Commits

Author SHA1 Message Date
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
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
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
Nicolas Le Goff
409a43db0c Fix field edition for vocabulary 2013-10-31 17:56:47 +01:00
Romain Neutron
38264a0ae7 Merge branch '3.8' 
Conflicts:
	bower.json
	lib/classes/task/manager.php
	lib/conf.d/minifyGroupsConfig.php
	tests/classes/PhraseanetPHPUnitAbstract.php
 2013-10-31 13:57:21 +01:00
Nicolas Le Goff
7b256eae61 Fix setting cookie 2013-10-28 18:41:41 +01:00
Nicolas Le Goff
ae653edad0 Sets selected field according to current user langage 2013-10-28 14:16:21 +01:00
Nicolas Le Goff
6e59e7aae6 Fix #1518 Can not edit tags in metadatas settings 2013-10-21 18:39:19 +02:00
Romain Neutron
457b5ef3f0 Merge pull request #693 from nlegoff/fix1518 
[3.8] Fix #1518 Can not edit tags in metadatas settings
 2013-10-10 09:07:00 -07:00
Nicolas Le Goff
bb836ad360 Fix #1518 Can not edit tags in metadatas settings 2013-10-10 16:45:19 +02:00
Romain Neutron
1dfbff5666 Merge branch '3.8' 
Conflicts:
	CHANGELOG.md
	bin/developer
	lib/classes/module/console/systemUpgrade.php
	www/skins/report/jquery-ui.css
 2013-10-03 15:29:22 +02:00
Nicolas Le Goff
be02d1d7a0 Fix #1453 Edition field on firefox 2013-10-03 15:24:15 +02:00
Romain Neutron
e63ae364ff Merge pull request #667 from nlegoff/fix_1495 
[3.8] Fix #1495 Remove focus when editing fields
 2013-10-01 02:47:44 -07:00
Nicolas Le Goff
bfb27ddced Fix #1494 zero indexed field list 2013-10-01 11:16:56 +02:00
Nicolas Le Goff
0edc1abc9e Fix #1495 Remove focus action 2013-09-30 12:25:01 +02:00
Nicolas Le Goff
d4045f968c Fix #1453 Edition field on firefox 2013-09-27 18:35:10 +02:00
Romain Neutron
abbff72233 Fix #1460 : Select all value is included in the form, trigging an server side error 2013-09-14 02:10:11 +02:00
Romain Neutron
af72aaaf4b Fix #1460 : Select all value is included in the form, trigging an server side error 2013-09-10 12:58:37 +02:00
Romain Neutron
f14401b153 Merge branch '3.8' 2013-09-09 19:30:55 +02:00
Nicolas Le Goff
319c1a90c2 Remove regexp control for validating tags 2013-09-06 20:32:52 +02:00
Nicolas Le Goff
e92c165564 Fix typo 2013-08-19 14:51:54 +02:00
Nicolas Le Goff
7d8e93bddd Fix assets path 2013-08-17 17:12:57 +02:00
Nicolas Le Goff
e2955c9650 Fix #1336 Enhance fields update 2013-08-07 14:23:30 +02:00
Nicolas Le Goff
3d6d6a9a74 Fix #1389 Keyboard navigation in field source list 2013-08-07 14:23:30 +02:00
Nicolas Le Goff
49109a93b1 Fix #1386 Remove extra field from register form 2013-08-07 14:23:30 +02:00
Nicolas Le Goff
eb8eb4f06a Fix #1366 Can not edit fields in IE7 2013-08-07 14:23:29 +02:00
Nicolas Le Goff
01468e284e Fix #1336 Enhance fields update 2013-08-05 14:53:26 +02:00
Nicolas Le Goff
53881e4ddc Fix #1389 Keyboard navigation in field source list 2013-08-05 14:53:26 +02:00
Nicolas Le Goff
139d0d96dc Fix #1386 Remove extra field from register form 2013-08-05 14:53:26 +02:00
Nicolas Le Goff
85fe0496f5 Fix #1366 Can not edit fields in IE7 2013-08-05 14:53:25 +02:00
Romain Neutron
b5c19b3e91 Temporary fix for #1336 2013-07-17 18:09:21 +02:00
Nicolas Le Goff
f037a84d33 Fix #1335 Auto close alert after delay 2013-07-12 19:28:13 +02:00
Nicolas Le Goff
6ae2f29a52 Fix #1337 Remove keyup on input 2013-07-12 19:28:13 +02:00
Nicolas Le Goff
68ebcfddb5 Fix #1267 List is not renumbered after delete & Fix #1264 Can not add field, if there is no field in database 2013-07-11 01:41:50 +02:00
Nicolas Le Goff
14949cb619 Fix #1266 when removing a field, the right panel is not updated 2013-07-11 01:41:50 +02:00
Nicolas Le Goff
d2df5e3222 Fix live search filter 2013-07-11 01:41:50 +02:00
Nicolas Le Goff
3034ce1d78 Add city retrieval from geonamed id on input creation 2013-07-04 14:20:23 +02:00