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
|
4fa1f613e4
|
Fix latest merge
|
2014-08-13 17:40:40 +02:00 |
|
Nicolas Le Goff
|
cf2105865b
|
Fix tests
|
2014-03-05 15:33:23 +01:00 |
|
Nicolas Le Goff
|
1b0aac5963
|
Bind subscriberManager object to task manager application
|
2014-03-05 15:33:22 +01:00 |
|
Nicolas Le Goff
|
3a5e309dee
|
Rename task option from configuration to status
|
2014-03-05 15:33:21 +01:00 |
|
Nicolas Le Goff
|
0a2d4fe04d
|
Bind task manager backbone app to websocket using autobahn
|
2014-03-05 15:33:21 +01:00 |
|
Nicolas Le Goff
|
7025e756bc
|
Use backbone to display taskmanager front end
|
2014-02-14 16:55:45 +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
|
16c1930ca0
|
Update templates to fit the new translator
|
2013-12-03 20:02:40 +01:00 |
|
Romain Neutron
|
e7421e1fdd
|
Fix twig tags
|
2013-12-03 20:02:39 +01:00 |
|
Romain Neutron
|
6ef6387abf
|
Address comments
|
2013-10-29 18:46:36 +01:00 |
|
Romain Neutron
|
fafc7c334c
|
Use Job Id instead of classname in DB
|
2013-10-29 18:42:46 +01:00 |
|
Romain Neutron
|
156ec3dc6d
|
Fix templates
|
2013-10-29 18:41:44 +01:00 |
|
Romain Neutron
|
d2c7b00298
|
Add task log template
|
2013-10-29 18:41:44 +01:00 |
|
Romain Neutron
|
865e89bf64
|
Update templates
|
2013-10-29 18:41:43 +01:00 |
|
Romain Neutron
|
9ef3c22df2
|
Add RecordMover job
|
2013-10-29 18:41:41 +01:00 |
|
Romain Neutron
|
fd55f15f93
|
Add Archive task
|
2013-10-29 18:41:41 +01:00 |
|
Romain Neutron
|
ae891151d1
|
Add Phraseanet Indexer job
|
2013-10-29 18:41:41 +01:00 |
|
Romain Neutron
|
14b3a39ca2
|
Add FtpPull job
|
2013-10-29 18:41:40 +01:00 |
|
Romain Neutron
|
e57e11de8e
|
Add Subdefs job
|
2013-10-29 18:41:40 +01:00 |
|
Romain Neutron
|
c319bce1fe
|
Add WriteMetadata job
|
2013-10-29 18:41:40 +01:00 |
|
Romain Neutron
|
c2ac476240
|
Add Ftp job
|
2013-10-29 18:41:40 +01:00 |
|