3698 Commits

Author	SHA1	Message	Date
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	8fd1256aa2	Fix user settings precedence	2013-12-10 11:01:30 +01:00
Romain Neutron	0804d01b4f	Fix ACL binary comparison	2013-12-09 18:39:51 +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	d6e2a604ba	Fix patch execution order	2013-12-04 14:21:38 +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	0a813a6440	Bump to version 3.8.3-alpha.1	2013-12-03 18:22:15 +01:00
Romain Neutron	7a8f77c569	Fix #1594 : Removed users are not disconnected	2013-12-03 18:22:14 +01:00
Romain Neutron	b024492c07	Merge pull request #819 from romainneutron/fix-1591 ... Fix #1591 : Fix subdef group/name parameter extraction	2013-12-03 09:09:19 -08:00
Romain Neutron	9197805eae	Merge pull request #816 from romainneutron/fix-736 ... [3.8] Fix #736 : Re-inject phraseanet rights after collection creation in case of PhraseaEngine	2013-12-03 08:59:34 -08:00
Romain Neutron	fd83ba07cb	Fix #1591 : Fix subdef group/name parameter extraction	2013-12-02 17:47:50 +01:00
Romain Neutron	1472f96e93	Fix #736 : Re-inject phraseanet rights after collection creation in case of PhraseaEngine	2013-11-28 16:16:18 +01:00
Romain Neutron	e7eb81dd0c	Merge pull request #814 from romainneutron/fix-1595 ... [3.8] Fix #1595 : Export document with its title returns a document named with its filename	2013-11-28 05:06:39 -08:00
Romain Neutron	d1973bdc06	Fix #1595 : Export document with its title returns a document named with its filename	2013-11-28 11:56:40 +01:00
Romain Neutron	94d547d897	Fix #1593 : "download" query parameter is not working anymore on permalink URIs	2013-11-28 11:49:19 +01:00
Romain Neutron	3b7e0c9a30	Bump to version 3.8.3-alpha.0	2013-11-20 15:51:13 +01:00
Romain Neutron	be0815a9e0	Fix typo	2013-11-20 12:48:29 +01:00
Romain Neutron	10b28bc2ed	Fix #1568 : Scheduler timeouts	2013-11-20 12:48:18 +01:00
Romain Neutron	88b4df745b	Prepare version 3.8.2	2013-11-15 17:45:47 +01:00
Romain Neutron	5d79ff40a1	Prepare version 3.8.1	2013-11-15 12:18:14 +01:00
Romain Neutron	fa860310e6	Fix latest patch	2013-11-15 11:15:07 +01:00
Romain Neutron	e2602da9b6	Merge pull request #786 from romainneutron/fix-1572 ... [3.8] Fix #1572 : Add configuration customization	2013-11-14 08:51:19 -08:00
Romain Neutron	22168ba3bf	Fix #1572 : Add configuration customization	2013-11-14 17:10:53 +01:00
Romain Neutron	ae366c533c	Merge pull request #787 from romainneutron/conf-fixes ... [3.8] Conf fixes	2013-11-14 07:13:23 -08:00
Romain Neutron	84c444c186	Fix editing default user settings	2013-11-14 13:29:49 +01:00
Romain Neutron	7ce719a00b	Fix locale service provider	2013-11-14 13:29:31 +01:00
Romain Neutron	ccfe58b3fb	Fix #1563 : Set default CLI environment to prod	2013-11-13 17:13:01 +01:00
Romain Neutron	694aecf752	Merge pull request #781 from nlegoff/fix1570_bis ... [3.8] Fix #1570 Remove accept tou link if there are no TOU	2013-11-12 11:16:53 -08: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	a2899f6934	Insight recommendations	2013-11-12 17:58:03 +01:00
Romain Neutron	80f6209591	Merge pull request #773 from romainneutron/fix-1573 ... [3.8] Fix #1573 : Propose rights reset prior apply template	2013-11-12 07:52:16 -08:00
Romain Neutron	cc574ac7bd	Bump to 3.8.1 alpha 3	2013-11-12 15:16:55 +01:00
Romain Neutron	866a3e94e0	Fix events manager eroneous notification availability detection	2013-11-12 15:16:55 +01:00
Romain Neutron	bea211074b	Fix #1571 : Cleanup user settings, fix user settings calls	2013-11-12 15:16:54 +01:00
Romain Neutron	9f2f1a4217	Fix #1573 : Propose rights reset prior apply template ... Conflicts: templates/web/admin/index.html.twig	2013-11-12 13:29:30 +01:00
Romain Neutron	b5e944caf0	Fix #1579 : Update old geonames server address	2013-11-08 11:52:43 +01:00
Romain Neutron	f8411a604e	Fix patch naming mess	2013-11-07 17:49:39 +01:00
Romain Neutron	95b0c24d4b	Use semver for Phraseanet version numbers	2013-11-07 17:49:39 +01:00
Romain Neutron	973e9f7907	Merge pull request #759 from jygaulier/3.8-utest-disconnected ... added tests for "phrasea_public_query" and "phrasea_highlight" in consol...	2013-11-05 09:06:08 -08:00
Romain Neutron	05485308ae	Fix #1567 : Disallow a user to remove himself from DB	2013-11-05 15:51:50 +01:00
Romain Neutron	68cba5d061	Merge pull request #755 from romainneutron/fix-disconnection ... [3.8] Fix disconnection on session delete	2013-11-05 06:07:27 -08:00
Romain Neutron	c158637875	Merge pull request #756 from romainneutron/fix-memcached-cache ... [3.8] Add cache provider for memcached extension	2013-11-05 06:07:08 -08:00
Romain Neutron	ed3f31b01d	Fix #1563 : Explicitely declare the default environment to be Application::ENV_PROD	2013-11-05 10:53:32 +01:00
jygaulier	1f5e4da841	added tests for "phrasea_public_query" and "phrasea_highlight" in console/checkExtension	2013-11-04 19:36:29 +01:00
Romain Neutron	ab512540ca	Add cache provider for memcached extension	2013-11-04 19:11:36 +01:00