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,327 Commits 268 Branches 107 Tags
26bd977d5f3c4564e116c23519164e6bbaae2db4
Commit Graph

1409 Commits

Author SHA1 Message Date
Nicolas Le Goff
26bd977d5f Delete references to usr.usr_id field in entities 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Prod/Push.php
	lib/Alchemy/Phrasea/Controller/Prod/UsrLists.php
	lib/conf.d/migrations.yml

Conflicts:
	lib/Alchemy/Phrasea/ACL/BasketACL.php
	lib/Alchemy/Phrasea/Authentication/Authenticator.php
	lib/Alchemy/Phrasea/Controller/Prod/Order.php
	lib/Alchemy/Phrasea/Controller/Prod/UsrLists.php
	lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php
	lib/Alchemy/Phrasea/Controller/Root/Session.php
	lib/Alchemy/Phrasea/Model/Entities/Basket.php
	lib/Alchemy/Phrasea/Model/Entities/BasketElement.php
	lib/Alchemy/Phrasea/Model/Entities/Feed.php
	lib/Alchemy/Phrasea/Model/Entities/FeedEntry.php
	lib/Alchemy/Phrasea/Model/Entities/FtpExport.php
	lib/Alchemy/Phrasea/Model/Entities/Session.php
	lib/Alchemy/Phrasea/Model/Entities/StoryWZ.php
	lib/Alchemy/Phrasea/Model/Entities/UsrList.php
	lib/Alchemy/Phrasea/Model/Entities/UsrListEntry.php
	lib/Alchemy/Phrasea/Model/Entities/UsrListOwner.php
	lib/Alchemy/Phrasea/Model/Entities/ValidationParticipant.php
	lib/Alchemy/Phrasea/Model/Entities/ValidationSession.php
	lib/Alchemy/Phrasea/Model/Repositories/StoryWZRepository.php
	lib/classes/API/V1/adapter.php
	templates/mobile/lightbox/sc_note.html.twig
	templates/web/admin/connected-users.html.twig
	templates/web/admin/publications/fiche.html.twig
	templates/web/lightbox/IE6/agreement_box.html.twig
	templates/web/lightbox/agreement_box.html.twig
	templates/web/lightbox/basket_content_report.html.twig
	templates/web/lightbox/sc_note.html.twig
	templates/web/prod/WorkZone/Browser/Basket.html.twig
	templates/web/prod/WorkZone/Browser/Results.html.twig
	templates/web/prod/WorkZone/Macros.html.twig
	templates/web/prod/actions/Feedback/List-Share.html.twig
	templates/web/prod/actions/Feedback/ListsMacros.html.twig
	templates/web/prod/orders/order_box.html.twig
	templates/web/prod/orders/order_item.html.twig
	templates/web/prod/upload/lazaret.html.twig
	tests/Alchemy/Tests/Phrasea/Controller/Root/SessionTest.php
 2014-02-19 17:29:25 +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
Nicolas Le Goff
7025e756bc Use backbone to display taskmanager front end 2014-02-14 16:55:45 +01:00
Nicolas Le Goff
9bb0d5892b Fix galleria loading 2014-02-14 12:34:33 +01:00
Nicolas Le Goff
db1a23fe34 Fix latest merge 2014-02-13 12:02:17 +01:00
Nicolas Le Goff
f4f063ad3e Merge branch '3.8' 
Conflicts:
	templates/web/report/report_layout_child.html.twig
 2014-02-13 11:12:26 +01:00
Nicolas Le Goff
a1e8b0d20d Fix #1685 Fix path for report activity 2014-02-11 12:45:09 +01:00
Nicolas Le Goff
6053a03b87 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Prod/Records.php
	lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.php
	tests/Alchemy/Tests/Phrasea/Application/ApiTestCase.php
	tests/classes/PhraseanetPHPUnitAbstract.php
 2014-02-11 09:02:29 +01:00
Nicolas Le Goff
1e6367bb6e Merge pull request #938 from romainneutron/fix-1686 
[3.8] Fix #1686 : Fix jquery ui usage
 2014-02-11 08:43:48 +01:00
Romain Neutron
b56edae725 Fix #1686 : Fix jquery ui usage 2014-02-10 23:30:23 +01:00
Nicolas Le Goff
aa0bf78ac9 Merge branch '3.8' 
Conflicts:
	lib/classes/task/Scheduler.php
	templates/web/admin/user/demand.html.twig
 2014-02-06 17:39:41 +01:00
Nicolas Le Goff
6a71aed5f4 Fix #1688 Set submit button as absolute position 2014-02-06 15:38:00 +01:00
Romain Neutron
280e8b6178 Merge branch '3.8' 
Conflicts:
	templates/web/client/baskets.html.twig
	templates/web/client/index.html.twig
	templates/web/prod/preview/basket_train.html.twig
	templates/web/prod/preview/feed_train.html.twig
	templates/web/prod/preview/reg_train.html.twig
 2014-02-05 18:35:44 +01:00
Nicolas Le Goff
dc3963e264 Merge pull request #927 from romainneutron/fix-tooltip-src-client 
[3.8] Fix client template : tooltip source is escaped
 2014-02-05 17:48:11 +01:00
Nicolas Le Goff
81b55094d2 Merge pull request #926 from romainneutron/fix-template 
[3.8] Fix client template
 2014-02-05 16:14:43 +01:00
Nicolas Le Goff
3b9b5a3240 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php
 2014-02-05 15:25:52 +01:00
Romain Neutron
6ce351b5c5 Fix client template : tooltip source is escaped 2014-02-05 14:50:27 +01:00
Romain Neutron
43a51a3f45 Fix client template 2014-02-05 14:21:07 +01:00
Nicolas Le Goff
58c5a8513d Merge pull request #923 from romainneutron/upload-css 
[3.8] Fix upload box CSS
 2014-02-05 14:14:04 +01:00
Romain Neutron
03fc818fe4 Fix upload box CSS 2014-02-05 13:07:46 +01:00
Nicolas Le Goff
4596bf5d30 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Security/Firewall.php
 2014-02-04 11:30:23 +01:00
Nicolas Le Goff
8f9745d874 Merge branch '3.8' 
Conflicts:
	lib/classes/task/Scheduler.php
	lib/classes/task/abstract.php
	templates/web/client/index.html.twig
 2014-02-04 11:25:59 +01:00
Romain Neutron
4fdadfa836 Fix #1681 : Avoid basket tooltip overflow 2014-02-03 22:01:54 +01:00
Nicolas Le Goff
2c42f7e3dc Merge pull request #915 from romainneutron/error-logs 
[3.8] Error logs
 2014-02-03 10:47:09 -08:00
Nicolas Le Goff
bd1e4516bd Merge branch '3.8' 
Conflicts:
	config/configuration.sample.yml
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/module/console/schedulerStart.php
	lib/classes/module/console/taskrun.php
	lib/conf.d/configuration.yml
	templates/mobile/common/index.html.twig
 2014-02-03 19:02:22 +01:00
Romain Neutron
40506247f3 Fix client template 2014-02-03 16:16:53 +01:00
Nicolas Le Goff
dd8c4cb75f Fix #1660 video scale preview on ipad in lightbox 2014-01-31 16:39:01 +01:00
Nicolas Le Goff
92e30c838b Merge pull request #869 from romainneutron/elastic-search 
[3.9] Add ElasticSearch support
 2014-01-28 02:09:04 -08:00
Romain Neutron
97d96a6b32 Add elastic-search engine support 2014-01-27 20:12:13 +01:00
Nicolas Le Goff
0af2d9ef84 Remove possibility to update phraseanet from admin panel 2014-01-27 19:50:33 +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
894f9584c7 Fix #1650 insufficient line-height in email template 2014-01-23 11:47:26 +01:00
Romain Neutron
341b69981d Merge pull request #882 from nlegoff/fix-1667 
[3.8] Fix #1667 Admin tree is not reloaded when empty action is triggered
 2014-01-22 23:33:03 -08:00
Romain Neutron
c0919fbdc9 Merge branch '3.8' 2014-01-23 08:28:14 +01:00
Romain Neutron
67b0f4120e Merge pull request #884 from nlegoff/fix-1659 
[3.8] Fix #1659 reorder feature is broken for baskets & stories
 2014-01-22 23:27:39 -08:00
Romain Neutron
74ee94ec97 Merge branch '3.8' 
Conflicts:
	templates/web/common/drop_down_options.html.twig
 2014-01-23 08:23:47 +01:00
Nicolas Le Goff
95360b5e55 Fix #1665 In admin setup panel, selecting the option in the editor list does not work 2014-01-22 16:11:32 +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
Nicolas Le Goff
48389a4e8e Fix #1659 reorder feature is broken for baskets & stories 2014-01-21 14:56:05 +01:00
Nicolas Le Goff
15abccf594 Merge branch '3.8' 
Conflicts:
	composer.lock
	lib/Alchemy/Phrasea/Core/Version.php
 2014-01-20 11:08:36 +01:00
Nicolas Le Goff
9fec6ed8c0 Merge pull request #877 from romainneutron/fix-1658 
[3.8] Fix #1658 : Registration list display is broken
 2014-01-20 01:29:28 -08:00
Nicolas Le Goff
040ba58eca Merge pull request #876 from romainneutron/fix-1657 
[3.8] Fix #1657 : Fix suggested values editor
 2014-01-20 01:29:06 -08:00
Romain Neutron
67ce16061b Fix #1658 : Registration list display is broken 2014-01-15 16:49:13 +01:00
Romain Neutron
b9c1e952c1 Fix #1657 : Fix suggested values editor 2014-01-15 16:32:23 +01:00
Nicolas Le Goff
4e09ba6470 Fix phpunit test suite 2014-01-14 14:54:28 +01:00
Nicolas Le Goff
45679d8675 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Admin/Databox.php
	lib/classes/collection.php
	templates/web/admin/databox/databox.html.twig
 2014-01-14 12:38:58 +01:00
Romain Neutron
f0486f9478 Fix #1646 : Unable to mount collections 2014-01-13 18:06:18 +01:00
Romain Neutron
d7b4e61c10 Make search engine a real service 2014-01-07 16:45:58 +01:00
Romain Neutron
bb9eff5935 Merge pull request #792 from romainneutron/configuration 
[3.9] Move registry to configuration
 2013-12-20 08:44:10 -08:00