hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,868 Commits 268 Branches 107 Tags
a4544e235a5885cfafa00cc728722b3744960e9d
Commit Graph

11868 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thibaud Fabre
a4544e235a Update worker bundle version 2016-12-06 12:14:24 +01:00
Thibaud Fabre
f9184261bc Update dependencies using correct target version 2016-12-06 10:40:29 +01:00
Thibaud Fabre
fa301fd0dd Fix composer file 2016-12-05 17:51:13 +01:00
Thibaud Fabre
23c939f13c Merge master 2016-12-05 17:48:19 +01:00
Thibaud Fabre
97f2e66698 Merge 4.0 branch 2016-12-05 17:04:54 +01:00
Thibaud Fabre
b5bbb1851f Merge branch 4.0 2016-12-05 15:26:48 +01:00
Thibaud Fabre
c7082ee04c Bump worker bundle 2016-12-05 12:40:52 +01:00
Thibaud Fabre
b84c35ff66 Merge pull request #2022 from xrousset78800/fix/add-warning-message-on-admin 
Add warn message in admin
 2016-12-05 12:26:49 +01:00
Thibaud Fabre
5b040c90f9 Merge pull request #2024 from moctardiouf/patch-3 
Adding fractal alchemy-fr fork to composer.json
 2016-12-05 12:23:12 +01:00
moctardiouf
505013dadb Adding fractal alchemy-fr fork to composer.json 2016-12-02 17:29:34 +01:00
Xavier Rousset
cadb9febab PHRAS-1220 Add warn message in admin fields setup 2016-12-02 15:26:31 +01:00
Thibaud Fabre
c4ab995db9 Merge pull request #2023 from xrousset78800/fix/change-blocker-icon-size-on-admin-dashboard 
Change blocker icon size on admin dashboard
 2016-12-01 15:36:29 +01:00
Xavier Rousset
e7dd94d5b8 Fix misplaced icon on admin dashboard 2016-12-01 15:03:34 +01:00
Thibaud Fabre
939098f6d1 Update sample configuration with worker configuration 2016-11-30 16:13:06 +01:00
jygaulier
b7d2db2bea Merge pull request #2012 from jygaulier/PHRAS-830_CANDIDATES-CACHED 
PHRAS-830_CANDIDATES-CACHED
 2016-11-29 18:23:33 +01:00
jygaulier
c3d379afd1 Merge pull request #2011 from jygaulier/PHRAS-828_CTERMS-NOT-PURGED 
PHRAS-828_CTERMS-NOT-PURGED
 2016-11-29 18:22:24 +01:00
Thibaud Fabre
50c961c6f2 Merge pull request #2021 from alchemy-fr/fix/smtp-password-reset 
Fix/smtp password reset
 2016-11-25 15:22:42 +01:00
Thibaud Fabre
22542f8df8 Update test assertions 2016-11-25 15:12:15 +01:00
Thibaud Fabre
88a2813843 Refactor setup controller and registry manipulator 2016-11-25 14:03:01 +01:00
Thibaud Fabre
53c2182588 PHRAS-1092 Prevent password reset when saving config in admin 2016-11-25 11:47:43 +01:00
Thibaud Fabre
69f2334fe4 Merge pull request #2019 from xrousset78800/fix/notifications-are-missing 
Notifications are missing
 2016-11-24 17:26:27 +01:00
Thibaud Fabre
964dd227c8 Merge pull request #2020 from alchemy-fr/fix/document-substitution 
Fix document substitution
 2016-11-24 17:23:59 +01:00
Thibaud Fabre
d00d674cdf Fix document substitution 2016-11-24 17:21:11 +01:00
Xavier Rousset
8758756c16 PHRAS-1286 Add missing notifications to the list 2016-11-21 15:09:45 +01:00
Thibaud Fabre
97e08d91f4 Merge pull request #2018 from alchemy-fr/fix/record-id-sort 
Always add recordid as last sort option
 2016-11-17 17:04:11 +01:00
Thibaud Fabre
52578f9c65 Fix record ID field name when generating sort query 2016-11-17 16:56:12 +01:00
Thibaud Fabre
b8c695fe88 Always add recordid as last sort option 2016-11-17 15:47:58 +01:00
Thibaud Fabre
4b2eaf19c6 Merge pull request #2010 from xrousset78800/fix/Remove-old-plugin-directory-with-ansible 
Remove plugin folder before elasticsearch setup
 2016-11-17 11:22:11 +01:00
Thibaud Fabre
6b2788af92 Merge pull request #2017 from alchemy-fr/fix/download-permalink 
Fix download permalink
 2016-11-16 17:34:06 +01:00
Thibaud Fabre
2c35af060e Fix download permalink in unauthenticated contexts 2016-11-16 17:32:54 +01:00
jygaulier
82d15a777c Merge pull request #2016 from jygaulier/PHRAS-1284_MAX-DURATION-TASK-PARAMETER 
PHRAS-1284_MAX-DURATION-TASK-PARAMETER
 2016-11-16 10:58:31 +01:00
jygaulier
3a2c3e8342 Merge pull request #2014 from jygaulier/PHRAS-1285_CLI-MAKESUBDEF-DELETES-SUBDEFS 
fix: if using --name argument, some subdefs were deleted
 2016-11-16 10:57:21 +01:00
Jean-Yves Gaulier
c43dcf158c PHRAS-1284_MAX-DURATION-TASK-PARAMETER 
add : parameters "maxmeg" and "maxduration" (if present) are passed to task:run as --max-memory and --max-duration
 2016-11-15 18:07:25 +01:00
Jean-Yves Gaulier
435854657f fix: if using --name argument, some subdefs were deleted 2016-11-15 14:56:18 +01:00
jygaulier
35b7de98ce Merge pull request #2013 from jygaulier/PHRAS-1155_UPDATE-3.8-4.0-FAILS 
PHRAS-1155_UPDATE-3.8-4.0-FAILS
 2016-11-10 11:35:19 +01:00
Jean-Yves Gaulier
3a0517774c PHRAS-1155_UPDATE-3.8-4.0-FAILS 
fix : the new column "Orders.notification_method" creation (2016...) is moved to an older patch (2013...) since this patch runs on 2016 orm object "Orders"
 2016-11-09 15:22:19 +01:00
Jean-Yves Gaulier
120f311e5c PHRAS-830_CANDIDATES-CACHED 
fix : Loading cterms was not possible if the already loaded list was empty (missing html tag). Not a cache problem.
 2016-11-08 16:57:24 +01:00
Jean-Yves Gaulier
75a44812d6 PHRAS-828_CTERMS-NOT-PURGED 
- fix : cterms are cleared before reindexation (admin button) or populate (cli) ; terms in "stock" are preserved.
 nb.: rejected terms (red) are also purged so a term may pop-up again as candidate even if it had been rejected before.
 2016-11-07 18:38:51 +01:00
Xavier Rousset
7a49bb56e6 Remove plugin folder before elasticsearch setup 2016-11-07 16:51:24 +01:00
jygaulier
9d16ee8809 Merge pull request #2009 from jygaulier/PHRAS-1279_SUBSTITUTE-UNKNOWN-TYPE 
PHRAS-1279_SUBSTITUTE-UNKNOWN-TYPE
 2016-11-03 19:01:55 +01:00
Jean-Yves Gaulier
b526d0ecdc PHRAS-1279_SUBSTITUTE-UNKNOWN-TYPE 
- new : added missing options (settings) "size", "resolution", ... to "unknown"-type subdef
 2016-11-03 18:48:57 +01:00
Jean-Yves Gaulier
4e5d0758e6 PHRAS-1279_SUBSTITUTE-UNKNOWN-TYPE 
- new : added type "unknown" to subviews setup so an "unknown"-type document can have substituted subdefs
 2016-11-03 17:41:39 +01:00
Thibaud Fabre
77c848f32e Merge pull request #2008 from jygaulier/PHRAS-1260_INDEX-WIDTH-HEIGHT 
Phras 1260 index width height
 2016-11-03 16:22:26 +01:00
Jean-Yves Gaulier
229c80fe74 PHRAS-1260_INDEX-WIDTH-HEIGHT 
- new : added size (filesize) of document to es
 - new : methods getWidth(),... to record_adapter
 - fix : template
 2016-11-03 15:27:57 +01:00
Thibaud Fabre
3c96463436 Merge pull request #2007 from alchemy-fr/fix/string-field-mapping 
Fix invalid string mapping
 2016-11-03 13:41:37 +01:00
Thibaud Fabre
2e56649c42 Fix invalid string mapping 2016-11-03 11:02:50 +01:00
Thibaud Fabre
5b68ceefe2 Merge pull request #2001 from jygaulier/PHRAS-508_acl-cache 
PHRAS-508_acl-cache
 2016-11-02 17:54:48 +01:00
Jean-Yves Gaulier
68ab86d9d4 PHRAS-1260_INDEX-WIDTH-HEIGHT 
- new : added with & height of document to es
 2016-11-02 17:29:20 +01:00
Jean-Yves Gaulier
a7fe5090c6 PHRAS-508_acl-cache 
- fix ref on pdo stmt. again.
 2016-10-27 18:38:33 +02:00
Jean-Yves Gaulier
e42bb376f8 PHRAS-508_acl-cache 
- fix ref on pdo stmt
 2016-10-27 18:32:39 +02:00