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,516 Commits 268 Branches 107 Tags
f4428d2ff468f10c4d9b51f82bb8745ec737b6e8
Commit Graph

3848 Commits

Author SHA1 Message Date
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
Romain Neutron
9d3b21238c Prepare version 3.8 2013-09-25 21:42:27 +02:00
Romain Neutron
7a68ebbbb2 Fix upgrade 2013-09-25 17:15:11 +02:00
Romain Neutron
60e2e94cae Merge pull request #660 from romainneutron/fix-1487 
[3.8] Fix #1487 : Fix feedback request messages
 2013-09-25 02:52:52 -07:00
Romain Neutron
d7076cd441 Allow failure on composer self-update 2013-09-25 11:49:25 +02:00
Romain Neutron
c33b325666 Fix #1487 : Fix feedback request messages 2013-09-25 11:01:21 +02:00
Romain Neutron
d00b39fec8 Merge branch '3.8' 2013-09-24 12:43:00 +02:00
Romain Neutron
72bfbd83e8 Remove doctrine tables from drop advices 2013-09-24 11:03:41 +02:00
Romain Neutron
b96c7e8622 Remove chrome frame toggler 2013-09-23 14:11:58 +02:00
Romain Neutron
aa2b2c11c4 Merge branch '3.8' 2013-09-19 15:10:54 +02:00
Romain Neutron
9474196f23 Merge pull request #653 from romainneutron/fix-1479 
[3.8] Fix 1479 : Add validation duration in mail body
 2013-09-19 06:10:19 -07:00
Romain Neutron
0b9c8b64ac Merge branch '3.8' 2013-09-19 14:53:55 +02:00
Romain Neutron
dc224cf231 Merge pull request #652 from romainneutron/fix-1477 
[3.8] Fix 1477
 2013-09-19 05:40:16 -07:00
Romain Neutron
fac302dcbd Fix #1479 : Add validation duration in mail body 2013-09-19 14:39:16 +02:00
Romain Neutron
87d6dddddf Fix #1477 : let the upgrade crash if the upgrade procedure fails 2013-09-19 13:55:58 +02:00
Romain Neutron
6d13a6d035 Merge pull request #650 from romainneutron/fix-1292 
[3.8] Fix serialization
 2013-09-18 15:04:04 -07:00
Romain Neutron
1fb7390a92 Fix exception message 2013-09-18 23:37:46 +02:00
Romain Neutron
b9a0b9c12c Fix serialization 2013-09-18 23:36:19 +02:00
Romain Neutron
45c5276923 Merge branch '3.8' 2013-09-18 12:09:20 +02:00
Romain Neutron
756f6095a7 Minor report updates 2013-09-18 12:07:07 +02:00
Romain Neutron
1181d756e3 Merge pull request #648 from romainneutron/stemm-search 
[3.8] Add disable toggle on Phraseanet
 2013-09-17 08:38:40 -07:00
Romain Neutron
a013b8d9e1 Merge pull request #641 from romainneutron/upgrade-instructions 
[3.8] Remove infinite redirection, add upgrade instructions
 2013-09-17 08:06:48 -07:00
Romain Neutron
2ece9a7cdc Merge pull request #640 from romainneutron/composer-options 
[3.8] Disable composer interactivity
 2013-09-17 08:06:24 -07:00
Romain Neutron
219156bf8e Add SearchEngineInterface::isStemmingEnabled 2013-09-17 17:03:41 +02:00
Romain Neutron
35b3224908 Merge pull request #645 from romainneutron/fix-1462 
[3.8] Fix realtime search engine indexation
 2013-09-17 07:38:12 -07:00