hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 07:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,605 Commits 268 Branches 107 Tags
12727e20a7f3b0b51b6d0763705835d4da66cea7
Commit Graph

3922 Commits

Author SHA1 Message Date
Romain Neutron
989c1b80e8 Merge pull request #689 from romainneutron/fix-1528 
[3.8] Fix #1528 : Allow collection order only on available collections
 2013-10-15 05:57:36 -07:00
Romain Neutron
7618106667 Fix ORM patches 2013-10-15 14:38:17 +02:00
Romain Neutron
92fe657e80 Fix #1528 : Restrict collection ordering on available collections 2013-10-15 14:14:44 +02:00
Romain Neutron
b7d8f777fd Merge pull request #694 from romainneutron/fix-1535 
[3.8] Fix #1535 : API does not display search engine suggestions correctly
 2013-10-15 04:05:30 -07:00
jygaulier
f32d561c98 fix #1496 2013-10-14 16:58:32 +02:00
Romain Neutron
1551d03f95 Merge pull request #686 from romainneutron/fix-1527 
[3.8] Fix #1527 : Wrong offset for classic query result
 2013-10-10 09:09:43 -07:00
Romain Neutron
eca23ce8c1 Merge pull request #688 from romainneutron/fix-1520 
[3.8] Fix #1520 : Avoid fatal error while editing from multiple databoxes
 2013-10-10 09:03:04 -07:00
Romain Neutron
32005914e2 Merge pull request #687 from romainneutron/fix-1524 
[3.8] Fix #1524 : API search query is discarded with GET method
 2013-10-10 09:02:42 -07:00
Romain Neutron
eb6eb689e0 Fix #1535 : API does not display search engine suggestions correctly 2013-10-10 18:00:09 +02:00
Nicolas Le Goff
d4b7280c81 Fix #1522 Issue with jquery ui tabs & multiselect 2013-10-10 16:20:20 +02:00
Romain Neutron
7e8a34c599 Merge branch '3.8' 
Conflicts:
	bin/developer
	build-env.sh
	composer.json
	composer.lock
 2013-10-10 13:42:42 +02:00
Romain Neutron
9e916a8fcc Fix #1527 : Wrong offset for classic query result 2013-10-10 13:40:10 +02:00
Romain Neutron
e87aa5afb3 Fix #1524 : API search query is discarded with GET method 2013-10-10 13:39:59 +02:00
Romain Neutron
5538a6924c Fix #1520 : Avoid fatal error while editing from multiple databoxes 2013-10-10 13:39:47 +02:00
Romain Neutron
f648ea296f Fix #1488 : Push / Feedback name is now mandatory 2013-10-10 13:39:07 +02:00
Romain Neutron
5996e590bc Reset exiftool writer before writing 2013-10-09 12:18:16 +02:00
Romain Neutron
41306fec74 Update defautl configurations 2013-10-09 12:16:43 +02:00
Romain Neutron
097e1f21ae Remove calls to dropped orders table 2013-10-07 18:36:52 +02:00
Nicolas Le Goff
2b7ecdd0a0 Add Phraseanet namespace for twig templates 2013-10-07 14:26:50 +02:00
Romain Neutron
6345fcc83a Add uninstaller for development purposes 2013-10-07 10:08:11 +02:00
Romain Neutron
0a950b0ae6 Add uninstaller for development purposes 2013-10-04 17:29:13 +02:00
Romain Neutron
d716e91169 Merge branch '3.8' 
Conflicts:
	composer.lock
 2013-10-04 15:15:04 +02:00
Nicolas Le Goff
9fc8fbc194 Fix API password grant type authentication 2013-10-03 17:12:46 +02:00
Romain Neutron
5ceaa35717 Fix latest merge 2013-10-03 16:41:59 +02:00
Romain Neutron
1dfbff5666 Merge branch '3.8' 
Conflicts:
	CHANGELOG.md
	bin/developer
	lib/classes/module/console/systemUpgrade.php
	www/skins/report/jquery-ui.css
 2013-10-03 15:29:22 +02:00
Romain Neutron
642a1a5657 Fix CS 2013-10-03 15:24:15 +02:00
Romain Neutron
1b9a90d635 Fix office plugin class name 2013-10-03 15:24:15 +02:00
Romain Neutron
d4c2e5959e Fix #1491 : Fix cache serialization in case of controlled vocabulary 2013-10-03 15:24:15 +02:00
Romain Neutron
0a86cb635e Merge pull request #671 from nlegoff/fix1499 
[3.8] Fix #1499 Increase default task memory overflow
 2013-10-03 06:18:02 -07:00
Romain Neutron
1df6296c8b Merge pull request #673 from romainneutron/fix-1489 
[3.8] Fix 1489 Let errors happen when they occur
 2013-10-03 06:17:42 -07:00
Romain Neutron
0236f927cc Merge pull request #674 from romainneutron/fix-1401 
[3.8] Fix 1401 Bump video max bitrate to 12000
 2013-10-03 06:17:16 -07:00
Romain Neutron
7fc1999883 Merge pull request #675 from romainneutron/fix-1506 
[3.8] Fix 1506 Avoid query error in case search engine index is broken
 2013-10-03 06:17:05 -07:00
Romain Neutron
41eeea1bda Merge pull request #676 from romainneutron/fix-1506bis 
[3.8] Fix #1506 : Install data path is not saved
 2013-10-03 06:16:50 -07:00
Nicolas Le Goff
b66da8861a Fix #1499 Increase default task memory overflow 2013-10-03 14:29:27 +02:00
Romain Neutron
a0ebc1addb Merge pull request #670 from nlegoff/fix_1501 
[3.8] Fix #1501 User can not be deleted because of the sql column size
 2013-10-02 10:39:18 -07:00
Romain Neutron
4501f2ac8f Fix #1503 : Avoid query error in case search engine index is broken 2013-10-02 19:30:59 +02:00
Romain Neutron
f638343de1 Fix #1506 : Install data path is not saved 2013-10-02 19:30:36 +02:00
Romain Neutron
255f66968f Bump video max bitrate to 12000 2013-10-02 18:34:57 +02:00
Romain Neutron
abae32ca5f Fix #1489 : Let errors happen when they occur 2013-10-02 18:30:48 +02:00
Nicolas Le Goff
d7c720ed7d Fix #1501 increase usr_login column size 2013-10-02 17:33:26 +02:00
Romain Neutron
fba9da7daa Open up controller API to allow better pluginification 2013-10-02 13:59:22 +02:00
Romain Neutron
5e6a6c9702 Merge pull request #663 from nlegoff/fix_1475 
[3.8] Fix #1475 Update report custom CSS & download detail
 2013-10-01 02:50:12 -07:00
Romain Neutron
2651d16d20 Merge pull request #664 from nlegoff/fix_1343 
[3.8] Fix #1343 Display default name if label is empty
 2013-10-01 02:48:09 -07:00
Romain Neutron
eb590780ca Fix CS 2013-09-30 18:26:32 +02:00
Romain Neutron
d294e553d8 Fix office plugin class name 2013-09-30 18:25:41 +02:00
Romain Neutron
15e7b3aa1a Bower installer simplification 2013-09-30 14:32:26 +02:00
Nicolas Le Goff
93c3a46b3c Fix #1475 Update report custom CSS 2013-09-30 11:50:29 +02:00
Nicolas Le Goff
332579440a Display default name if label is empty 2013-09-30 11:43:01 +02:00
Romain Neutron
4db4008a52 Fix #1491 : Fix cache serialization in case of controlled vocabulary 2013-09-27 19:06:40 +02:00
Romain Neutron
48680fd3c3 Merge branch '3.8' 
Conflicts:
	CHANGELOG.md
	lib/Alchemy/Phrasea/Command/Developer/ComposerInstall.php
	lib/Alchemy/Phrasea/Core/Version.php
	templates/web/setup/wrapper.html.twig
 2013-09-26 12:51:21 +02:00