hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,102 Commits 268 Branches 107 Tags
233940d1139a31489c9c16a4652f4b48f82a2025
Commit Graph

8102 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Le Goff
233940d113 Improve VM build 2014-09-08 16:35:58 +02:00
Nicolas Le Goff
792e29a307 Merge pull request #1141 from nlegoff/log-path 
[3.9][READY] Update file structure
 2014-09-05 17:07:52 +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
69fd50906f Merge pull request #1142 from nlegoff/sphinx-tests 
[3.9] Remove sphinx search engine tests
 2014-09-03 09:29:44 +02:00
Nicolas Le Goff
fc2f49d012 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Thesaurus/Thesaurus.php
	lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.php
	lib/classes/connection.php
	lib/classes/connection/abstract.php
	lib/classes/connection/interface.php
	lib/classes/connection/pdo.php
	lib/classes/connection/pdoStatementDebugger.php
	lib/classes/module/report/activity.php
	lib/classes/module/report/sqlfilter.php
	lib/classes/record/adapter.php
	lib/classes/task/period/subdef.php
	templates/web/prod/thesaurus.js.twig
	tests/Alchemy/Tests/Phrasea/Setup/InstallerTest.php
	tests/classes/PhraseanetPHPUnitAbstract.php
	tests/classes/connectionTest.php
 2014-09-02 19:09:38 +02:00
Nicolas Le Goff
d670de6b94 Merge pull request #1140 from jygaulier/speedup_thesaurus_prod 
[3.8][PHRAS-36] Speedup thesaurus prod
 2014-09-02 18:57:59 +02:00
Nicolas Le Goff
a4ecb3d6aa Remove sphinx search engine tests 2014-09-02 18:18:26 +02:00
Nicolas Le Goff
f2d0533b01 Fix patch migration 2014-09-02 18:17:00 +02:00
Jean-Yves Gaulier
415ec0d7a0 speedup hit compute (green digits in prod/thesaurus) 2014-09-02 13:44:36 +02:00
Jean-Yves Gaulier
6e9c6d9480 clean 2014-09-02 13:44:36 +02:00
Jean-Yves Gaulier
31401364f0 speedup occurences calc 2014-09-02 13:44:36 +02:00
Jean-Yves Gaulier
6fbe66829c phras-36 #time 4h 
first proto, wip do not merge
 2014-09-02 13:44:36 +02:00
Nicolas Le Goff
e553690166 Merge pull request #1136 from nlegoff/fix-114 
[3.8.6][PHRAS-114] Add candidate in thesaurus
 2014-09-01 11:07:22 +02:00
Nicolas Le Goff
85952a0c11 Merge pull request #1138 from nlegoff/fix-38issue 
[3.8.6] minor issues
 2014-09-01 11:06:48 +02:00
Nicolas Le Goff
ce6bc3d5e1 Fix minor issues 2014-08-29 18:07:48 +02:00
Nicolas Le Goff
0279e80621 Merge pull request #1137 from jygaulier/fix-PHRAS-65 
fix bug in firefox
 2014-08-28 12:33:31 +02:00
Jean-Yves Gaulier
2bffbc77b5 fix bug in firefox 2014-08-28 11:50:12 +02:00
Nicolas Le Goff
6e0d79e847 Merge pull request #1045 from nlegoff/refactor-connection 
[3.8.6][PHRAS-71] Add reconnectable statement
 2014-08-26 17:27:19 +02:00
Nicolas Le Goff
d2ff7b8c26 PHRAS-114 #fix Add candidate in thesaurus 2014-08-26 17:23:32 +02:00
Nicolas Le Goff
232046605d Fix tests 2014-08-26 16:45:14 +02:00
Nicolas Le Goff
6f66f1de19 Add reconnectable statement 2014-08-26 16:42:56 +02:00
Nicolas Le Goff
aca7732af9 Merge branch '3.8' 
Conflicts:
	lib/classes/task/period/subdef.php
 2014-08-26 15:40:41 +02:00
Nicolas Le Goff
cc276db6bd Merge pull request #1116 from jygaulier/fix-PHRAS-65 
[3.8.6][PHRAS-65] Subdef creation by type
 2014-08-26 13:39:21 +02:00
Nicolas Le Goff
b9bb9f5f0e Merge branch '3.8' 
Conflicts:
	.gitignore
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/databox.php
	lib/classes/task/abstract.php
	lib/classes/task/manager.php
	lib/classes/task/period/subdef.php
	lib/classes/task/period/writemeta.php
	lib/conf.d/bases_structure.xml
	templates/web/admin/tasks/list.html.twig
 2014-08-26 13:38:01 +02:00
Jean-Yves Gaulier
426f71f935 PHRAS-65 #time 1j 
création des subdefs par base/type
 2014-08-26 11:45:43 +02:00
Nicolas Le Goff
d44eea20a6 Merge pull request #1105 from nlegoff/crossdomain 
[READY][3.8.6][PHRAS-25] Crossdomain command generator
 2014-08-22 18:52:40 +02:00
Nicolas Le Goff
e67432399b Merge pull request #1118 from jygaulier/3.8-PHRAS-64 
[3.8.6][PHRAS-64] Delete progression of subdef task, print the number of remaining subdefs to do
 2014-08-22 18:49:38 +02:00
Nicolas Le Goff
d21d7fdab5 Merge pull request #1135 from nlegoff/fix-38-merges 
[3.9] Fix build
 2014-08-22 18:46:34 +02:00
Nicolas Le Goff
baf3172fab Fix configuration template 2014-08-21 14:15:11 +02:00
Jean-Yves Gaulier
b34555d4a1 PHRAS-64 #time 1h 
fix version back
 2014-08-20 16:11:22 +02:00
Jean-Yves Gaulier
eddbc39a05 PHRAS-64 #time 1h 
patch changed to structure
 2014-08-20 16:09:22 +02:00
Nicolas Le Goff
f32b382d14 Update proxies 2014-08-20 15:15:20 +02:00
Nicolas Le Goff
6485b64e68 Fix latest merge 2014-08-20 15:13:41 +02:00
Jean-Yves Gaulier
2274e4ebc9 PHRAS-64 #time 1h 
add patch for appbox.task2
 2014-08-20 14:15:25 +02:00
Jean-Yves Gaulier
42b019b857 PHRAS-64 #time 1h 
add patch for appbox.task2
 2014-08-20 14:06:18 +02:00
Jean-Yves Gaulier
33b8451978 PHRAS-64 #time 1,5j 
delete progress bars for tasks / add subdefs stats for base
 2014-08-20 14:06:18 +02:00
Nicolas Le Goff
bd52dae1db Update travis.yml 2014-08-20 11:03:37 +02:00
Nicolas Le Goff
7814ae42d1 Fix latest merge 2014-08-19 17:22:48 +02:00
Nicolas Le Goff
9494738c12 Merge branch '3.8' 
Conflicts:
	lib/classes/task/period/RecordMover.php
 2014-08-19 17:20:31 +02:00
Nicolas Le Goff
64a2201d08 Merge pull request #1112 from jygaulier/fix-PHRAS-164 
[3.8.6][PHRAS-164] Allow sorting on 'number' fields
 2014-08-19 16:50:18 +02:00
Nicolas Le Goff
c6da3855c7 Merge pull request #1095 from jygaulier/fix-phras-141 
[3.8.6][PHRAS-141] Delete action is not taken into account for tasks
 2014-08-19 16:43:26 +02:00
Nicolas Le Goff
f6f2dbc22d Add crossdomain parser 2014-08-19 16:35:57 +02:00
Nicolas Le Goff
bc88d0f474 Add crossdomain file generator command 2014-08-19 16:35:57 +02:00
Nicolas Le Goff
e04fd903bc Fix latest merge 2014-08-19 15:38:49 +02:00
Nicolas Le Goff
46da7be65d Merge branch '3.8' 
Conflicts:
	.travis.yml
	bin/developer
	build-env.sh
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Core/Provider/LocaleServiceProvider.php
	tests/Alchemy/Tests/Phrasea/Command/Setup/XSendFileMappingGeneratorTest.php
	tests/Alchemy/Tests/Phrasea/Controller/SetupTest.php
	tests/Alchemy/Tests/Phrasea/Form/Login/PhraseaRegisterFormTest.php
 2014-08-19 15:30:25 +02:00
Nicolas Le Goff
6ee8d2bab3 Merge pull request #1121 from nlegoff/ini-command 
[READY][3.8.6] Add developer command to reset environment
 2014-08-19 15:10:59 +02:00
Nicolas Le Goff
db9e77a5c1 Merge pull request #1134 from nlegoff/up-vm 
[READY][3.8.6] Update VM
 2014-08-19 15:09:46 +02:00
Nicolas Le Goff
5ec4a4313b Set cpus defzult value to 2 2014-08-19 15:08:12 +02:00
Nicolas Le Goff
716b6998a4 Set cache file sd 2014-08-19 15:07:36 +02:00
Nicolas Le Goff
5c02c25264 Update vm 2014-08-19 15:02:04 +02:00