hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,974 Commits 268 Branches 107 Tags
3565d1c795ca4808772584f972966b50b6b692d0
Commit Graph

62 Commits

Author SHA1 Message Date
Nicolas Le Goff
3565d1c795 Merge branch '3.8' into fix-latest-merge 
Conflicts:
	CHANGELOG.md
	bower.json
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Controller/Prod/Push.php
	lib/Alchemy/Phrasea/Controller/Prod/Records.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/Alchemy/Phrasea/Media/Subdef/Image.php
	lib/conf.d/_GV_template.inc
	locale/de_DE/LC_MESSAGES/phraseanet.mo
	locale/de_DE/LC_MESSAGES/phraseanet.po
	locale/en_GB/LC_MESSAGES/phraseanet.mo
	locale/en_GB/LC_MESSAGES/phraseanet.po
	locale/fr_FR/LC_MESSAGES/phraseanet.mo
	locale/fr_FR/LC_MESSAGES/phraseanet.po
	locale/nl_NL/LC_MESSAGES/phraseanet.mo
	locale/nl_NL/LC_MESSAGES/phraseanet.po
	templates/web/prod/Story/Reorder.html.twig
	templates/web/prod/WorkZone/Macros.html.twig
	templates/web/prod/actions/Download/prepare.html.twig
	templates/web/prod/templates/push.html.twig
 2014-07-11 17:19:39 +02:00
Nicolas Le Goff
f04ef8f7dc Update changelog 2014-07-09 16:10:31 +02:00
Nicolas Le Goff
cfc2825881 Update changelog 2014-07-09 10:57:19 +02:00
Nicolas Le Goff
067ce15e0b Prepare Version 3.8.4 2014-06-25 18:33:46 +02:00
Romain Neutron
42ac68e97d Merge branch '3.8' 
Conflicts:
	bower.json
	lib/Alchemy/Phrasea/Core/Version.php
 2014-02-26 10:22:38 +01:00
Nicolas Le Goff
f8e865bdcc Update changelog 2014-02-24 16:15:12 +01:00
Romain Neutron
4b5613cf9a Merge branch '3.8' 
Conflicts:
	CHANGELOG.md
	builder.php
	launchpadToLocales.php
	localesToLaunchPad.php
 2014-02-19 12:08:05 +01:00
Romain Neutron
a331d4e467 Format changelog 2014-02-19 03:12:30 +01:00
Romain Neutron
0f4ff45490 Format changelog 2014-02-19 03:11:20 +01:00
Romain Neutron
2bc6dcd388 Update changelog 2014-02-19 03:09:04 +01:00
Romain Neutron
4ffa37c384 Update changelog for 3.8.3 2014-02-19 03:07:04 +01:00
Romain Neutron
d5f93e52fb Session management is now part of Phraseanet configuration 2014-01-13 17:44:47 +01:00
Romain Neutron
e0a8bec422 Merge branch '3.8' 
Conflicts:
	CHANGELOG.md
 2013-11-15 19:05:56 +01:00
Romain Neutron
e055f01019 Fix typo 2013-11-15 19:05:04 +01:00
Romain Neutron
b973e40577 Merge branch '3.8' 
Conflicts:
	CHANGELOG.md
	bower.json
	lib/Alchemy/Phrasea/Core/Version.php
 2013-11-15 19:04:45 +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
d2054f5909 Merge branch '3.8' 
Conflicts:
	CHANGELOG.md
 2013-11-15 11:28:21 +01:00
Romain Neutron
2e5b6595df Update changelog 2013-11-15 11:25:46 +01:00
Romain Neutron
e5989c70b0 Update changelog 2013-10-15 14:56:55 +02:00
Romain Neutron
bcc3c4e0ac Update Changelog 2013-10-03 15:24:15 +02:00
Romain Neutron
5218c24cbf Update Changelog 2013-09-26 17:24:56 +02:00
Romain Neutron
9025bfffaa Update Changelog 2013-09-26 13:02:22 +02:00
Romain Neutron
9d3b21238c Prepare version 3.8 2013-09-25 21:42:27 +02:00
Romain Neutron
5e2809b020 Merge branch '3.8' 2013-09-14 02:23:16 +02:00
Romain Neutron
84c7f5bf9a Update Changelog for 3.7.15 2013-09-14 02:22:58 +02:00
Romain Neutron
ec54f7a79a Bump master to version 3.9-dev 2013-08-06 11:36:55 +02:00
Romain Neutron
87f37e767a Update changelog 2013-07-23 12:25:13 +02:00
Romain Neutron
764fde489d Update changelog for version 3.7.14 2013-07-22 19:03:03 +02:00
Romain Neutron
0ab927ec97 Fix #1243 Phraseanet enabled languages is now configurable 2013-07-17 21:22:01 +02:00
Romain Neutron
5c033caed3 Update changelog 2013-07-09 18:19:33 +02:00
Romain Neutron
5b9a8f4055 Add XSenfFile mapping generator 2013-07-04 17:31:42 +02:00
Romain Neutron
5556a05ab2 Add changelog 3.7.13 2013-07-04 11:32:42 +02:00
Romain Neutron
bc6ab201d5 Update changelog 2013-06-17 18:25:10 +02:00
Romain Neutron
90e2030b6a Update changelog 2013-06-17 12:32:02 +02:00
Romain Neutron
2d9408c93f Merge pull request #394 from romainneutron/template-time-limits 
[3.8] Template time limits
 2013-06-14 08:24:18 -07:00
Romain Neutron
d96f8d3016 Update Changelog 2013-06-14 09:48:31 +02:00
Romain Neutron
41217b8f37 Update changelog 2013-06-14 09:47:31 +02:00
Romain Neutron
f642a96809 Merge pull request #396 from romainneutron/time-limit-sbas 
[3.8] Time limit sbas
 2013-06-14 00:44:24 -07:00
Romain Neutron
347cc6434c Update changelog 2013-06-13 19:45:20 +02:00
Romain Neutron
f9b4978569 Merge pull request #390 from romainneutron/databox-labels 
[3.8] Add labels to databoxes
 2013-06-13 07:41:05 -07:00
Romain Neutron
ae7c0af333 Update CHANGELOG 2013-06-13 13:58:55 +02:00
Romain Neutron
cf74082938 Update CHANGELOG.md 2013-06-12 23:47:56 +03:00
Romain Neutron
32c2d6154a Remove phraseanet services, update configuration 2013-06-11 14:05:44 +02:00
Romain Neutron
7fd8d5b3c3 Update changelog 2013-06-01 01:29:07 +02:00
Romain Neutron
bdcb98a3d5 Update CHANGELOG 2013-05-31 12:22:33 +02:00
Romain Neutron
2704bb10f9 Update changelog 2013-05-30 18:12:32 +02:00
Nicolas Le Goff
034601293a Add changelog entry 2013-05-29 15:13:22 +02:00
Romain Neutron
37c7c19912 Update Changelog 2013-05-28 20:02:35 +02:00
Romain Neutron
7fa46369fb Update CHANGELOG.md 2013-05-28 20:58:29 +03:00