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

12500 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jygaulier
ac1bed84f2 Disable Travis on branche Symfony-4 2018-08-13 17:47:17 +02:00
Nicolas Maillat
84f917f0ce Merge pull request #2710 from aynsix/PHRAS-2185-list-manager-error-500 
PHRAS-2185 List - Manager - advance mode - 500 error when select a criteria
 2018-08-09 10:05:17 +00:00
Nicolas Maillat
1fb97aa89f Merge pull request #2708 from filipx/PHRAS-2187_list_manager_advanced_mode_navigation 
PHRAS-2187 move selected people to top, fix page navigation
 2018-08-09 08:25:36 +00:00
aina-esokia
4f9e07c030 change field name in user query 2018-08-09 12:08:59 +04:00
Filip Vilic
f6a86e6a86 PHRAS-2187 move selected people to top, fix page navigation 2018-08-08 11:48:37 +02:00
Nicolas Maillat
2ce9a375fb Merge pull request #2705 from aynsix/PHRAS-2180-change-notifier-timeout-master 
PHRAS-2180 change notifier timeout
 2018-08-07 11:45:26 +02:00
aina-esokia
6630fc7d15 change notifier timeout 2018-08-03 14:33:12 +04:00
moctardiouf
1e49e95973 Merge pull request #2703 from alchemy-fr/circle2-master 
PHRAS-1896_Migrate_from_circleci1_to_circleci2_master
 2018-08-02 19:24:39 +02:00
Moctar
fd62bad15c remove old circleci config file on master 2018-08-02 19:01:55 +02:00
Moctar
1ce9ac5864 updating circleci to version 2 on master 2018-08-02 19:00:48 +02:00
Nicolas Maillat
9bcfa8d35a Merge pull request #2701 from filipx/PHRAS-2188_advance_mode_Template_to_Models_label 
renaming label Template to Models
 2018-08-02 15:58:19 +02:00
Filip Vilic
f2a96f8026 renaming label Template to Models 2018-08-02 14:53:14 +02:00
Nicolas Maillat
52a591968b Merge pull request #2698 from filipx/PHRAS-2100_list_manager_2 
refactoring list manager
 2018-07-31 11:35:07 +02:00
Filip Vilic
c7a286eb8a refactoring list manager 2018-07-30 11:16:13 +02:00
Nicolas Maillat
86c82a78d3 Merge pull request #2693 from aynsix/PHRAS-2118-rollback-tmpfiles-just-for-video 
PHRAS-2118 rollback use just tmp_files storage for video
 2018-07-27 16:12:24 +02:00
Nicolas Maillat
1d82a01155 Merge pull request #2694 from aynsix/PHRAS-2165-keep-mysql-connection-open 
PHRAS-2165 keep mysql connection alive
 2018-07-27 16:11:58 +02:00
aina-esokia
e9b6d55335 add logger on mysql timeout and check appbox connection on subdefsjob 2018-07-27 15:34:56 +04:00
aina-esokia
5aaf0b8782 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2165-keep-mysql-connection-open 2018-07-27 15:25:15 +04:00
jygaulier
e7863122d0 PHRAS-2172_parade-saml-err500_MASTER (#2695) 
fix : the user application was updated (=created) after the check
add : "find()" on user repo (type hinted) to allow code sniff, completion etc.
 2018-07-26 16:34:20 +02:00
aina-esokia
74ff97eba6 modify call of lastInsertId() of connection 2018-07-26 12:24:40 +04:00
aina-esokia
7465b0d56b keep mysql connection alive 2018-07-26 10:30:12 +04:00
aina-esokia
63828aa813 use just tmp_files storage for video 2018-07-23 18:08:30 +04:00
Nicolas Maillat
db840292fe Merge pull request #2691 from aynsix/PHRAS-2164-masquing-some-app-in-application-section 
PHRAS-2164 User profil - application section , masquing of app created for adobe cc plugin
 2018-07-23 10:48:47 +02:00
aina-esokia
4f996f3ccc masquing some native Api application in user porfil -> Application tab 2018-07-23 11:53:18 +04:00
Nicolas Maillat
8494410e27 Merge pull request #2682 from aynsix/PHRAS-2122-subview-setup-default-path 
PHRAS-2122 admin -bases - base - subviews setup create new subdef , path is empty
 2018-07-20 16:23:07 +02:00
aina-esokia
aabcdccdf1 update subdefsTest 2018-07-20 18:07:59 +04:00
aina-esokia
4da75f154d add path field in subview window 2018-07-20 17:53:25 +04:00
aina-esokia
43bc3eb43b Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2122-subview-setup-default-path 2018-07-20 17:44:58 +04:00
Nicolas Maillat
d9fec4acbc Merge pull request #2685 from aynsix/PHRAS-2155-graphic-installer-elastic-step 
PHRAS-2155 graphic installer - add elastic step
 2018-07-19 19:39:55 +02:00
aina-esokia
2b02d6638e fix 2018-07-19 18:34:43 +04:00
aina-esokia
61741266b4 update setupController 2018-07-19 17:35:54 +04:00
aina-esokia
ca668938f7 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2155-graphic-installer-elastic-step 2018-07-19 17:32:25 +04:00
Nicolas Maillat
57dadf0e8a Merge pull request #2686 from nmaillat/PHRAS-2163_bump_API_version_41 
bump api version to 2.0.0
 2018-07-19 12:25:10 +02:00
nmaillat
98660a4aaf bump api version to 2.0.0 2018-07-18 23:23:59 +02:00
Nicolas Maillat
340a2f0e66 Merge pull request #2684 from aynsix/PHRAS-2155-graphic-installer 
PHRAS-2155 Phraseanet Graphic installer are NOK
 2018-07-18 18:53:01 +02:00
aina-esokia
50f8580e27 add searchengine step in graphic installer 2018-07-18 18:07:25 +04:00
aina-esokia
94913edcbd change text Phraseanet 2018-07-18 17:57:44 +04:00
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
36423a9b39 default path when create a new subviews 2018-07-16 16:29:27 +04: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