hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-10 19:43:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,515 Commits 268 Branches 107 Tags
212b09afa290fe85b09d43af4646fad89047339d
Commit Graph

294 Commits

Author SHA1 Message Date
Romain Neutron
a805c94524 Merge branch '3.8' 
Conflicts:
	composer.json
	composer.lock
	lib/classes/task/Scheduler.php
 2013-10-21 19:05:37 +02:00
Romain Neutron
7bfe89a15e Merge pull request #695 from jygaulier/3.8-fix1496 
[WIP][3.8] fix #1496
 2013-10-21 09:47:07 -07:00
Romain Neutron
0fa375b9bc Merge branch '3.8' 
Conflicts:
	composer.json
	composer.lock
	lib/classes/task/Scheduler.php
 2013-10-18 15:01:47 +02:00
Romain Neutron
f1db13cede Fix #1540 : Unable to start scheduler on Windows platform 2013-10-17 13:55:58 +02:00
jygaulier
f32d561c98 fix #1496 2013-10-14 16:58:32 +02:00
Romain Neutron
7e8a34c599 Merge branch '3.8' 
Conflicts:
	bin/developer
	build-env.sh
	composer.json
	composer.lock
 2013-10-10 13:42:42 +02:00
Romain Neutron
5996e590bc Reset exiftool writer before writing 2013-10-09 12:18:16 +02:00
Romain Neutron
1dfbff5666 Merge branch '3.8' 
Conflicts:
	CHANGELOG.md
	bin/developer
	lib/classes/module/console/systemUpgrade.php
	www/skins/report/jquery-ui.css
 2013-10-03 15:29:22 +02:00
Nicolas Le Goff
b66da8861a Fix #1499 Increase default task memory overflow 2013-10-03 14:29:27 +02:00
Romain Neutron
eb590780ca Fix CS 2013-09-30 18:26:32 +02:00
Romain Neutron
f85641efd1 Fix archive task default settings 2013-09-14 02:10:12 +02:00
Romain Neutron
28367c9007 Fix archive task default settings 2013-09-13 10:42:17 +02:00
Romain Neutron
2c7073182a Fix CS 2013-09-12 13:55:31 +02:00
Romain Neutron
79f8c82478 Merge pull request #619 from romainneutron/sleep 
[3.9] Remove sleep calls
 2013-09-04 06:36:48 -07:00
Romain Neutron
5ed53ccda3 Remove sleep calls 2013-09-04 14:51:00 +02:00
Romain Neutron
def7a2d66c Remove debug statements 2013-09-04 14:12:56 +02:00
Romain Neutron
b6a8a90197 Fix CS 2013-09-04 12:14:52 +02:00
Romain Neutron
dbd06e9091 Remove dead code 2013-09-04 12:14:50 +02:00
Romain Neutron
c8d415c562 Merge branch '3.8' 2013-09-02 17:22:18 +02:00
Romain Neutron
7988114614 Fix #1430 : Use strict standards, declare the method static 2013-09-02 12:21:11 +02:00
Romain Neutron
9804e3b4c3 Switch to FtpExport entities 2013-08-30 18:35:21 +02:00
Romain Neutron
400a4d2505 Merge pull request #595 from romainneutron/task-manager-fix 
[3.9] Task manager fix
 2013-08-30 07:35:46 -07:00
Romain Neutron
2f25438588 Fix usage of task manager in strict standards context 2013-08-30 14:57:45 +02:00
Romain Neutron
447cb60327 Fix CS 2013-08-30 13:48:13 +02:00
Romain Neutron
b55c8ec61d Allow thumbnail extraction configuration 2013-08-07 15:49:48 +02:00
Romain Neutron
7cca109633 Tweak code 2013-08-07 14:22:54 +02:00
Nicolas Le Goff
61581c5c99 adressed @romainneutron's comments 2013-08-07 12:01:58 +02:00
Nicolas Le Goff
5aeeaa813f Fix unit tests 2013-08-07 12:01:57 +02:00
Nicolas Le Goff
d413394027 Fix #1380 Add default settings for periodic tasks 2013-08-06 19:12:10 +02:00
Nicolas Le Goff
16c100ecbc Fix #1383 Task list is empty 2013-08-05 14:53:25 +02:00
Romain Neutron
439de91a4e Use PhpExecutableFinder to find PHP binary 2013-07-23 16:56:23 +02:00
jygaulier
a920832d5a CS 2013-07-18 19:38:23 +02:00
Romain Neutron
7dfd6f842d Revert use of custom PHP.INI 2013-07-10 19:44:48 +02:00
Romain Neutron
cb17dfbb95 Fix strings 2013-07-10 12:06:04 +02:00
Romain Neutron
0ac3f325f4 Update Phrasea indexer task locales 2013-07-04 14:57:57 +02:00
Nicolas Le Goff
1b5e8c326b Fix inscription issue 2013-07-02 17:59:38 +02:00
Nicolas Le Goff
4972e16fb4 Bootstrap task html views 
Bootstarp tasks html views
 2013-07-02 17:34:38 +02:00
Romain Neutron
ce34bca408 Add second logging channel 2013-07-01 14:38:17 +02:00
Nicolas Le Goff
4fa166c846 Fix php detection 2013-06-27 16:24:27 +02:00
Romain Neutron
32875e6698 Remove support of binary paths by registry 2013-06-27 12:43:24 +02:00
Romain Neutron
6a1e63e317 Merge pull request #421 from romainneutron/rootpath 
[3.8] Remove registry's GV_RootPath calls
 2013-06-24 08:39:50 -07:00
Romain Neutron
3f47cc248d Remove registry's GV_RootPath calls 2013-06-19 19:25:16 +02:00
Romain Neutron
a97e4a4df4 Fix notification use 2013-06-19 16:47:23 +02:00
Romain Neutron
42db38d055 Add error pages, fix error handling and PHP conf 2013-06-17 17:01:35 +02:00
Romain Neutron
11a55bbd43 Add labels to databoxes 2013-06-13 09:45:43 +02:00
Romain Neutron
aebc63a01c Move phraseanet_indexer setting in configuration 2013-06-11 16:02:43 +02:00
Romain Neutron
c084f20f85 Labelize collections 2013-06-01 01:29:07 +02:00
Romain Neutron
6537b96f4c Add AuthenticationServiceProvider 2013-05-29 14:22:50 +02:00
jygaulier
a29a1e5055 fix #1095 : task archive crashed 2013-02-14 15:08:41 +01:00
jygaulier
2cdf93a31b added popup for option --sort-empty 2013-02-14 13:47:24 +01:00