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

30 Commits

Author SHA1 Message Date
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
a165907b95 Fix #1627 : FTP receiver does not get its email 2013-12-18 10:47:16 +01:00
Romain Neutron
680643c0fc Fix unit tests and arrays declaration 2013-12-03 20:06:49 +01:00
Romain Neutron
2ba164701d Use symfony translator 2013-12-03 20:02:40 +01:00
Romain Neutron
56b373ee6e Use short array declaration 2013-11-18 13:57:33 +01:00
Romain Neutron
baecfdceb3 Move entities to Phrasea namespace 2013-10-29 16:56:49 +01:00
Romain Neutron
c33b325666 Fix #1487 : Fix feedback request messages 2013-09-25 11:01:21 +02:00
Romain Neutron
fac302dcbd Fix #1479 : Add validation duration in mail body 2013-09-19 14:39:16 +02:00
Romain Neutron
2427b7a6b4 Fix #1265 : Provide login in forgot password email 2013-07-10 12:39:04 +02:00
Romain Neutron
10ea4c26c8 Merge pull request #419 from romainneutron/mails-fix 
[3.8] Fix notification use
 2013-06-20 05:04:12 -07:00
Romain Neutron
a97e4a4df4 Fix notification use 2013-06-19 16:47:23 +02:00
Romain Neutron
ca519612c6 Merge pull request #415 from romainneutron/locale 
[3.8] Update locales
 2013-06-18 06:33:20 -07:00
Romain Neutron
4fb39ff503 Update locales 2013-06-17 23:33:01 +02:00
Romain Neutron
784e454311 Update emails notifications 2013-06-17 19:37:52 +02:00
Romain Neutron
4161ef2e31 Use url generator everywhere 2013-06-13 09:44:16 +02:00
Romain Neutron
53206af159 Fix CS lib/Alchemy 2013-01-29 16:38:00 +01:00
Romain Neutron
309a0a9472 Add better exception handling for emails 2013-01-29 11:32:43 +01:00
Romain Neutron
0adc141198 Add doc blocks 2013-01-29 11:03:31 +01:00
Romain Neutron
348e7ed98e Remove setQuantity to MailInfoPushReceived 2013-01-29 11:03:21 +01:00
Romain Neutron
aa18c48306 Fix unit tests 2013-01-29 09:34:20 +01:00
Romain Neutron
028856714d Emitter and Receiver now throws exception in case an user without email is sent 2013-01-29 09:34:19 +01:00
Romain Neutron
567195c198 Add unit tests for mail notifications 2013-01-29 09:34:18 +01:00
Romain Neutron
a777aedc49 Add AbstractMailTest 2013-01-29 09:34:18 +01:00
Romain Neutron
ed80a230b4 Add Interfaces doc blocks 2013-01-29 09:34:18 +01:00
Romain Neutron
1e9a419028 Add deliver tests 2013-01-29 09:34:18 +01:00
Romain Neutron
1136b14fae Add Emitter/Receiver tests 2013-01-29 09:34:18 +01:00
Romain Neutron
a2142abd20 Add missing return 2013-01-29 09:34:18 +01:00
Romain Neutron
9cce7ab8f9 Update notifications 2013-01-29 09:34:18 +01:00
Romain Neutron
b5980ab866 First implementation 2013-01-29 09:34:18 +01:00