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

7420 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Le Goff
b3e49d68cb Fix tinymce copy task 2014-02-26 12:31:29 +01: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
Romain Neutron
a2fe4f2cfc Merge pull request #976 from nlegoff/fix-live-info 
[3.9] Fix task live informations
 2014-02-26 02:11:20 +01:00
Nicolas Le Goff
3348347072 Fix task live informations 2014-02-25 18:53:17 +01:00
Romain Neutron
3e1e115292 Merge pull request #973 from nlegoff/fix-tests-debian 
[3.9] Fix tests using GPAC on debian system
 2014-02-25 18:24:28 +01:00
Romain Neutron
d27792a942 Merge pull request #972 from nlegoff/upgrade-fix 
[3.9] Fix table detection
 2014-02-25 16:35:03 +01:00
Nicolas Le Goff
2028871f34 Fix Cs 2014-02-25 16:33:43 +01:00
Nicolas Le Goff
4a242a120e Fix tests using GPAC on debian system 2014-02-25 16:02:32 +01:00
Nicolas Le Goff
c100f0bfe4 Fix table detection 2014-02-25 15:38:01 +01:00
Nicolas Le Goff
3918791c28 Merge pull request #971 from romainneutron/introduce-zippy 
[3.9] Use Zippy to zip
 2014-02-24 20:00:06 +01:00
Nicolas Le Goff
ab7f567d62 Bump to version 3.8.4-alpha.0 2014-02-24 18:40:10 +01:00
Romain Neutron
727ad07908 Merge branch '3.8' 
Conflicts:
	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/es_ES/LC_MESSAGES/phraseanet.mo
	locale/es_ES/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/actions/Property/index.html.twig
 2014-02-24 16:29:32 +01:00
Romain Neutron
5e8e8f59d5 Use Zippy to zip 2014-02-24 16:25:59 +01:00
Nicolas Le Goff
1467dfbc3e Prepare version 3.8.3 3.8.3 2014-02-24 16:16:22 +01:00
Nicolas Le Goff
f8e865bdcc Update changelog 2014-02-24 16:15:12 +01:00
Romain Neutron
4351bec611 Update locales 2014-02-24 16:03:01 +01:00
Nicolas Le Goff
07fa1e6e5a Merge pull request #969 from romainneutron/fix-1700 
[3.8] Fix #1700 : Changing a record property does not work
 2014-02-24 15:13:06 +01:00
Romain Neutron
bbcf562af9 Fix #1700 : Changing a record property does not work 2014-02-24 12:39:54 +01:00
Nicolas Le Goff
4535491e6c Merge pull request #965 from romainneutron/host-configuration 
[3.9] Add configuration per host
 2014-02-24 12:30:26 +01:00
Romain Neutron
50aa029fc7 Merge branch '3.8' 2014-02-24 12:27:49 +01:00
Nicolas Le Goff
06b633a615 Merge pull request #968 from romainneutron/doctrine-connection 
[3.9] Use Doctrine DBAL as connection
 2014-02-24 12:15:03 +01:00
Nicolas Le Goff
58c9e8733d Merge pull request #966 from romainneutron/plugin-disable 
[3.9] Add commands to enable/disable plugins
 2014-02-24 11:41:08 +01:00
Romain Neutron
5a5da77662 Use Doctrine DBAL instead of custom connection 2014-02-22 23:55:12 +01:00
Romain Neutron
a6bfcd95f4 Fix host configuration 2014-02-22 15:34:19 +01:00
Romain Neutron
ed440fa8c6 Merge pull request #962 from nlegoff/websocket-js 
[3.9] Add web-socket-js as project dependency
 2014-02-22 10:40:02 +01:00
Romain Neutron
de13d874a3 Fix configuration usage 2014-02-22 10:39:07 +01:00
Romain Neutron
079836bfe5 Merge pull request #967 from nlegoff/fix1701 
[3.8] Fix #1701 Add missing trans filter
 2014-02-22 10:17:49 +01:00
Nicolas Le Goff
8eb46eacec Fix missing trans filter 2014-02-21 18:51:32 +01:00
Romain Neutron
8a84a3618d Merge pull request #963 from nlegoff/licence 
[3.9] Add missing LICENSE
 2014-02-21 17:46:04 +01:00
Romain Neutron
501b313b25 Bump to version 3.9.0-alpha.12 2014-02-21 16:41:11 +01:00
Romain Neutron
fb693836d5 Add enable/disable plugins commands 2014-02-21 16:41:11 +01:00
Romain Neutron
53cb47d0b7 Update bin/console to bin/setup 2014-02-21 16:37:54 +01:00
Romain Neutron
df56eb4da7 Force plugin configuration in configuration 2014-02-21 16:37:53 +01:00
Nicolas Le Goff
0ce9c6ebb6 Add web-socket-js as project dependency 2014-02-21 15:56:42 +01:00
Romain Neutron
136ba4fa80 Merge pull request #964 from romainneutron/circular-refs-1 
[3.9] Remove some circular references
 2014-02-21 15:54:25 +01:00
Nicolas Le Goff
71e6bddc16 Add missing LICENSE 2014-02-21 15:47:19 +01:00
Romain Neutron
8a9b6d5d3c Update fixtures 2014-02-21 14:36:38 +01:00
Romain Neutron
c4efe6d548 Add host configuration 2014-02-21 14:36:38 +01:00
Romain Neutron
862fe696cb Remove some circular references 2014-02-20 20:09:14 +01:00
Romain Neutron
9e650a7954 Merge branch 'nlegoff-replace_users' 2014-02-20 18:18:28 +01:00
Romain Neutron
4c29ea5a7a Merge branch 'replace_users' of https://github.com/nlegoff/Phraseanet into nlegoff-replace_users 
Conflicts:
	lib/classes/ACL.php
	lib/classes/User/Adapter.php
	lib/classes/eventsmanager/notify/autoregister.php
	lib/classes/eventsmanager/notify/order.php
	lib/classes/eventsmanager/notify/orderdeliver.php
	lib/classes/eventsmanager/notify/ordernotdelivered.php
	lib/classes/eventsmanager/notify/push.php
	lib/classes/eventsmanager/notify/register.php
	lib/classes/eventsmanager/notify/validate.php
	lib/classes/eventsmanager/notify/validationdone.php
	lib/classes/eventsmanager/notify/validationreminder.php
	lib/classes/module/report/add.php
	lib/classes/module/report/edit.php
	lib/classes/module/report/push.php
	lib/classes/module/report/sent.php
	lib/classes/module/report/validate.php
	lib/classes/record/preview.php
 2014-02-20 18:02:27 +01:00
Nicolas Le Goff
c52ca78034 Merge pull request #4 from romainneutron/nlegoff-replace_users-address-comments 
address comments
 2014-02-20 17:07:14 +01:00
Romain Neutron
e20c915775 Avoid using getPartialReference 2014-02-20 16:14:01 +01:00
Romain Neutron
7ef147c975 Address comments 2014-02-20 16:09:18 +01:00
Romain Neutron
134717343a Fix latest merge 2014-02-20 16:06:51 +01:00
Romain Neutron
12f9575a8b Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php
	lib/classes/API/OAuth2/Adapter.php
	lib/classes/API/V1/adapter.php
	lib/classes/Feed/Adapter.php
	lib/classes/Feed/Collection.php
	lib/classes/Feed/Entry/Adapter.php
	lib/classes/Feed/Entry/Item.php
	lib/classes/Feed/Publisher/Adapter.php
	lib/classes/User/Adapter.php
	lib/classes/base.php
	lib/classes/connection.php
	lib/classes/databox/cgu.php
	lib/classes/eventsmanager/notify/autoregister.php
	lib/classes/eventsmanager/notify/bridgeuploadfail.php
	lib/classes/eventsmanager/notify/order.php
	lib/classes/eventsmanager/notify/orderdeliver.php
	lib/classes/eventsmanager/notify/ordernotdelivered.php
	lib/classes/eventsmanager/notify/push.php
	lib/classes/eventsmanager/notify/register.php
	lib/classes/eventsmanager/notify/validate.php
	lib/classes/eventsmanager/notify/validationdone.php
	lib/classes/eventsmanager/notify/validationreminder.php
	lib/classes/module/console/taskState.php
	lib/classes/module/console/taskrun.php
	lib/classes/record/adapter.php
	lib/classes/registry.php
	lib/classes/set/order.php
	lib/classes/task/abstract.php
	lib/classes/task/appboxAbstract.php
	lib/classes/task/databoxAbstract.php
	lib/classes/task/manager.php
	lib/classes/task/period/RecordMover.php
	lib/classes/task/period/apibridge.php
	lib/classes/task/period/archive.php
	lib/classes/task/period/ftp.php
	lib/classes/task/period/ftpPull.php
	templates/web/prod/upload/lazaret.html.twig
 2014-02-20 16:05:23 +01:00
Nicolas Le Goff
ace5efce78 Fix CS 2014-02-20 15:31:13 +01:00
Nicolas Le Goff
5f355218a8 Login is not longer modified when user is deleted 2014-02-20 15:06:25 +01:00
Nicolas Le Goff
058a4f1c3e Use manipulator.user to delete users 2014-02-20 15:06:25 +01:00
Nicolas Le Goff
405dbb7533 Merge pull request #961 from romainneutron/env-var 
[3.9] JS_COMPILER is not related to the Travis build but to the build itself
 2014-02-20 14:50:43 +01:00