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
12,462 Commits 268 Branches 107 Tags
e21c99d1250f6d55ee90d96ddcad106576489375
Commit Graph

12462 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aina-esokia
e21c99d125 remove line break on key 'Warning, this database is not empty' 2018-07-17 14:48:56 +04:00
Nicolas Maillat
c90a5ec4f4 Merge pull request #2681 from aynsix/PHRAS-2092-admin-task-ftp-pull 
PHRAS-2092 admin / task-manager / ftp-pull task : generate errors and stops
 2018-07-16 16:37:33 +02:00
Nicolas Maillat
c9c6906308 Merge pull request #2683 from nmaillat/PHRAS-2156_yarn_upgrade 
PHRAS-2159 change yarn cmd in Makefile
 2018-07-16 16:20:59 +02:00
nmaillat
2086dbd95f change yarn 2018-07-16 13:52:50 +00:00
aina-esokia
0050908cd3 fix ftp pull task error 2018-07-16 11:27:41 +04:00
Nicolas Maillat
57bc44e0d6 Merge pull request #2680 from aynsix/PHRAS-2088-admin-setup-checkbox-adobecc-plugin 
PHRAS-2088 add checkbox authorize adobecc plugin in admin / setup
 2018-07-13 10:39:13 +02:00
aina-esokia
e836c99b54 add checkbox authorize adobecc plugin in admin / setup 2018-07-13 12:06:59 +04:00
Nicolas Maillat
1ea18e1597 Merge pull request #2664 from aynsix/PHRAS-1993-API-answer-version 
PHRAS-1993 API / API answer / the age of token define API version in answer
 2018-07-12 17:46:43 +02:00
Nicolas Maillat
9ce318eb52 Merge pull request #2679 from aynsix/PHRAS-2142-create-api-forbiden-guest-account 
PHRAS-2142 Creating API app need to be forbiden for guest account
 2018-07-12 15:54:03 +02:00
aina-esokia
0dffe0e020 forbiden guest account to create api app 2018-07-12 15:01:51 +04:00
Nicolas Maillat
fc9feb99e2 Merge pull request #2674 from aynsix/PHRAS-1929-account-guest-patch-migration-doctrine 
PHRAS-1929 guest account patch doctrine migration
 2018-07-11 15:42:15 +02:00
aina-esokia
3d1bca663b Merge branch 'PHRAS-1929-account-guest-patch-migration-doctrine' of https://github.com/aynsix/Phraseanet into PHRAS-1929-account-guest-patch-migration-doctrine 
Conflicts:
	lib/Alchemy/Phrasea/Core/Version.php
 2018-07-11 17:09:07 +04:00
aina-esokia
4aa3ba106a merge master 2018-07-11 16:56:40 +04:00
aina-esokia
fb79966f91 update column guest also for deleted guest account 2018-07-11 16:50:23 +04:00
Nicolas Maillat
1225965e83 Merge branch 'master' into PHRAS-1929-account-guest-patch-migration-doctrine 2018-07-11 13:01:01 +02:00
Nicolas Maillat
dce8492b94 Merge pull request #2671 from aynsix/PHRAS-2086-adobecc-plugin-from-jyg 
PHRAS-2086 Add app token For adobe cc Phraseanet plugin
 2018-07-11 11:21:20 +02:00
Nicolas Maillat
5e9e05a975 Merge pull request #2675 from xrousset78800/fix/update-windows-provisionning 
PHRAS-2131 | Fix windows provisioning
 2018-07-10 21:09:18 +02:00
Xavier Rousset
edfb003e88 PHRAS-2131 Fix windows provisioning 2018-07-10 20:53:49 +02:00
aina-esokia
b0f67b745b guest account patch doctrine migration 2018-07-10 17:11:37 +04:00
aina-esokia
2b2e05150e add token for adobe cc plugin 2018-07-10 12:32:16 +04:00
aina-esokia
8c5457d496 fix api version 2018-07-09 14:51:52 +04:00
aina-esokia
40fbdd4fd9 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-1993-API-answer-version 2018-07-09 14:48:37 +04:00
Nicolas Maillat
99502ce69b Merge pull request #2667 from xrousset78800/fix/check-os-for-smb-or-nfs-sync-folder-strategy 
PHRAS-2140 Check OS for SMB or NFS folder strategy
 2018-07-06 20:51:31 +02:00
Nicolas Maillat
f49f9031cb Merge pull request #2666 from alchemy-fr/revert-2662-PHRAS-2086_AdobeCC-AppToken_4.1 
Revert "PHRAS-2086_AdobeCC-AppToken_4.1"
 2018-07-06 19:44:57 +02:00
Xavier Rousset
1bb5421879 PHRAS-2140 Check OS for SMB or NFS folder strategy 2018-07-06 18:11:07 +02:00
Nicolas Maillat
c4e4d1dbe9 Revert "PHRAS-2086_AdobeCC-AppToken_4.1" 2018-07-06 18:03:54 +02:00
Nicolas Maillat
281a68f98d Merge pull request #2662 from jygaulier/PHRAS-2086_AdobeCC-AppToken_4.1 
PHRAS-2086_AdobeCC-AppToken_4.1
 2018-07-06 16:49:37 +02:00
Nicolas Maillat
159435d1d4 Merge pull request #2665 from xrousset78800/fix/remove-db-alt-on-mariadb-task 
Remove DB_alt from mariadb task
 2018-07-06 16:48:40 +02:00
Jean-Yves Gaulier
15f0a7017a PHRAS-2086_AdobeCC-AppToken_4.1 
simplified
 2018-07-06 15:55:04 +02:00
Xavier Rousset
fcf7d4819d PHRAS-2137 Fix argument for phpversion when host is windows 2018-07-06 15:06:28 +02:00
aina-esokia
860d6c9028 update ApiTestCase 2018-07-06 16:01:23 +04:00
aina-esokia
1699b0a6d1 fix api version in answer 2018-07-06 15:23:54 +04:00
Nicolas Maillat
01f8ba396f Merge pull request #2661 from xrousset78800/PHRAS-2136/force-ansible-on-vm 
PHRAS-2136 Force Vagrant on VM
 2018-07-06 00:25:07 +02:00
Jean-Yves Gaulier
ea9ce1c04a PHRAS-2086_AdobeCC-AppToken_4.1 
add an "adobe_cc-plugin" api application
require system:upgrade to go to 4.1.0-alpha.10
must be enabled via "adobe_cc-enabled" in conf
 2018-07-05 18:53:12 +02:00
Xavier Rousset
99f0c25f38 PHRAS-2136 Force Vagrant on VM 2018-07-05 15:07:32 +02:00
Nicolas Maillat
65f103ae32 Merge pull request #2660 from xrousset78800/PHRAS-2134/add-inventories-dev-file-on-ansible 
PHRAS-2135 - PHRAS-2134 Add inventories dev file on ansible
 2018-07-05 15:04:43 +02:00
Xavier Rousset
7cf08ad4ea PHRAS-2134 Add missing inventories dev file 2018-07-05 14:43:01 +02:00
Xavier Rousset
8ddabdf1df PHRAS-2135 Remove mount options on Vagrantfile 2018-07-05 14:32:03 +02:00
jygaulier
cbed6488c6 PHRAS-2126_Array-to-String-err-idx_4.1 (#2658) 
* PHRAS-2126_Array-to-String-err-idx_4.1
fix : es error message during indexation is now dumped (not always a string)
fix : es file "size" is now type "long"

* PHRAS-2126_Array-to-String-err-idx_4.1
fix : bad gps coordinate are ignored by es indexation.

* PHRAS-2126_Array-to-String-err-idx_4.1
fix : gps coordinate can de negative.
 2018-07-03 17:32:22 +02:00
Nicolas Maillat
f7e9f115dc Merge pull request #2657 from aynsix/PHRAS-2124-api-substitute-update-subview 
PHRAS-2124 api substitute update subview when substitute is the "document"
 2018-07-03 07:52:57 +00:00
aina-esokia
82ce18fa00 api substitute update subview when 'document' 2018-07-03 10:05:27 +04:00
jygaulier
88035173c5 PHRAS-2126_Array-to-String-err-idx_4.1 (#2656) 
fix : es error message during indexation is now dumped (not always a string)
fix : es file "size" is now type "long"
 2018-07-02 18:41:40 +02:00
Nicolas Maillat
46cd7c806b Merge pull request #2655 from aynsix/PHRAS-2119-tmp_files-during-upload 
PHRAS-2119 use tmp_files on upload file
 2018-06-29 03:59:38 +00:00
aina-esokia
0d2e2eb494 use tmp_files on upload file 2018-06-28 17:32:57 +04:00
Nicolas Maillat
5205b83a66 Merge pull request #2438 from nmaillat/PHRAS-1798_update_version_name 
PHRAS-1798 update version number and the name for 4.1 Buxus
 2018-06-26 13:24:14 +00:00
Nicolas Maillat
41f95f3ca9 Merge branch 'master' into PHRAS-1798_update_version_name 2018-06-26 13:13:19 +00:00
aynsix
01f5380305 remove old tables (#2654) 2018-06-25 18:22:38 +02:00
aynsix
677ce56779 use tmp_files storage for generating all mediatype (#2652) 2018-06-25 13:45:06 +02:00
jygaulier
b9aa04be6b PHRAS-2096_Autoregister-Whitelist_MASTER (#2642) 
Add a whitelist to filter autoregistration
 2018-06-21 18:35:44 +02:00
Nicolas Maillat
b06169678b Merge pull request #2651 from aynsix/PHRAS-2115-admin-subview-create-mediatype 
PHRAS-2115  admin - database -subwiew create, PDF option don't appear is media type dropdown
 2018-06-21 13:31:46 +00:00