Commit Graph

3922 Commits

Author SHA1 Message Date
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
Romain Neutron
42dea4de88 Merge pull request #647 from romainneutron/fix-1468
[3.8] Fix suggested values editing
2013-09-17 07:37:32 -07:00
Romain Neutron
4ce8bdeaf8 Fix suggested values editing 2013-09-17 16:36:22 +02:00
Romain Neutron
0047d0fc36 Never reset date sort settings, remove date field choser 2013-09-17 16:33:48 +02:00
Romain Neutron
b81f894d22 Remove infinite redirection, add upgrade instructions 2013-09-17 16:28:23 +02:00
Romain Neutron
91dd9ce321 Disable composer interactivity 2013-09-17 16:22:01 +02:00
Romain Neutron
391d84ca56 Fix merge 2013-09-17 16:15:44 +02:00
Romain Neutron
8dfe16c2bd Fix realtime search engine indexation 2013-09-17 16:02:43 +02:00
Romain Neutron
860294481a Merge branch '3.8' 2013-09-16 10:05:00 +02:00
Romain Neutron
537c41fc09 Rename php file 2013-09-16 10:04:40 +02:00
Romain Neutron
12b01438fd Merge branch '3.8' 2013-09-16 09:59:11 +02:00
Romain Neutron
6cbc1f048d Fix merge 2013-09-16 09:58:34 +02:00
Romain Neutron
b8ba28cd58 Merge pull request #639 from romainneutron/fix-ftpexportelement-entity
Update unique key
2013-09-16 00:42:55 -07:00
Romain Neutron
2baa5a6484 Fix merge 2013-09-14 02:12:20 +02:00
Romain Neutron
017000f1c8 Update version name 2013-09-14 02:10:59 +02:00
Romain Neutron
f85641efd1 Fix archive task default settings 2013-09-14 02:10:12 +02:00
Romain Neutron
2727f939ee Fix #1457 : EntityManager:clear should not be called in a controller 2013-09-14 02:10:12 +02:00
Romain Neutron
e8bf678fc2 Cleanup CS 2013-09-14 02:10:11 +02:00
Romain Neutron
6c7c196a20 Add Office Plugin client id and secret 2013-09-14 02:10:11 +02:00
Romain Neutron
d2947d8fbc Enable navigator by default 2013-09-14 02:08:51 +02:00
Romain Neutron
00d4c595ee Update version name 2013-09-14 02:04:04 +02:00
Romain Neutron
f955163edb Merge branch '3.7' into 3.8
Conflicts:
	lib/Alchemy/Phrasea/Application/Api.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/conf.d/_GV_template.inc
2013-09-14 02:02:56 +02:00
Romain Neutron
4db6c4e94f Update unique key 2013-09-14 01:54:31 +02:00
Romain Neutron
4d6cace14a Merge pull request #637 from romainneutron/fix-archive-task
[3.8] Fix archive task default settings
2013-09-13 13:32:11 -07:00
Romain Neutron
76e16be497 Fix strict standards 2013-09-13 19:51:31 +02:00
Romain Neutron
28367c9007 Fix archive task default settings 2013-09-13 10:42:17 +02:00
Romain Neutron
2c7073182a Fix CS 2013-09-12 13:55:31 +02:00