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,023 Commits 268 Branches 107 Tags
c3df531f59d2912e08cb22d998b456f59c3c1c21
Commit Graph

61 Commits

Author SHA1 Message Date
Romain Neutron
1ba41c4421 Fix latest merge 2013-12-04 08:20:58 +01:00
Romain Neutron
e0c1f600dd Merge branch '3.8' 
Conflicts:
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Core/Version.php
	lib/Doctrine/Repositories/SessionRepository.php
	lib/classes/User/Adapter.php
 2013-12-03 21:32:46 +01:00
Romain Neutron
0575d6da44 Bump to version 3.9.0-alpha.9 2013-12-03 20:06:49 +01:00
Romain Neutron
0a813a6440 Bump to version 3.8.3-alpha.1 2013-12-03 18:22:15 +01:00
Romain Neutron
051d9f4035 Remove license comments 2013-11-20 16:49:29 +01:00
Romain Neutron
3b7e0c9a30 Bump to version 3.8.3-alpha.0 2013-11-20 15:51:13 +01:00
Romain Neutron
88b4df745b Prepare version 3.8.2 2013-11-15 17:45:47 +01:00
Romain Neutron
5d79ff40a1 Prepare version 3.8.1 2013-11-15 12:18:14 +01:00
Romain Neutron
84c444c186 Fix editing default user settings 2013-11-14 13:29:49 +01:00
Romain Neutron
cc574ac7bd Bump to 3.8.1 alpha 3 2013-11-12 15:16:55 +01:00
Romain Neutron
2072f9e0e0 Merge branch '3.8' 
Conflicts:
	composer.lock
	lib/Alchemy/Phrasea/Core/Version.php
 2013-11-08 19:04:26 +01:00
Romain Neutron
b5e944caf0 Fix #1579 : Update old geonames server address 2013-11-08 11:52:43 +01:00
Romain Neutron
95b0c24d4b Use semver for Phraseanet version numbers 2013-11-07 17:49:39 +01:00
Romain Neutron
12727e20a7 Bump to version a8 2013-10-29 18:42:47 +01:00
Romain Neutron
9d3b21238c Prepare version 3.8 2013-09-25 21:42:27 +02:00
Romain Neutron
017000f1c8 Update version name 2013-09-14 02:10:59 +02:00
Romain Neutron
00d4c595ee Update version name 2013-09-14 02:04:04 +02:00
Andrey
8f63938149 Added migration patch 2013-09-05 13:44:14 +02:00
Romain Neutron
9804e3b4c3 Switch to FtpExport entities 2013-08-30 18:35:21 +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
ec54f7a79a Bump master to version 3.9-dev 2013-08-06 11:36:55 +02:00
Nicolas Le Goff
589a1b8d1d Update version 2013-07-12 20:09:51 +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
242b2c0f71 Remove dependency on convert and composite 2013-07-04 14:10:57 +02:00
Romain Neutron
ce34bca408 Add second logging channel 2013-07-01 14:38:17 +02:00
Nicolas Le Goff
b5dbd37740 Adress last comment 2013-06-28 00:16:34 +02:00
Romain Neutron
4b06608caa Update to media-alchemyst 0.3 2013-06-27 12:43:24 +02:00
Romain Neutron
af9307b148 Add sessions patch 2013-06-18 15:37:19 +02:00
Romain Neutron
784e454311 Update emails notifications 2013-06-17 19:37:52 +02:00
Romain Neutron
1a13d02c2a Remove status bit name, use only labels 2013-06-14 09:47:53 +02:00
Romain Neutron
aebc63a01c Move phraseanet_indexer setting in configuration 2013-06-11 16:02:43 +02:00
Romain Neutron
32db4ac09b Bump to alpha 7 2013-06-11 14:29:58 +02:00
Romain Neutron
51fead6dc4 Bump to alpha6 2013-05-29 14:23:26 +02:00
Romain Neutron
09940bfedd Add alpha5 patch 2013-05-14 23:58:21 +02:00
Romain Neutron
8632f68324 Fix unit tests, bump to version 3.8.0 alpha 3 2013-01-24 01:13:33 +01:00
Romain Neutron
842ad40985 Bump copyright year 2013-01-21 23:28:58 +01:00
Romain Neutron
bf46a6b25d Add patch 2012-10-04 18:22:54 +02:00
Romain Neutron
d178b1ad27 Bump to version 3.8.0a2 2012-07-24 13:21:02 +02:00
Romain Neutron
70c16f41b2 Bump to version 3.7.0 2012-07-23 16:34:19 +02:00
Nicolas Le Goff
782df9b716 bump to 3.7.0.9 
fix tests

fix tests
 2012-06-13 19:20:14 +02:00
Nicolas Le Goff
b391e1956a add lazaret patch 2012-06-01 16:39:29 +02:00
Romain Neutron
67bab92804 Bump to version alpha 6 2012-05-23 19:18:04 +02:00
Romain Neutron
24cd6bdaf7 Bump to alpha 5 2012-05-23 12:06:44 +02:00
Romain Neutron
756c2b605b Update to version 3.7.0.0a4, patch old phraseanet TF tags with their new names 2012-05-22 20:00:15 +02:00
Nicolas Le Goff
fb7c2446b2 bump to version 3.7.0.0.a3 2012-04-27 18:55:34 +02:00