hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,585 Commits 268 Branches 107 Tags
e48b5b540f5b9d52eefcf98b957eb86fd5c85aa7
Commit Graph

139 Commits

Author SHA1 Message Date
Nicolas Le Goff
e48b5b540f Update treeview.css 2014-03-05 15:33:22 +01:00
Romain Neutron
c641ab7841 Merge branch '3.8' 
Conflicts:
	lib/classes/Bridge/Api/Dailymotion.php
	lib/classes/Bridge/Api/Flickr.php
	lib/classes/Bridge/Api/Interface.php
	lib/classes/DailymotionWithoutOauth2.php
 2014-02-28 19:37:54 +01:00
Nicolas Le Goff
88f179ae80 Remove prod/bridge/manager hardcoded urls 2014-02-28 13:10:33 +01:00
Nicolas Le Goff
b341495c88 Fix tests 2014-02-19 17:29:26 +01:00
Nicolas Le Goff
4cc82af980 Fix settings 2014-02-19 17:29:26 +01:00
Nicolas Le Goff
54a5d6578c Replace getter and setter for user & user notif setting value 2014-02-19 17:28:53 +01:00
Nicolas Le Goff
c156f842c7 Remove User_Adapter 2014-02-19 17:28:53 +01:00
Romain Neutron
64456a8964 Remove phraseanet registry 2013-12-20 16:44:22 +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
Romain Neutron
2cb9dda244 Fix #1605 : Add advanced search reset on production load. 2013-12-10 11:48:17 +01:00
Romain Neutron
420df7febd Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Command/CreateCollection.php
	lib/Alchemy/Phrasea/Controller/Admin/Databox.php
	lib/Alchemy/Phrasea/Controller/Root/Login.php
	lib/Alchemy/Phrasea/Core/Provider/SearchEngineServiceProvider.php
	lib/Alchemy/Phrasea/Model/Entities/AuthFailure.php
	lib/Alchemy/Phrasea/Model/Entities/LazaretAttribute.php
	lib/Alchemy/Phrasea/Model/Entities/LazaretCheck.php
	lib/Alchemy/Phrasea/Model/Entities/SessionModule.php
	lib/Alchemy/Phrasea/Model/Entities/ValidationData.php
	lib/Alchemy/Phrasea/Model/Repositories/BasketRepository.php
	lib/conf.d/Doctrine/Entities.Session.dcm.yml
	lib/conf.d/Doctrine/Entities.StoryWZ.dcm.yml
	lib/conf.d/Doctrine/Entities.UsrList.dcm.yml
	lib/conf.d/Doctrine/Entities.UsrListEntry.dcm.yml
	lib/conf.d/Doctrine/Entities.UsrListOwner.dcm.yml
	lib/conf.d/Doctrine/Entities.ValidationSession.dcm.yml
	lib/conf.d/PhraseaFixture/Basket/LoadFiveBaskets.php
	tests/Alchemy/Tests/Phrasea/SearchEngine/SphinxSearchEngineTest.php
 2013-12-03 21:19:20 +01:00
Romain Neutron
e9e9d149a1 Locale simplification 2013-12-03 20:05:20 +01:00
Romain Neutron
458aac8dd8 Add JMS translation tools 2013-12-03 20:05:20 +01:00
Romain Neutron
2ba164701d Use symfony translator 2013-12-03 20:02:40 +01:00
Romain Neutron
e7421e1fdd Fix twig tags 2013-12-03 20:02:39 +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
Romain Neutron
8729bb094f Fix #1602 : Use localisation for datepicker placeholder 2013-12-02 18:07:48 +01:00
Romain Neutron
deb5e7ea75 Fix #1596 : Add datepicker input placeholder 2013-11-28 11:29:04 +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
cfa726f2ee Fix #1575 : Allow stemmed search only if stemming is enabled 2013-11-07 12:12:26 +01:00
Nicolas Le Goff
1fdf30c6af Use ACL service provider to get user's ACL 2013-11-05 12:21:42 +01:00
Romain Neutron
1c27778001 Merge branch '3.8' 
Conflicts:
	tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php
 2013-10-31 17:56:48 +01:00
Nicolas Le Goff
c5d52c2c10 Fix z-index issue for datepickers 2013-10-31 15:35:19 +01:00
Romain Neutron
45c5276923 Merge branch '3.8' 2013-09-18 12:09:20 +02:00
Romain Neutron
219156bf8e Add SearchEngineInterface::isStemmingEnabled 2013-09-17 17:03:41 +02:00
Romain Neutron
0047d0fc36 Never reset date sort settings, remove date field choser 2013-09-17 16:33:48 +02:00
Romain Neutron
0d3aaf362d Merge branch 'feeds-entities' of https://github.com/csaoh/Phraseanet 2013-09-12 13:53:56 +02:00
Nicolas Le Goff
35c64bb4c5 Fix #1436 Css issue 2013-09-05 13:55:20 +02:00
Andrey
1764d5f5c4 Fixed order in entry/update, fixed a lot of codestyle 2013-09-05 13:44:06 +02:00
Andrey
affdfe7a0a Implement RSSFeeds, fixed controllers implementation, fixed tests 2013-09-05 13:44:02 +02:00
Andrey
f117817e87 Implementation of doctrine entities 2013-09-05 13:43:04 +02:00
Nicolas Le Goff
c4bee93722 Fix #1320 Js issue while rendering results 2013-08-07 17:42:49 +02:00
Nicolas Le Goff
a0ad497200 Fix #1295 Research thesaurus terms 2013-07-12 19:28:13 +02:00
Nicolas Le Goff
4875b224ff Fix #1250 the enter key to execute a query opens advanced search 2013-07-08 16:36:15 +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
5e151e632a adressed comment's 2013-07-04 02:49:11 +02:00
Romain Neutron
58f7e23457 Merge branch '3.7' 2013-06-28 23:22:59 +02:00
Romain Neutron
c87afd466f Fix template 2013-06-28 23:22:09 +02:00
Romain Neutron
b11148149f Merge branch '3.7' 2013-06-28 23:18:41 +02:00
Romain Neutron
ae50d07d05 Fix template 2013-06-28 23:16:05 +02:00
Romain Neutron
b7af503ea3 Fix build 2013-06-28 23:13:44 +02:00
Romain Neutron
a9bb23fc51 Merge branch '3.7' 2013-06-28 20:22:20 +02:00
Nicolas Le Goff
9297d2f6b5 Fix #1203 Do not display story creation form if user do not have appropriate rights 2013-06-28 17:51:44 +02:00
Nicolas Le Goff
06f2ebcc0a Fix #1212 Broken advanced search 2013-06-28 13:13:07 +02:00
jygaulier
c378bbdfce fix #1210 2013-06-27 15:43:31 +02:00
Nicolas Le Goff
90bc96b72a Fix tooltip + enhancement 
Adressed PR's comment

Fix CSS issue
 2013-06-24 15:50:59 +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
Romain Neutron
906d4ba9c5 Localize status bits 2013-06-14 09:47:54 +02:00
Romain Neutron
f9b4978569 Merge pull request #390 from romainneutron/databox-labels 
[3.8] Add labels to databoxes
 2013-06-13 07:41:05 -07:00
Romain Neutron
bfa28e0fd0 Bump to jquery ui 1.8.24, fix JS and CSS load issues 2013-06-13 13:52:03 +02:00