hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 15:33:15 +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
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
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
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
586fbb9607 Merge pull request #631 from jygaulier/3.8-fix1437 
3.8 fix1437
 2013-09-09 10:29:14 -07:00
jygaulier
467a6bc855 clean 2013-09-09 14:39:51 +02:00
jygaulier
05ce849f9b fix #1437 2013-09-09 14:32:06 +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
40b1e9e663 Restored proxies 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
998e0c68ea Fixed errors, restored sessionrepository as it should be 2013-09-05 13:44:13 +02:00
Andrey
0fb4e8e0ee Restored usage of querybuilder in feedrepository 2013-09-05 13:44:13 +02:00
Andrey
5b0925996d Restored methods in repositories 2013-09-05 13:44:13 +02:00
Andrey
d8cac877e6 Restored repositories 2013-09-05 13:44:13 +02:00
Andrey
2773075c52 Fixed another typo in adapter 2013-09-05 13:44:12 +02:00
Andrey
58550a2410 Replaced error messages 2013-09-05 13:44:12 +02:00