hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-13 13:03:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,452 Commits 268 Branches 107 Tags
2df0f9d659d10064c20239b33280a059bee33cc6
Commit Graph

1992 Commits

Author SHA1 Message Date
Romain Neutron
d294e553d8 Fix office plugin class name 2013-09-30 18:25:41 +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
7a68ebbbb2 Fix upgrade 2013-09-25 17:15:11 +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
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
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
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
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
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
Romain Neutron
0d3aaf362d Merge branch 'feeds-entities' of https://github.com/csaoh/Phraseanet 2013-09-12 13:53:56 +02:00
Romain Neutron
a7b36af01a Fix #1457 : EntityManager:clear should not be called in a controller 2013-09-11 16:02:55 +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
6c29fc88e9 Merge branch '3.8' 
Conflicts:
	composer.lock
	templates/mobile/common/index.html.twig
 2013-09-05 13:57:42 +02:00
Andrey
d1d678668a Added missing line 2013-09-05 13:45:14 +02:00
Andrey
c1c8327260 Replaced SQL connection for sqlite tests 2013-09-05 13:44:15 +02:00
Andrey
6e970837a1 Added closes to patch, removed timestampable listener from 320f 2013-09-05 13:44:15 +02:00
Andrey
8f63938149 Added migration patch 2013-09-05 13:44:14 +02:00
Andrey
c0bd291f7a Add Doctrine schema pre-upgrades 2013-09-05 13:44:14 +02:00
Andrey
a148cef063 Added more flushes to a patch 2013-09-05 13:44:13 +02:00
Andrey
2773075c52 Fixed another typo in adapter 2013-09-05 13:44:12 +02:00
Andrey
1baf81040f Fixed a typo 2013-09-05 13:44:12 +02:00