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

50 Commits

Author SHA1 Message Date
Nicolas Le Goff
ed3ffb59a6 Merge remote-tracking branch 'upstream/master' into 20150306-elastic-indexer 
Conflicts:
	bin/console
	bower.json
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Border/Manager.php
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Core/PhraseaEvents.php
	lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php
	lib/classes/caption/field.php
	lib/classes/record/Interface.php
	templates/web/prod/index.html.twig
	www/skins/prod/000000/prodcolor.css
 2015-03-10 14:36:31 +01:00
Benoît Burnichon
9df9c44f1d Remove static-file key in Fixtures/configuration 2015-03-04 16:41:12 +01:00
Nicolas Le Goff
9a3e92ed9c Multiple ORMs for all database 2015-02-12 17:58:45 +01:00
Nicolas Le Goff
0c18434eb4 Fix latest merge 2014-12-10 17:31:07 +01:00
Nicolas Le Goff
392ff21d51 Clean 2014-12-04 11:48:08 +01:00
Nicolas Le Goff
7d39d4f71b Remove unusued files 2014-12-04 11:48:04 +01: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
6485b64e68 Fix latest merge 2014-08-20 15:13:41 +02:00
Nicolas Le Goff
4fa1f613e4 Fix latest merge 2014-08-13 17:40:40 +02:00
Nicolas Le Goff
1250f8ab0b Fix latest merge 2014-06-19 16:11:27 +02:00
Romain Neutron
122692f1e6 Fix latest merge 2014-03-03 17:49:06 +01:00
Romain Neutron
894c5fe620 Fix unit tests 2014-03-01 14:37:56 +01:00
Romain Neutron
08efd8ff72 Cleanup API 2014-02-28 00:38:12 +01:00
Romain Neutron
c3ec4ab857 Merge pull request #900 from nlegoff/replace_demand 
[3.9] Migrate registration table to doctrine entity && refactor registration API
 2014-02-27 16:08:17 +01:00
Nicolas Le Goff
2ec4ffdbcc Refactor && Typo && Use plain objects as function parameters instead of ids 2014-02-26 12:10:54 +01:00
Romain Neutron
878c96f6d4 Add access restriction 2014-02-25 19:00:53 +01:00
Romain Neutron
de13d874a3 Fix configuration usage 2014-02-22 10:39:07 +01:00
Romain Neutron
8a9b6d5d3c Update fixtures 2014-02-21 14:36:38 +01:00
Romain Neutron
c4efe6d548 Add host configuration 2014-02-21 14:36:38 +01:00
Nicolas Le Goff
c10c78f740 Fix unit tests 2014-02-19 17:29:26 +01:00
Romain Neutron
c5d3f97258 Fix PSR-0 file naming 2014-02-14 15:51:09 +01:00
Romain Neutron
d5f93e52fb Session management is now part of Phraseanet configuration 2014-01-13 17:44:47 +01:00
Romain Neutron
64456a8964 Remove phraseanet registry 2013-12-20 16:44:22 +01:00
Romain Neutron
6c45e8d40a Add improvements to unit tests 2013-12-20 10:51:35 +01:00
Romain Neutron
89dc1c5129 Add fixtures to sqlite db 2013-12-18 23:34:06 +01:00
Romain Neutron
a3b1ae7163 Fix unit test names, property and function visibility 2013-12-10 01:29:02 +01:00
Romain Neutron
4a7304435b Fix tests 2013-12-03 19:41:25 +01:00
Nicolas Le Goff
af94345f6c Update User entity 2013-11-28 18:00:05 +01:00
Nicolas Le Goff
0e69cd1bd4 Add DisplaySetting service 2013-11-27 12:01:25 +01:00
Nicolas Le Goff
98fee5038b Use short array syntax 2013-11-18 14:40:20 +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
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
53066ab389 Add configuration property access 2013-11-18 13:01:26 +01:00
Romain Neutron
c4a9f99c35 Update configurations 2013-10-29 18:46:35 +01:00
Romain Neutron
762f758705 Merge branch '3.8' 
Conflicts:
	bower.json
	lib/Alchemy/Phrasea/Controller/Prod/Feed.php
	lib/classes/Feed/Entry/Adapter.php
	lib/classes/Feed/Entry/Item.php
	lib/classes/eventsmanager/notify/feed.php
	tests/classes/Feed/Entry/Feed_Entry_ItemTest.php
 2013-10-24 14:05:04 +02:00
Romain Neutron
bef147eabc Ensure configuration is set up before trying to look for special conf 2013-07-17 21:56:55 +02:00
Romain Neutron
109a719a13 Fix tests 2013-07-17 13:43:19 +02:00
Romain Neutron
c1347618ac Fix #1240 : Remove authentication>auto-create>enabled parameter 2013-07-10 14:02:29 +02:00
Romain Neutron
70cb9ee06b Fix #1245 : Rename trials-before-failure configuration to trials-before-display 2013-07-10 12:53:47 +02:00
Nicolas Le Goff
8e31a692cb Enhance XSendFileMapping to handle apache 
Update xsendfile
 2013-07-02 17:33:12 +02:00
Romain Neutron
e155089cac Tweaks and fixes 2013-06-28 00:16:34 +02:00
Nicolas Le Goff
b5dbd37740 Adress last comment 2013-06-28 00:16:34 +02:00
Romain Neutron
21eea19074 Add compiler support for null values 2013-06-27 12:43:24 +02:00
Romain Neutron
42db38d055 Add error pages, fix error handling and PHP conf 2013-06-17 17:01:35 +02:00
Romain Neutron
f0b30f0a76 Update config tester 2013-06-11 16:37:59 +02:00
Romain Neutron
32c2d6154a Remove phraseanet services, update configuration 2013-06-11 14:05:44 +02:00
Romain Neutron
8ecc97e94e Update unit tests 2013-06-11 11:50:22 +02:00
Romain Neutron
8632f68324 Fix unit tests, bump to version 3.8.0 alpha 3 2013-01-24 01:13:33 +01:00
Romain Neutron
2069d40544 Use composer as application autoloader 2013-01-18 17:47:25 +01:00