hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-13 04:53:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,392 Commits 268 Branches 107 Tags
32b6423cbeb8e87aa699f06049c20b87e67b3297
Commit Graph

87 Commits

Author SHA1 Message Date
Nicolas Le Goff
589169299c Fix merge 3.8 2014-12-09 14:01:00 +01:00
Nicolas Le Goff
10a83bc6c4 Fix latest merge 2014-10-13 12:58:20 +02:00
Romain Neutron
c4bf6c3c67 Convert custom events to symfony events 2014-09-09 21:21:38 +02:00
Nicolas Le Goff
7eb1a506fa Merge branch '3.8' 
Conflicts:
	.gitignore
	.travis.yml
	Vagrantfile
	lib/Alchemy/Phrasea/Controller/Datafiles.php
	lib/Alchemy/Phrasea/Controller/Setup.php
	lib/Alchemy/Phrasea/Helper/DatabaseHelper.php
	lib/classes/connection/pdo.php
	lib/classes/task/period/subdef.php
	lib/classes/task/period/writemeta.php
	locale/de_DE/LC_MESSAGES/phraseanet.mo
	locale/de_DE/LC_MESSAGES/phraseanet.po
	locale/en_GB/LC_MESSAGES/phraseanet.mo
	locale/en_GB/LC_MESSAGES/phraseanet.po
	locale/fr_FR/LC_MESSAGES/phraseanet.mo
	locale/fr_FR/LC_MESSAGES/phraseanet.po
	locale/nl_NL/LC_MESSAGES/phraseanet.mo
	locale/nl_NL/LC_MESSAGES/phraseanet.po
	locale/phraseanet.pot
	templates/web/setup/step2.html.twig
	vagrant/vms/phraseanet-php54-nginx/puphpet/config.yaml
	vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-always/setup
	vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-once/setup
	vagrant/vms/phraseanet-php54-nginx/puphpet/shell/important-notices.txt
	vagrant/vms/phraseanet-php54-nginx/puphpet/shell/self-promotion.txt
 2014-09-09 15:05:13 +02:00
Nicolas Le Goff
de7988689e Update directory structure & allow to configure paths (tmp, log, cache) 2014-09-05 15:57:00 +02:00
Nicolas Le Goff
7814ae42d1 Fix latest merge 2014-08-19 17:22:48 +02:00
Nicolas Le Goff
66fa05f4ee Fix CS 2014-07-17 15:17:04 +02:00
Nicolas Le Goff
1970439edb Fix latest merge 2014-06-24 16:40:12 +02:00
Nicolas Le Goff
3bdb63f94e Fix latest merge 2014-06-24 00:34:07 +02:00
Nicolas Le Goff
0d040519f3 Add third party application webhook event 2014-06-23 17:48:42 +02:00
Nicolas Le Goff
244a845752 Merge branch '3.8' 
Conflicts:
	lib/classes/task/period/archive.php
 2014-03-10 17:13:02 +01:00
Nicolas Le Goff
5e1830eb1f Merge branch '3.8' 
Conflicts:
	lib/classes/task/period/archive.php
 2014-03-10 14:00:40 +01:00
Romain Neutron
b48d95d6a5 Remove unused functions 2014-03-05 02:45:10 +01:00
Romain Neutron
3cd43708b0 Merge pull request #990 from romainneutron/repositories-as-services 
[Ready][3.9] Repositories as services
 2014-03-01 15:49:24 +01:00
Romain Neutron
d8e4ea5a41 Use short array notation 2014-03-01 14:44:53 +01:00
Romain Neutron
b836dc8632 Fix CS 2014-03-01 14:40:03 +01:00
Romain Neutron
06f29575c7 Fix hidden use of repositories 2014-02-28 20:02:24 +01:00
Romain Neutron
4d4f7ec5da Improve live notifier response time for tasks list 2014-02-28 03:39:28 +01:00
Nicolas Le Goff
5d1dce1a99 Merge pull request #977 from romainneutron/fix-live-notifier 
[3.9] Improve live notifier
 2014-02-28 00:28:47 +01:00
Romain Neutron
3a47b922ed Improve notifier 2014-02-27 15:49:15 +01:00
Nicolas Le Goff
3348347072 Fix task live informations 2014-02-25 18:53:17 +01:00
Nicolas Le Goff
4535491e6c Merge pull request #965 from romainneutron/host-configuration 
[3.9] Add configuration per host
 2014-02-24 12:30:26 +01:00
Romain Neutron
5a5da77662 Use Doctrine DBAL instead of custom connection 2014-02-22 23:55:12 +01:00
Romain Neutron
de13d874a3 Fix configuration usage 2014-02-22 10:39:07 +01:00
Nicolas Le Goff
678f741660 Use Short Array notation 2014-02-19 17:28:54 +01:00
Nicolas Le Goff
c156f842c7 Remove User_Adapter 2014-02-19 17:28:53 +01:00
Nicolas Le Goff
2aba3e8d8d Merge pull request #957 from romainneutron/doctrine-namespace 
[3.9] Add a namespace to Phraseanet doctrine entities
 2014-02-19 11:37:09 +01:00
Romain Neutron
2de870c3f9 Add a namespace to Phraseanet doctrine entities 2014-02-18 19:32:08 +01:00
Romain Neutron
621bf7feec Prepend exec to commands 2014-02-17 12:30:04 +01:00
Romain Neutron
2a534615bb Update taskmanager versions 2014-02-17 12:30:03 +01:00
Romain Neutron
9238a939b3 Minimal fix for callback declaration 2014-02-15 11:38:51 +01:00
Nicolas Le Goff
095c9eb72f Merge branch '3.8' 
Conflicts:
	lib/classes/task/period/RecordMover.php
 2014-02-03 19:13:45 +01:00
Romain Neutron
e840df0b36 Decouple caption and its serialization 2014-01-27 20:12:13 +01:00
Romain Neutron
91cf9705ab Add subdef substituer 2014-01-14 15:05:44 +01:00
Romain Neutron
d7f7e1c92c Fix CS 2014-01-14 12:04:38 +01:00
Romain Neutron
354232f61a Bump copyright year 2014-01-06 15:40:56 +01:00
Romain Neutron
0858586ceb Add subdef generator service 2013-12-26 17:00:16 +01:00
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
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
680643c0fc Fix unit tests and arrays declaration 2013-12-03 20:06:49 +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
Romain Neutron
7e0a3c7338 Use configuration property accessor 2013-11-18 18:48:27 +01:00
Romain Neutron
56b373ee6e Use short array declaration 2013-11-18 13:57:33 +01:00
Romain Neutron
d40b1d4fb1 Fix CS 2013-11-18 13:07:40 +01:00
Romain Neutron
13915dc1a8 Rename "phraseanet.configuration" service to "configuration" 2013-11-15 22:08:07 +01:00
Romain Neutron
3e9f3418ce Remove dead code 2013-11-13 14:54:47 +01:00
Romain Neutron
954ba1c0b4 Remove test functions in loop whenever it's possible 2013-11-13 14:32:02 +01:00
Romain Neutron
fdde1ebd8a Fix entities namespace 2013-11-04 11:56:30 +01:00
Romain Neutron
f11bf65c35 Fix entities namespace 2013-11-04 11:26:52 +01:00