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

1879 Commits

Author SHA1 Message Date
Romain Neutron
c3df531f59 Move main "languages" and "servername" to top level, "task-manager" and "binaries" to main configuration 2013-12-20 11:43:41 +01:00
Romain Neutron
ff9fb0404d Merge pull request #856 from romainneutron/tests-phaze2 
[3.9] Add improvements to unit tests
 2013-12-20 02:43:20 -08:00
Romain Neutron
6c45e8d40a Add improvements to unit tests 2013-12-20 10:51:35 +01:00
Romain Neutron
bfe5da79d2 Merge branch '3.8' 
Conflicts:
	lib/classes/User/Adapter.php
	lib/conf.d/bases_structure.xml
 2013-12-20 09:53:09 +01:00
Romain Neutron
573b51451a Merge pull request #855 from romainneutron/remove-sselnew 
[3.8] Remove table sselnew
 2013-12-20 00:42:09 -08:00
Romain Neutron
2804aeaf8e Fix 1634 : Template application bypass status bit restrictions 2013-12-19 20:28:24 +01:00
Romain Neutron
810b0e693f Remove table sselnew 2013-12-19 20:15:09 +01:00
Romain Neutron
ecf516406a Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Controller/Admin/Users.php
	lib/Alchemy/Phrasea/Setup/Version/Migration/Migration38.php
	tests/classes/PhraseanetPHPUnitAbstract.php
	tests/classes/unitTestsTest.php
 2013-12-19 10:31:52 +01:00
Romain Neutron
c34a044417 Merge pull request #847 from nlegoff/fix1619 
[3.8] Fix #1619 Upgrade migration, checks if sbas exists before getting connec...
 2013-12-19 01:24:59 -08:00
Romain Neutron
d65a6bbb80 Fix autoregister 2013-12-18 23:35:42 +01:00
Romain Neutron
89dc1c5129 Add fixtures to sqlite db 2013-12-18 23:34:06 +01:00
Romain Neutron
a74ad06ad1 Fix CS 2013-12-18 18:15:16 +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
33f709e985 Add missing files 2013-12-18 11:58:26 +01:00
Romain Neutron
1465678512 Merge pull request #845 from romainneutron/fix-1627 
[3.8] Fix #1627 : FTP receiver does not get its email
 2013-12-18 02:52:13 -08:00
Romain Neutron
9d42d5b64d Merge pull request #843 from romainneutron/fix-1622 
[3.8] Fix #1622 : Sanitize captions display
 2013-12-18 01:48:35 -08:00
Romain Neutron
a165907b95 Fix #1627 : FTP receiver does not get its email 2013-12-18 10:47:16 +01:00
Romain Neutron
1cc3885656 Fix #1624 : Some report locales might be broken 2013-12-17 19:41:58 +01:00
Romain Neutron
f0d632073b Fix #1622 : Sanitize captions display 2013-12-17 18:31:56 +01:00
Nicolas Le Goff
7b0da9690c Fix #1619 Upgrade migration, checks if sbas exists before getting connection 2013-12-17 14:39:35 +01:00
Romain Neutron
c788daa1e9 Merge pull request #833 from nlegoff/fix_1607 
[3.8] Fix #1607 Reoder collections is not working
 2013-12-16 05:18:53 -08:00
Nicolas Le Goff
2662ead699 Fix #1607 Reoder collections is not working 
Conflicts:
	lib/classes/collection.php
 2013-12-16 13:27:19 +01:00
Romain Neutron
816a53a54e Merge pull request #838 from romainneutron/fix-1605 
[3.8] Fix #1605 : Add advanced search reset on production load.
 2013-12-11 14:48:40 -08:00
Romain Neutron
d051fc7e65 Merge pull request #839 from romainneutron/fix-1621 
Fix #1621 : User query per last applied template triggers an error
 2013-12-11 14:48:21 -08:00
Romain Neutron
5642c144ee Merge pull request #837 from romainneutron/fix-1618 
[3.8] Fix user settings precedence
 2013-12-11 14:47:51 -08:00
Jean-Yves Gaulier
f71fb36377 fix #1612 
Conflicts:
	lib/classes/caption/Field/Value.php
 2013-12-11 19:49:49 +01:00
Jean-Yves Gaulier
f5f17549ad fix #1612 
Conflicts:
	lib/classes/caption/Field/Value.php
 2013-12-11 19:49:05 +01:00
Romain Neutron
7eb945f771 Fix #1621 : User query per last applied template triggers an error 2013-12-10 18:56:54 +01:00
Romain Neutron
2cb9dda244 Fix #1605 : Add advanced search reset on production load. 2013-12-10 11:48:17 +01:00
Romain Neutron
8fd1256aa2 Fix user settings precedence 2013-12-10 11:01:30 +01:00
Romain Neutron
804caccc73 Fix latest merge 2013-12-10 01:28:32 +01:00
Romain Neutron
1e3b3a1b60 Fix latest merges 2013-12-09 19:19:53 +01:00
Romain Neutron
c960ec7b34 Merge branch '3.8' 2013-12-09 19:13:15 +01:00
Romain Neutron
0804d01b4f Fix ACL binary comparison 2013-12-09 18:39:51 +01:00
Romain Neutron
9580ff7585 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/task/period/archive.php
	templates/web/admin/collection/collection.html.twig
	templates/web/admin/databox/databox.html.twig
	templates/web/login/layout/base-layout.html.twig
 2013-12-09 14:17:03 +01:00
Romain Neutron
25bade7a47 Merge branch 'ArchTaskStops' of https://github.com/jygaulier/Phraseanet into jygaulier-ArchTaskStops 2013-12-09 14:14:19 +01:00
Nicolas Le Goff
d58d74d5fc Fix #1613 Can not launch lightbox 2013-12-06 17:53:23 +01:00
Jean-Yves Gaulier
403a4e4127 Task archive may stop if maxmemory > 25Mo 2013-12-05 18:35:43 +01:00
Romain Neutron
018e624298 Merge branch '3.8' 
Conflicts:
	lib/classes/base.php
 2013-12-04 14:52:40 +01:00
Romain Neutron
d6e2a604ba Fix patch execution order 2013-12-04 14:21:38 +01:00
Romain Neutron
1ba41c4421 Fix latest merge 2013-12-04 08:20:58 +01:00
Romain Neutron
e0c1f600dd Merge branch '3.8' 
Conflicts:
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Core/Version.php
	lib/Doctrine/Repositories/SessionRepository.php
	lib/classes/User/Adapter.php
 2013-12-03 21:32:46 +01:00
Romain Neutron
e70e35ae04 Merge pull request #810 from romainneutron/fix-1594 
[3.8] Fix 1594 : Removed users are not disconnected
 2013-12-03 12:21:30 -08:00
Romain Neutron
7904a33e07 Fix CS 2013-12-03 21:01:43 +01:00
Romain Neutron
1af21b88ef Fix CS 2013-12-03 20:59:47 +01:00
Romain Neutron
0575d6da44 Bump to version 3.9.0-alpha.9 2013-12-03 20:06:49 +01:00
Romain Neutron
680643c0fc Fix unit tests and arrays declaration 2013-12-03 20:06:49 +01:00
Romain Neutron
199134c25a Add cached translation loader 2013-12-03 20:05:21 +01:00
Romain Neutron
e9e9d149a1 Locale simplification 2013-12-03 20:05:20 +01:00
Romain Neutron
2ba164701d Use symfony translator 2013-12-03 20:02:40 +01:00