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
6,825 Commits 268 Branches 107 Tags
431d2532e262c5adcb94b29242e7a72bea9eea10
Commit Graph

6825 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Le Goff
431d2532e2 UseDoctrineMigrationServiceProvider 2013-11-18 14:33:44 +01:00
Nicolas Le Goff
c3947844e0 Add doctrine migration commands 2013-11-18 14:33:44 +01:00
Nicolas Le Goff
dec0ae91c9 Add DoctrineMigrationProvider 2013-11-18 14:33:43 +01:00
Nicolas Le Goff
1da2a68f93 Update composer 2013-11-18 14:33:43 +01:00
Romain Neutron
d776462f46 Merge pull request #790 from romainneutron/property-access 
[3.9] Add configuration property access
 2013-11-18 05:32:25 -08:00
Romain Neutron
736610724b Merge pull request #791 from romainneutron/master-5.4 
[3.9] Drop PHP 5.3 support
 2013-11-18 05:31:38 -08:00
Romain Neutron
053b23a936 Update compiler to use short array declaration 2013-11-18 13:57:33 +01:00
Romain Neutron
56b373ee6e Use short array declaration 2013-11-18 13:57:33 +01:00
Romain Neutron
2898b317c4 Drop PHP 5.3 support 2013-11-18 13:08:30 +01:00
Romain Neutron
d40b1d4fb1 Fix CS 2013-11-18 13:07:40 +01:00
Romain Neutron
53066ab389 Add configuration property access 2013-11-18 13:01:26 +01:00
Romain Neutron
aeac80a52f Merge pull request #789 from romainneutron/configuration-service 
[3.9] Rename "phraseanet.configuration" service to "configuration"
 2013-11-18 03:58:37 -08:00
Romain Neutron
13915dc1a8 Rename "phraseanet.configuration" service to "configuration" 2013-11-15 22:08:07 +01:00
Romain Neutron
e0a8bec422 Merge branch '3.8' 
Conflicts:
	CHANGELOG.md
 2013-11-15 19:05:56 +01:00
Romain Neutron
e055f01019 Fix typo 2013-11-15 19:05:04 +01:00
Romain Neutron
b973e40577 Merge branch '3.8' 
Conflicts:
	CHANGELOG.md
	bower.json
	lib/Alchemy/Phrasea/Core/Version.php
 2013-11-15 19:04:45 +01:00
Romain Neutron
88b4df745b Prepare version 3.8.2 3.8.2 2013-11-15 17:45:47 +01:00
Romain Neutron
60d4ee03e6 Fix html escaping 2013-11-15 16:09:43 +01:00
Romain Neutron
5d79ff40a1 Prepare version 3.8.1 3.8.1 2013-11-15 12:18:14 +01:00
Romain Neutron
d2054f5909 Merge branch '3.8' 
Conflicts:
	CHANGELOG.md
 2013-11-15 11:28:21 +01:00
Romain Neutron
bbe9645373 Merge pull request #788 from romainneutron/changelog 
[3.8] Update changelog
 2013-11-15 02:26:58 -08:00
Romain Neutron
2e5b6595df Update changelog 2013-11-15 11:25:46 +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
ae366c533c Merge pull request #787 from romainneutron/conf-fixes 
[3.8] Conf fixes
 2013-11-14 07:13:23 -08:00
Romain Neutron
c1bf2c1a07 Upgrade latest locale catalog 2013-11-14 14:11:07 +01:00
Romain Neutron
ea703c3312 Add latest translations 2013-11-14 14:09:25 +01:00
Romain Neutron
aa788c1bfe Merge branch '3.8' 2013-11-14 13:32:47 +01:00
Romain Neutron
84c444c186 Fix editing default user settings 2013-11-14 13:29:49 +01:00
Romain Neutron
7ce719a00b Fix locale service provider 2013-11-14 13:29:31 +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
c07a024a3d Merge pull request #784 from romainneutron/insight-recommendations 
[3.9] Insight recommendations
 2013-11-13 22:48:33 -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
Romain Neutron
943e174aed Merge pull request #785 from romainneutron/fix-1563 
[3.8] Fix #1563 : Set default CLI environment to `prod`
 2013-11-13 08:36:21 -08:00
Romain Neutron
ccfe58b3fb Fix #1563 : Set default CLI environment to prod 2013-11-13 17:13:01 +01:00
Romain Neutron
dca6667052 Merge branch '3.8' 2013-11-13 17:07:45 +01:00
Romain Neutron
73e0d5cb6b Remove thesaurus patchs globals, cleanup 2013-11-13 14:54:47 +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
694aecf752 Merge pull request #781 from nlegoff/fix1570_bis 
[3.8] Fix #1570 Remove accept tou link if there are no TOU
 2013-11-12 11:16:53 -08:00
Romain Neutron
21f0df2cfe Merge pull request #779 from romainneutron/http-request 
[3.9] Remove http_request
 2013-11-12 11:16:04 -08:00
Nicolas Le Goff
7c36829f11 Fix #1570 Remove accept tou link if there are no TOU 2013-11-12 19:59:54 +01:00
Romain Neutron
d7a68dbec3 Remove http_request 2013-11-12 19:39:22 +01:00
Romain Neutron
5a4b9e5f5f Fix unit tests 2013-11-12 19:38:43 +01:00
Romain Neutron
4963349ce3 Fix latest merge 2013-11-12 19:30:56 +01:00