hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-08 18:44:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,094 Commits 268 Branches 107 Tags
b8786852e00a6484db10c807b51f6cf7234dd1e9
Commit Graph

503 Commits

Author SHA1 Message Date
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
0b9c8b64ac Merge branch '3.8' 2013-09-19 14:53:55 +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
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
2727f939ee Fix #1457 : EntityManager:clear should not be called in a controller 2013-09-14 02:10:12 +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
2c7073182a Fix CS 2013-09-12 13:55:31 +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
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
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
a148cef063 Added more flushes to a patch 2013-09-05 13:44:13 +02:00
Andrey
1764d5f5c4 Fixed order in entry/update, fixed a lot of codestyle 2013-09-05 13:44:06 +02:00
Andrey
d40a6c0a0d Fixed feed error in patch 320f 2013-09-05 13:44:06 +02:00
Andrey
56a8aa33f8 Updated patch 302f 2013-09-05 13:44:05 +02:00
Andrey
d8d9ab7607 Removed remaining occurrences to Feed_, adapted patch_320f 2013-09-05 13:44:05 +02:00
Romain Neutron
b6a8a90197 Fix CS 2013-09-04 12:14:52 +02:00
Romain Neutron
dbd06e9091 Remove dead code 2013-09-04 12:14:50 +02:00
Romain Neutron
9804e3b4c3 Switch to FtpExport entities 2013-08-30 18:35:21 +02:00
Romain Neutron
447cb60327 Fix CS 2013-08-30 13:48:13 +02:00
Nicolas Le Goff
3f6ebeaaee Add Deleted field 2013-08-26 18:48:48 +02:00
Nicolas Le Goff
7fa0f60433 Add UserNotificationSetting entity 2013-08-26 14:53:07 +02:00
Nicolas Le Goff
33c4d85116 Add UserSetting entity 2013-08-26 14:14:08 +02:00
Nicolas Le Goff
cc631a1e7f Add UserQuery entity 2013-08-25 13:55:04 +02:00
Nicolas Le Goff
4d2c88b78c Add User Entity 2013-08-23 20:20:24 +02:00
Nicolas Le Goff
6a8312ca64 Add FtpCredentials entity 2013-08-23 12:09:50 +02:00
Romain Neutron
eb17f5aa87 Fix CS 2013-07-16 19:39:02 +02:00
Nicolas Le Goff
8f401377df Add patch 2013-07-12 20:09:51 +02:00
Romain Neutron
9c531b9466 Merge pull request #476 from romainneutron/fix_07-10 
[3.8] Multiple fixes
 2013-07-10 09:19:48 -07:00
Romain Neutron
14da7484b0 Remove deprecated patch 2013-07-10 15:56:21 +02:00
Romain Neutron
dfee75537f Remove deprecated constants 2013-07-10 15:56:20 +02:00
Romain Neutron
c1347618ac Fix #1240 : Remove authentication>auto-create>enabled parameter 2013-07-10 14:02:29 +02:00
Romain Neutron
70cb9ee06b Fix #1245 : Rename trials-before-failure configuration to trials-before-display 2013-07-10 12:53:47 +02:00
Romain Neutron
5b9a8f4055 Add XSenfFile mapping generator 2013-07-04 17:31:42 +02:00
Romain Neutron
d78a239d86 Bump to alpha 15 2013-07-04 14:10:57 +02:00
Romain Neutron
242b2c0f71 Remove dependency on convert and composite 2013-07-04 14:10:57 +02:00
Nicolas Le Goff
8e31a692cb Enhance XSendFileMapping to handle apache 
Update xsendfile
 2013-07-02 17:33:12 +02:00
Romain Neutron
ce34bca408 Add second logging channel 2013-07-01 14:38:17 +02:00
Romain Neutron
e155089cac Tweaks and fixes 2013-06-28 00:16:34 +02:00
Nicolas Le Goff
0aa90dd6cc Revert patch 2013-06-28 00:16:34 +02:00
Nicolas Le Goff
b5dbd37740 Adress last comment 2013-06-28 00:16:34 +02:00