hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-26 03:13:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,450 Commits 268 Branches 107 Tags
3d2524c53d7c7028cc9acaf0b3848294e2a4536d
Commit Graph

262 Commits

Author SHA1 Message Date
aynsix
a0521c59fc port to 4.1 archive task improvement 2020-05-22 12:24:19 +03:00
Harrys Ravalomanana
5f2617e5f7 PHRAS-2816 #comment add attribute gui_visible to show fields on roll over and detailled view #time 2h 2019-11-12 18:13:05 +04:00
Jean-Yves Gaulier
b4e848a5e9 PHRAS-2808-2806_disable-cterms_mask-writable-fields_4.1 
new : checkbox in admin/field to allow gui (prod) editing, default=checked.
rename "publish_cterms" to "generate_cterms"
todo : implement "gui_editable" in edit ux (hide field when =false)
todo : 2 new strings (ckbox labels) to trans
 2019-10-31 19:31:12 +01:00
Jean-Yves Gaulier
ce13112105 PHRAS-2808_disable-cterms_4.1 
new : checkbox in admin/field to disable cterms generation.
fix : when cterms is cleared (during reindex), rejected terms are kept
WIP
 2019-10-31 18:12:26 +01:00
aina-esokia
a656aa0072 audio subdeffrom video 2019-01-24 18:03:03 +04:00
aina-esokia
d2bdd2ed4a port 4.1: migrate field type text to string 2019-01-11 14:45:33 +04:00
Jean-Yves Gaulier
61058a3658 PHRAS-1326_intl-labels-in-facets_MASTER 
add "labels" array to facets
 2018-11-27 19:33:36 +01:00
aina-esokia
74ff97eba6 modify call of lastInsertId() of connection 2018-07-26 12:24:40 +04:00
aina-esokia
4da75f154d add path field in subview window 2018-07-20 17:53:25 +04:00
aina-esokia
36423a9b39 default path when create a new subviews 2018-07-16 16:29:27 +04:00
aina-esokia
5488d5d47c FIX create subview mediatype dropdown 2018-06-20 17:26:19 +04:00
aina-esokia
9180bc88ef generate pdf subdef 2018-06-08 15:49:46 +04:00
xrousset78800
314473b169 PHRAS-1920 Add alias on deprecated function used on webgallery plugin (#2513) 2018-03-13 12:01:21 +01:00
Mike Ng
30f49bdd35 resolve conflict 2018-01-08 15:57:13 +04:00
Xavier Rousset
c7f6b325d8 PHRAS-1766 Add orderable checkbox for each subdef - Remove order option on groups 2017-12-18 18:02:48 +01:00
Xavier Rousset
3a6f2eb365 Fix travis tests 2017-12-14 11:59:42 +01:00
Xavier Rousset
1683191d19 PHRAS-1719 Add presets selection on subdef admin page 2017-12-13 01:58:36 +01:00
jygaulier
a70bf2fc70 PHRAS-1304_AUTO-COMPLETION_MASTER (#2061) 
* PHRAS-1304_AUTO-COMPLETION_MASTER
ported from 4.0

* PHRAS-1304_AUTO-COMPLETION_MASTER
fix

* PHRAS-1304_AUTO-COMPLETION_MASTER
fix

* PHRAS-1304_AUTO-COMPLETION_MASTER
bump php version to 5.5.31 (5.5.21 is obsolete in cicleci)

* PHRAS-1304_AUTO-COMPLETION_MASTER
bump php version to 5.5.31 : php.ini moved in circelci

* PHRAS-1304_AUTO-COMPLETION_MASTER
add zmq & date to php for circleci

* PHRAS-1304_AUTO-COMPLETION_MASTER
add zmq

* PHRAS-1304_AUTO-COMPLETION_MASTER
bump amqp

* PHRAS-1304_AUTO-COMPLETION_MASTER
downgrade amqp to 1.2 to test compilation against old librabbit 0.4 (ubuntu)

* PHRAS-1304_AUTO-COMPLETION_MASTER
add amqp.so to php.ini, (re)bump amqp to 1.6

* PHRAS-1304_AUTO-COMPLETION_MASTER
build rabittmq from git

* PHRAS-1304_AUTO-COMPLETION_MASTER
build rabittmq from git again

* PHRAS-1304_AUTO-COMPLETION_MASTER
build rabittmq from git again and again

* PHRAS-1304_AUTO-COMPLETION_MASTER
fix test on media rotation 600*400 -> 400*599 !!!

* PHRAS-1304_AUTO-COMPLETION_MASTER
restore facebook sdk to 4.0.1 due to mistake

* PHRAS-1304_AUTO-COMPLETION_MASTER
deleted unwanted file
 2017-02-06 18:26:56 +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
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
6a2285f66d PHRAS-508_acl-cache 
- wip
 2016-10-26 16:13:47 +02:00
Jean-Yves Gaulier
e10a6f8ebd PHRAS-1177_change-multi-on-field 
- change : no more "multi" checkbox when creating a field
- new field is not "report" anymore
#time 1h
 2016-06-27 16:45:51 +02:00
Jean-Yves Gaulier
6572f3ba14 PHRAS-1177_change-multi-on-field 
- fix : multi field gets the default separator
#time 10m
 2016-06-23 20:39:09 +02:00
Jean-Yves Gaulier
deafb8b957 PHRAS-1177_change-multi-on-field 
- add : now the "multi" attribute on a field can be changed after creation
- change : field template
#time 3h
 2016-06-23 20:22:25 +02:00
Benoît Burnichon
2b097e9be7 Extract SubdefGroup class 2016-04-22 12:38:33 +02:00
Benoît Burnichon
1e18b3e69f This is a combination of 33 commits. 
- Squashed Pull request #1730
- Squashed Pull request #1741
- Squashed Pull request #1742
- Squash merge branch 4.0
- Squashed Pull request #1744
- Squashed Pull request #1746
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed Pull request #1758
- Avoid using imagine/imagine alias as it is causing install issues
- Squashed merge branch 4.0
- Squashed Pull request #1763
- Squashed merge branch 4.0
- Squash of 6 commits
- Squashed merge branch 4.0
- This is a combination of 2 commits.
- Squashed Pull request #1775
- Squashed Pull request #1777
- Squashed Pull request #1779
- Squashed Pull request #1780
- Squashed Pull request #1782
- Adds a Pull request template
- Squased Pull request #1783
- Squash Pull request #1786
- Squashed Pull request #1796
- Squashed merge branch 4.0
- Squash Pull request #1791
- Squashed merge branch 4.0
- Squashed Pull request #1808
- Squashed Pull request #1811
- Squashed Pull request #1809
 2016-04-20 16:22:14 +02:00
Benoît Burnichon
033542ac2f Remove some arguments from query and add them to options 2016-04-15 16:36:28 +02:00
Benoît Burnichon
840aa86bb4 Proper caching of names in databox_descriptionStructure 2016-03-31 15:27:09 +02:00
Benoît Burnichon
020d7a9b02 Remove VocabularyController 2016-03-30 16:33:10 +02:00
Benoît Burnichon
35a4111cf3 Slight refactoring of caption_record, databox_field and record_adapter 2016-03-30 11:49:50 +02:00
Benoît Burnichon
5a83a9c1c5 PHPCS 2016-03-25 13:18:52 +01:00
Benoît Burnichon
052d0d6f62 Merge branch '4.0' 2016-03-10 14:08:43 +01:00
Benoît Burnichon
f8411fd409 Special handling of field with no source 2016-03-09 18:43:48 +01:00
Benoît Burnichon
e52273480b Rename Nosource tag into NoSource. Add fieldName property 2016-03-09 16:09:10 +01:00
Benoît Burnichon
4c9ad1f056 fix databox_field tag initialization 2016-03-09 13:50:48 +01:00
Benoît Burnichon
6d2df0f9bd fixup Nosource to be properly initialized. Tag should be Value Objects 2016-03-09 13:50:44 +01:00
Jean-Yves Gaulier
b6cc58a68e PHRAS-987 1h 
PNG-Subdefs (port from 3.8)
 2016-03-08 12:09:35 +01:00
Benoît Burnichon
93fd4bda03 Add orderable status in admin forms 2016-02-24 17:23:06 +01:00
Benoît Burnichon
0a40ef291d Extract SubdefGroup class 2016-02-24 13:52:33 +01:00
Benoît Burnichon
5916e584eb Merge branch '4.0' 2016-02-17 19:53:48 +01:00
Jean-Yves Gaulier
28a7a653d3 #PHRAS-987 1h 
PNG-Subdefs (port from 3.8)
 2016-02-17 16:55:47 +01:00
Benoît Burnichon
90b4ad596c Check whether subdef exists before perform get on it 2016-02-17 12:41:06 +01:00
Benoît Burnichon
721edc33c6 Add Orderable to subdef Controller 2016-02-10 17:06:08 +01:00
Benoît Burnichon
20178f76cd Add orderable flat to subdef 2016-02-10 16:52:14 +01:00
Benoît Burnichon
810bef41fb rename is_downloable to isDownloable 
Change Functional to unit test
 2016-02-10 16:01:24 +01:00
Benoît Burnichon
02879cdde5 Reorder class 2016-02-10 15:07:51 +01:00