Commit Graph

3947 Commits

Author SHA1 Message Date
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
537c41fc09 Rename php file 2013-09-16 10:04:40 +02:00
Romain Neutron
6cbc1f048d Fix merge 2013-09-16 09:58:34 +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
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
28367c9007 Fix archive task default settings 2013-09-13 10:42:17 +02:00
Romain Neutron
a7b36af01a Fix #1457 : EntityManager:clear should not be called in a controller 2013-09-11 16:02:55 +02:00
jygaulier
f4ecfb2194 clean 2013-09-09 19:30:38 +02:00
jygaulier
dc38e7dab6 fix #1437 2013-09-09 19:30:38 +02:00
Romain Neutron
3649d89b81 Cleanup CS 2013-09-09 13:31:31 +02:00
Romain Neutron
871fa40553 Add Office Plugin client id and secret 2013-09-09 13:31:31 +02:00
Romain Neutron
a0dba36e67 Enable navigator by default 2013-09-09 13:05:55 +02:00
Romain Neutron
6974ca5fb9 Merge pull request #625 from nlegoff/fix_1445
[3.8] Fix #1445 Move record dialog improvement
2013-09-05 04:04:43 -07:00
Nicolas Le Goff
ce55141917 Fix #1445 Wording & issue while moving record from collections 2013-09-05 12:04:18 +02:00
Romain Neutron
ba980d5f34 Fix tmp directories cleanup 2013-09-04 17:14:53 +02:00
Nicolas Le Goff
41bbd13f7d Fix #1432 User settings for notifications are not saved in 2013-09-03 18:03:43 +02:00
Romain Neutron
c73b969c93 Merge pull request #607 from romainneutron/fix-1426
[3.8] Fix stamp text position
2013-09-02 08:14:18 -07:00
Romain Neutron
672377dfe8 Merge pull request #606 from romainneutron/fix-1427
[3.8] Fix 1427
2013-09-02 08:14:07 -07:00
Romain Neutron
6661b532eb Fix #1426 : stamp text position 2013-09-02 15:59:44 +02:00
Romain Neutron
8434ed4228 Merge pull request #605 from romainneutron/fix-1424
[3.8] Fix 1424 : story editing don't work
2013-09-02 06:43:18 -07:00
Romain Neutron
f5cb2b993e Fix #1427 stamp background 2013-09-02 15:42:02 +02:00
Romain Neutron
3736510c72 Fix #1424 : Editing a story don't work 2013-09-02 13:57:22 +02:00
Romain Neutron
483f14dfe5 Merge pull request #601 from romainneutron/fix-1430
[3.8] Use strict standards for task::getName method
2013-09-02 04:32:04 -07:00
Romain Neutron
2192afc702 Fix #1422 : logfiles contain duplicates log messages 2013-09-02 12:33:34 +02:00
Romain Neutron
7988114614 Fix #1430 : Use strict standards, declare the method static 2013-09-02 12:21:11 +02:00
Romain Neutron
b3ba5b55a0 Merge pull request #562 from nlegoff/fix_1414
[3.8] Fix 1414 Add immediate thumbnail substitution after success download
2013-08-09 09:33:31 -07:00
Nicolas Le Goff
f20b916004 Adressed @romainneutron 's comments 2013-08-09 18:03:17 +02:00
Romain Neutron
ea821d558e Code simplification 2013-08-08 16:46:17 +02:00
Romain Neutron
fcfc8270c0 Merge pull request #563 from romainneutron/plugins-cleaner
[3.8] Add plugins reset command
2013-08-08 07:45:24 -07:00
Nicolas Le Goff
416113574d Use temporary file system 2013-08-08 16:25:16 +02:00
Nicolas Le Goff
74f8bc3c3c Fix CS 2013-08-08 16:25:16 +02:00
Nicolas Le Goff
db359920c8 Fix #1414 Add immediate thumbnail substitution after success download 2013-08-08 16:25:16 +02:00
Nicolas Le Goff
47bb3331dd Move substituion logger from class method to controllers 2013-08-08 16:25:15 +02:00
Romain Neutron
f07ace58bc Add plugins reset command 2013-08-08 15:35:46 +02:00
Romain Neutron
acd7e18646 Merge pull request #557 from nlegoff/fix_1413
[3.8] Fix #1413 Add possibility to delete a persistent session
2013-08-08 03:27:35 -07:00
Nicolas Le Goff
307a6af069 Fix #1413 Add possibility to delete a persistent session 2013-08-08 12:26:39 +02:00
Romain Neutron
c6c6552cc6 Merge pull request #558 from romainneutron/search-engine
[3.8] Search engine fixes
2013-08-08 03:12:10 -07:00
Romain Neutron
0ee6e87c2a Fix search engine suggestions usage 2013-08-08 11:05:47 +02:00