hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 20:43:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,700 Commits 268 Branches 107 Tags
7f97445b51f32446cb8befe01db66df6aac635c7
Commit Graph

2444 Commits

Author SHA1 Message Date
Romain Neutron
25bade7a47 Merge branch 'ArchTaskStops' of https://github.com/jygaulier/Phraseanet into jygaulier-ArchTaskStops 2013-12-09 14:14:19 +01:00
Nicolas Le Goff
d58d74d5fc Fix #1613 Can not launch lightbox 2013-12-06 17:53:23 +01:00
Jean-Yves Gaulier
403a4e4127 Task archive may stop if maxmemory > 25Mo 2013-12-05 18:35:43 +01:00
Romain Neutron
018e624298 Merge branch '3.8' 
Conflicts:
	lib/classes/base.php
 2013-12-04 14:52:40 +01:00
Romain Neutron
d6e2a604ba Fix patch execution order 2013-12-04 14:21:38 +01:00
Romain Neutron
1ba41c4421 Fix latest merge 2013-12-04 08:20:58 +01:00
Romain Neutron
e0c1f600dd Merge branch '3.8' 
Conflicts:
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Core/Version.php
	lib/Doctrine/Repositories/SessionRepository.php
	lib/classes/User/Adapter.php
 2013-12-03 21:32:46 +01:00
Romain Neutron
e70e35ae04 Merge pull request #810 from romainneutron/fix-1594 
[3.8] Fix 1594 : Removed users are not disconnected
 2013-12-03 12:21:30 -08:00
Romain Neutron
7904a33e07 Fix CS 2013-12-03 21:01:43 +01:00
Romain Neutron
1af21b88ef Fix CS 2013-12-03 20:59:47 +01:00
Romain Neutron
0575d6da44 Bump to version 3.9.0-alpha.9 2013-12-03 20:06:49 +01:00
Romain Neutron
680643c0fc Fix unit tests and arrays declaration 2013-12-03 20:06:49 +01:00
Romain Neutron
199134c25a Add cached translation loader 2013-12-03 20:05:21 +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
e4c43b8622 Use TranslationServiceProvider, fix use of form_div_layout 2013-12-03 20:02:39 +01:00
Romain Neutron
7a8f77c569 Fix #1594 : Removed users are not disconnected 2013-12-03 18:22:14 +01:00
Romain Neutron
15fbe40b6e Merge pull request #794 from nlegoff/fix1562 
Fix #1562 Migration Error
 2013-11-22 00:20:29 -08:00
Romain Neutron
ddaca15070 Merge pull request #799 from romainneutron/code-comments 
[3.9] Remove commented code
 2013-11-20 10:05:22 -08:00
Romain Neutron
6ab51d55f8 Add missing headers 2013-11-20 19:03:55 +01:00
Romain Neutron
051d9f4035 Remove license comments 2013-11-20 16:49:29 +01:00
Romain Neutron
cae61dfe1e Remove commented code 2013-11-20 16:04:20 +01:00
Nicolas Le Goff
fba6b2500f Fix #1562 MigrationError 2013-11-20 15:58:32 +01:00
Romain Neutron
8663f49228 Merge branch '3.8' 
Conflicts:
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Core/Version.php
 2013-11-20 15:53:50 +01:00
Romain Neutron
be0815a9e0 Fix typo 2013-11-20 12:48:29 +01:00
Romain Neutron
3738d1ff8c Fix CS 2013-11-20 12:20:32 +01:00
Romain Neutron
7e0a3c7338 Use configuration property accessor 2013-11-18 18:48:27 +01:00
Romain Neutron
a0a2fc8d41 Fix CS 2013-11-18 17:09:21 +01:00
Nicolas Le Goff
5b955b2a22 Fix neutron's comments 2013-11-18 16:22:28 +01:00
Nicolas Le Goff
98fee5038b Use short array syntax 2013-11-18 14:40:20 +01:00
Nicolas Le Goff
1cde667730 Remove PreSchema Upgrader 2013-11-18 14:37:25 +01:00
Nicolas Le Goff
4c58b141ee Fix neutron comments 2013-11-18 14:37:16 +01:00
Nicolas Le Goff
d8ea06b521 Fix migration 2013-11-18 14:36:45 +01:00
Nicolas Le Goff
57c9e6e453 Fix patch version 2013-11-18 14:35:39 +01:00
Nicolas Le Goff
6d2530295c Patch CS consistency 2013-11-18 14:35:39 +01:00
Nicolas Le Goff
99d4895f57 Add DoctrineMigration Patch 2013-11-18 14:35:38 +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
d2054f5909 Merge branch '3.8' 
Conflicts:
	CHANGELOG.md
 2013-11-15 11:28:21 +01:00
Romain Neutron
fa860310e6 Fix latest patch 2013-11-15 11:15:07 +01:00
Romain Neutron
3451895515 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Core/Version.php
 2013-11-14 17:52:52 +01:00
Romain Neutron
fda56a74c9 Merge pull request #774 from romainneutron/basket-manipulator 
[3.9] Add basket converter
 2013-11-14 08:51:35 -08:00
Romain Neutron
e2602da9b6 Merge pull request #786 from romainneutron/fix-1572 
[3.8] Fix #1572 : Add configuration customization
 2013-11-14 08:51:19 -08:00
Romain Neutron
22168ba3bf Fix #1572 : Add configuration customization 2013-11-14 17:10:53 +01:00
Romain Neutron
84c444c186 Fix editing default user settings 2013-11-14 13:29:49 +01:00
Romain Neutron
2bbbf73314 Merge pull request #783 from romainneutron/composed-db-queries 
[3.9] Fix some sql compositions
 2013-11-13 22:49:02 -08:00
Romain Neutron
d974da8be1 Remove user specific files from gitignore 2013-11-13 17:55:31 +01:00
Romain Neutron
a5c7695ace Fix some sql compositions 2013-11-13 17:54:17 +01:00
Romain Neutron
3548421160 Add basket converter 2013-11-13 17:52:12 +01:00