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
14,253 Commits 268 Branches 107 Tags
9bbc36f6229a47ad522a0a057c8265cef7fb54e5
Commit Graph

7703 Commits

Author SHA1 Message Date
Nicolas Maillat
9298580888 Merge pull request #2789 from xrousset78800/fix/update-access-page-design 
Update access page design
 2018-11-06 16:26:42 +00:00
Nicolas Maillat
36395f25ac Merge pull request #2801 from aynsix/PHRAS-1864-port-41-1868-admin-mount-database 
PHRAS-1864 port to 4.1 PHRAS-1868 database mount
 2018-11-06 09:32:31 +00:00
Nicolas Maillat
1cfdb6af2c Merge pull request #2802 from aynsix/PHRAS-2274-port41-changing-status-in-log_docs 
PHRAS-2274 port to 4.1 PHRAS-2227 FIX changing status appear in log_docs table
 2018-11-06 09:32:11 +00:00
aina-esokia
18ff40a537 port to 4.1 PHRAS-2227 FIX changing status appear in log_docs table 2018-11-06 11:22:53 +04:00
aina-esokia
9c9d280250 port to 4.1 PHRAS-1868 database mount 2018-11-05 18:22:52 +04:00
aina-esokia
2eeb1721e9 port to 4.1 PHRAS-1831 2018-11-05 15:02:55 +04:00
aina-esokia
17800bc33c do the pagination for all accept header 2018-10-26 18:12:07 +04:00
aina-esokia
b407a17bdf change query 2018-10-26 18:01:31 +04:00
aina-esokia
415b0fcc27 update 2018-10-24 16:12:56 +04:00
aina-esokia
103b8f7265 fix requete pagination 2018-10-24 15:36:06 +04:00
aina-esokia
fbf8d80b4a Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2196-api-stories-pagination 2018-10-23 18:11:34 +04:00
aina-esokia
5281bafe95 fix api search pagination story 2018-10-23 18:11:21 +04:00
Xavier Rousset
a8ebe5fc43 Update access page design 2018-10-19 19:10:39 +02:00
aina-esokia
d2b3d96760 update jeton when set metadatas 2018-10-18 14:30:37 +04:00
aina-esokia
9c59477017 change param name 2018-10-11 14:26:36 +04:00
aina-esokia
a76c971ab1 update V1Controller 2018-10-11 14:26:36 +04:00
aina-esokia
e9beafef85 add max_item and page in api route search and stories 2018-10-11 14:26:36 +04:00
aina-esokia
2639b71c36 filter special characterin filename when created lazaretfile 2018-10-10 18:36:32 +04:00
jygaulier
8768cd84f7 PHRAS-2171_mime-truncated_MASTER (#2748) 
extend "mime" columns (record, subdef) to 255 to allow long mimes.
try to fix truncated mime.
 2018-09-27 16:18:28 +02:00
aina-esokia
89b9ea0b2a change default mod 2018-09-04 17:21:03 +04:00
Nicolas Maillat
4773678417 Merge pull request #2721 from aynsix/PHRAS-2175-task-log-size 
PHRAS-2175 fix size in task log
 2018-09-04 11:46:08 +02:00
Nicolas Maillat
9300823f05 Merge pull request #2726 from aynsix/PHRAS-2205-saving-configuration-file 
PHRAS-2205 Change the configuration file content update methode : when saving from admin/setup
 2018-09-04 11:45:36 +02:00
aina-esokia
288cdbd3e2 update Configuration.php 2018-09-03 15:03:47 +04:00
aina-esokia
354c918a90 admin/setup: change file content instead of recreate config file 2018-09-03 14:58:05 +04:00
aina-esokia
c3790befce fix size in task log 2018-08-31 18:16:52 +04:00
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
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
Filip Vilic
5cd490ce99 PHRAS-2192 detailed selection info - html added 2018-08-16 11:37:50 +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
aina-esokia
4f9e07c030 change field name in user query 2018-08-09 12:08:59 +04:00
aina-esokia
6630fc7d15 change notifier timeout 2018-08-03 14:33:12 +04:00
aina-esokia
1181f7da01 add subdef building duration in task log 2018-07-31 11:21:48 +04: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
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
aina-esokia
4f996f3ccc masquing some native Api application in user porfil -> Application tab 2018-07-23 11:53:18 +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
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