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

12919 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aina-esokia
c3486f9b8e allow svg logo and change gabari 2018-08-31 16:10:19 +04:00
aina-esokia
5948032af6 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2011-personalization-log 2018-08-31 15:41:55 +04:00
Nicolas Maillat
ebd6699b2f Merge pull request #2720 from filipx/PHRAS-2192_detailed_selection_dev 
PHRAS-2192_detailed_selection_dev
 2018-08-30 14:21:35 +02:00
Filip Vilic
e41145ead7 PHRAS-2192_detailed_selection_dev box position fix 2018-08-30 10:20:37 +02:00
aina-esokia
9406c2b2ce fix 2018-08-29 17:16:26 +04:00
aina-esokia
8f66a34b9d change gabari 2018-08-29 17:11:28 +04:00
aina-esokia
5dba9f64dd add personalisation logo 2018-08-29 15:11:04 +04:00
Nicolas Maillat
7a71da5d7e Merge pull request #2713 from filipx/PHRAS-2192_detailed_selection_dev 
PHRAS-2192 detailed selection info - html added
 2018-08-27 17:53:45 +02:00
Nicolas Maillat
6eb91a8d31 Merge pull request #2699 from aynsix/PHRAS-2175-subdef-building-duration 
PHRAS-2175 add subdef building duration in task log
 2018-08-27 14:52:37 +02:00
moctardiouf
6376bc584f Merge pull request #2716 from alchemy-fr/add-cache-dir 
add cache dir for aws capistrano deployment
 2018-08-22 17:46:06 +02:00
Moctar
80422652da add cache dir for aws capistrano deployment 2018-08-22 16:46:38 +02:00
Filip Vilic
c9a9a47b17 PHRAS-2191_string_translations generated 2018-08-21 13:35:56 +02:00
Filip Vilic
2994bbf890 PHRAS-2186_list_manager_add_user modal styling 2018-08-20 16:49:29 +02:00
Filip Vilic
5cd490ce99 PHRAS-2192 detailed selection info - html added 2018-08-16 11:37:50 +02:00
Filip Vilic
bb27de35a0 PHRAS-2186_list_manager_add_user 2018-08-14 11:49:48 +02:00
jygaulier
ac1bed84f2 Disable Travis on branche Symfony-4 2018-08-13 17:47:17 +02:00
Moctar
18d71a7a9b port modification made on 4.0 to master 2018-08-10 16:40:56 +02:00
aina-esokia
57a8612e92 add duration and file size 2018-08-09 16:08:15 +04:00
aina-esokia
ddd0695c99 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2175-subdef-building-duration 2018-08-09 15:45:27 +04: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
aina-esokia
1181f7da01 add subdef building duration in task log 2018-07-31 11:21:48 +04: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