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
10,907 Commits 268 Branches 107 Tags
3306b1fa1a42bcb39689258c140bd1e6fbf84e6c
Commit Graph

10907 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Benoît Burnichon
3306b1fa1a Change phpunit/phpunit version 2016-02-29 17:31:38 +01:00
Benoît Burnichon
329ae16dbe Add PHP7 to travis 2016-02-29 17:30:11 +01:00
Benoît Burnichon
5975178749 Merge branch '4.0' 
Also updated dependencies
 2016-02-28 23:31:16 +01:00
Benoît Burnichon
9999ceda12 Merge pull request #1735 from lostdalek/hotfix/PHRAS-945 
PHRAS-945
 2016-02-28 23:18:56 +01:00
Benoît Burnichon
f4122a76e2 Merge pull request #1732 from bburnichon/PHRAS-1012 
Allow filenames to have more than 32 chars
 2016-02-28 23:18:35 +01:00
Benoît Burnichon
119c101c32 Revert changes to ApiJSONPTest 2016-02-28 23:05:50 +01:00
Benoît Burnichon
1bb5723b39 Add missing use 2016-02-27 21:32:30 +01:00
Florian BLOUET
7dd8b73606 PHRAS-945 - fix record selection in story detailled view 2016-02-26 17:29:36 +01:00
Benoît Burnichon
c56a174240 Removing many redundant API tests. 2016-02-26 16:56:48 +01:00
Benoît Burnichon
04131a3479 Refactor ExportTest 2016-02-26 16:18:48 +01:00
Benoît Burnichon
37bcd1d909 Increase maxFilenameLength to 256 and allow to overrid value from code. 2016-02-26 16:18:48 +01:00
Benoît Burnichon
6129cc6dd2 Introduce MAX_FILENAME_LENGTH const 2016-02-26 16:18:48 +01:00
Benoît Burnichon
c3cb083d25 PHPCS in BasketRepository 2016-02-26 16:18:48 +01:00
Benoît Burnichon
7c93657e73 Error in fetching User ID. Improvement of SQLs 
Fixes PHPCS in set classes.
 2016-02-26 16:18:48 +01:00
Benoît Burnichon
6e1be6099f Avoid cache requests on subdef already in cache. 2016-02-26 16:18:11 +01:00
Benoît Burnichon
3300d7e06e Merge pull request #1734 from lostdalek/hotfix/PHRAS-995 
PHRAS-995
 2016-02-26 15:55:49 +01:00
Benoît Burnichon
2da0da014c Merge pull request #1733 from lostdalek/hotfix/PHRAS-1016 
PHRAS-1016
 2016-02-26 15:39:12 +01:00
Benoît Burnichon
08b7234c2f Merge pull request #1731 from lostdalek/hotfix/PHRAS-1010 
PHRAS-1010
 2016-02-26 15:38:40 +01:00
Florian BLOUET
5ac036c123 PHRAS-995 - fix search results css in diapo mode 2016-02-26 15:32:42 +01:00
Florian BLOUET
588d10c2dc PHRAS-1016 - fix default selection to group instead of records for story editing 2016-02-26 13:04:26 +01:00
Florian BLOUET
fdc2129c22 PHRAS-1010 - fix maintenance message display 2016-02-26 11:48:01 +01:00
Benoît Burnichon
db47b7621d Merge pull request #1729 from lostdalek/hotfix/PHRAS-1011 
PHRAS-1011
 2016-02-25 20:47:39 +01:00
Benoît Burnichon
992ae162dc Merge pull request #1728 from lostdalek/hotfix/PHRAS-995 
PHRAS-995
 2016-02-25 20:47:09 +01:00
Benoît Burnichon
22ece5bef5 Merge pull request #1727 from lostdalek/hotfix/PHRAS-998 
PHRAS-998
 2016-02-25 20:46:41 +01:00
Benoît Burnichon
8e64568ebe Merge pull request #1726 from lostdalek/hotfix/PHRAS-999 
PHRAS-999
 2016-02-25 20:46:15 +01:00
Florian BLOUET
a2b4eb784a PHRAS-1011 - fix PDFjs compatibility issue - bump Embed Bundle 2016-02-25 18:17:29 +01:00
Florian BLOUET
c6a6591ccd PHRAS-995 - fix css of search results in list mode 2016-02-25 12:36:50 +01:00
Florian BLOUET
efaf546222 PHRAS-998 - fix basket preference modal css 2016-02-25 12:05:02 +01:00
Florian BLOUET
3050c7904e PHRAS-999 - fix events delegation 2016-02-25 11:30:15 +01:00
Thibaud Fabre
7ee7d1ca74 Merge pull request #1725 from bburnichon/feature/PHRAS-954-add-orderable-on-document 
Subdef group refactoring
 2016-02-24 21:11:00 +01:00
Benoît Burnichon
e323555736 Translation Dump for added keys 2016-02-24 17:23:24 +01:00
Benoît Burnichon
93fd4bda03 Add orderable status in admin forms 2016-02-24 17:23:06 +01:00
Benoît Burnichon
557c98a9b9 Changes on SubdefGroup reflected in using clients 2016-02-24 13:54:35 +01:00
Benoît Burnichon
0a40ef291d Extract SubdefGroup class 2016-02-24 13:52:33 +01:00
Benoît Burnichon
2d6bd2f9b7 Update translation messages 2016-02-23 18:24:34 +01:00
Anthony C
c8aa017c4a Translated using Weblate (French) 
Currently translated at 99.9% (2295 of 2296 strings)
 2016-02-23 16:28:01 +01:00
Benoît Burnichon
a370d79cde Translated using Weblate (French) 
Currently translated at 99.8% (2292 of 2296 strings)
 2016-02-23 16:28:01 +01:00
Anthony C
d9daae943b Translated using Weblate (French) 
Currently translated at 99.8% (2292 of 2296 strings)
 2016-02-23 16:28:01 +01:00
Anthony C
b8e2924284 Translated using Weblate (English) 
Currently translated at 100.0% (2296 of 2296 strings)
 2016-02-23 16:28:01 +01:00
Benoît Burnichon
cfd3eddb8b Translated using Weblate (English) 
Currently translated at 99.9% (2292 of 2292 strings)
 2016-02-23 16:28:01 +01:00
Anthony C
a8a2529f2f Translated using Weblate (English) 
Currently translated at 99.9% (2291 of 2292 strings)
 2016-02-23 16:28:01 +01:00
Anthony C
ccef1ff12f Translated using Weblate (French) 
Currently translated at 99.9% (2291 of 2292 strings)
 2016-02-23 16:28:01 +01:00
Benoît Burnichon
c63f8d777f Merge branch '4.0' 
Conflicts:
	composer.lock
	lib/Alchemy/Phrasea/ControllerProvider/Api/V2.php
 2016-02-23 16:27:04 +01:00
Anthony C
25029abc96 Translated using Weblate (French) 
Currently translated at 99.9% (2295 of 2296 strings)
 2016-02-23 16:13:51 +01:00
Anthony C
c445f4c225 Translated using Weblate (English) 
Currently translated at 100.0% (2296 of 2296 strings)
 2016-02-23 16:13:51 +01:00
Benoît Burnichon
20f5e20bd5 Merge pull request #1723 from bburnichon/improvement/search-api-v2-PHRAS-992 
search api v2 use timestamp
 2016-02-23 16:13:46 +01:00
Benoît Burnichon
d56c8fc150 Merge pull request #1724 from lostdalek/embedBundle 
Bump embed bundle
 2016-02-23 16:06:59 +01:00
Benoît Burnichon
9733a31ee9 Merge pull request #1722 from lostdalek/hotfix/PHRAS-965 
PHRAS-965
 2016-02-23 16:06:23 +01:00
Benoît Burnichon
7bf98ed8f3 Merge 2 subscribers and make appbox lazyloaded. 2016-02-23 15:55:10 +01:00
Florian BLOUET
7428f12600 update configuration sample for embed bundle 2016-02-23 15:49:13 +01:00