hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-24 10:23:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,846 Commits 268 Branches 107 Tags
0698d58bffea1c56ac4e24c9000c84f52ffe6bb5
Commit Graph

7304 Commits

Author SHA1 Message Date
Thibaud Fabre
eb329096fd Merge pull request #2032 from jygaulier/PHRAS-1292_BAD-CHARS-IN-PERMALINKS 
PHRAS-1292_BAD-CHARS-IN-PERMALINKS
 2016-12-07 18:45:59 +01:00
Jean-Yves Gaulier
a88608636a PHRAS-1292_BAD-CHARS-IN-PERMALINKS 
fix : some invalid chars are now replaced by "_" in permalinks labels
 2016-12-07 16:29:21 +01:00
Thibaud Fabre
cc6efb0dc9 Merge 4.0 into master 2016-12-06 15:34:13 +01:00
Thibaud Fabre
c39f4117bd PHRAS-1289 Add group rights to compiled configuration 2016-12-06 15:01:12 +01:00
Thibaud Fabre
9ff43945ba Fix merge errors 2016-12-06 14:04:38 +01:00
Thibaud Fabre
0374deaf37 Fix merge error 2016-12-06 13:53:26 +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
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
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
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
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
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
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
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
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
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
Jean-Yves Gaulier
ce0aeaff0e PHRAS-508_acl-cache 
- fix "static" into method causing side effects
 2016-10-27 18:23:27 +02:00
Jean-Yves Gaulier
343967b7c3 PHRAS-508_acl-cache 
- wip
 2016-10-27 17:51:04 +02:00
Thibaud Fabre
2ae21532bc Fix undefined property error 2016-10-27 15:42:26 +02:00
Jean-Yves Gaulier
a5aecacefe PHRAS-508_acl-cache 
- tryout without cache
 2016-10-27 15:38:23 +02:00
Thibaud Fabre
59befbfecc Clean up complex field hierarchy to improve readability 2016-10-27 15:22:39 +02:00
Thibaud Fabre
e1fc53dc64 Clean up mapping build process 2016-10-27 15:17:33 +02:00
Thibaud Fabre
ce59523405 Add specialized complex mapping for property maps 2016-10-27 15:15:54 +02:00
Jean-Yves Gaulier
fe7f3762dd PHRAS-508_acl-cache 
- fix for tests
 2016-10-27 15:07:31 +02:00
Thibaud Fabre
165877e50a Fix infinite recursion error 2016-10-27 13:14:05 +02:00
Thibaud Fabre
cba5423822 Fix concept_path node in index structure 2016-10-27 13:04:47 +02:00
Jean-Yves Gaulier
45eea29710 PHRAS-508_acl-cache 
- fix unit tests
 2016-10-26 19:14:11 +02:00
Jean-Yves Gaulier
0c75189a64 PHRAS-508_acl-cache 
- refactor : acl strings changed to ACL class constants
 - code cleanup
 - wip but try to merge for bc break test
 2016-10-26 16:13:47 +02:00
Jean-Yves Gaulier
642da0fca5 PHRAS-508_acl-cache 
- wip
 2016-10-26 16:13:47 +02:00
Jean-Yves Gaulier
6a2285f66d PHRAS-508_acl-cache 
- wip
 2016-10-26 16:13:47 +02:00
Thibaud Fabre
f4f85dc3b7 Merge pull request #1997 from alchemy-fr/fix/order-archive-path 
PHRAS-1275 Fix order archive path
 2016-10-26 16:02:58 +02:00