Commit Graph

7021 Commits

Author SHA1 Message Date
jygaulier
8117d1ebc0 PHRAS-1751_GOOGLE-AUTH_master (#2384)
* PHRAS-1751_GOOGLE-AUTH_master
replace lib "alchemy/google-plus-api-client" by "google/apiclient"
had to downgrade facebook/php-sdk from 4 (does not exists ?) to 3 (abandoned anyway) to allow composer update.
see PHRAS-1752

* PHRAS-1751_GOOGLE-AUTH_master
revert composer.lock, only remove & update new google-sdk (composer full update make tests boot to fail. to see later)

* PHRAS-1751_GOOGLE-AUTH_master
fix unit test
2017-11-30 10:45:56 +01:00
Mike Ng
0c3918b8a5 updating code 2017-11-17 14:21:11 +04:00
Nicolas Maillat
689505928a Merge pull request #2231 from mike-esokia/PHRAS-1524_Port_PHRAS-1475_and_PHRAS-1498
PHRAS-1524 port PHRAS-1475 and PHRAS-1498
2017-11-16 13:40:51 +01:00
Nicolas Maillat
40772aeea2 Merge pull request #2230 from mike-esokia/PHRAS-1522_PORT_PHRAS-1337
PHRAS-1522 port PHRAS-1337
2017-11-15 15:21:13 +01:00
Mike Ng
197612de7b implementation back-end for refactoring of orders
refactoring layout order-box and order-item
2017-08-17 14:42:10 +04:00
Mike Ng
b18dcf1147 implementation backend to get statistics for googlechart 2017-08-16 11:00:09 +04:00
Mike Ng
40f88ed678 port PHRAS-1337 to 4.1 2017-08-16 09:56:08 +04:00
Mike Ng
191a59c827 add search to candidate tab
refactor search_term function in backend
2017-08-15 12:54:16 +04:00
moctardiouf
cf0440dda6 PHRAS-1409_fix-push-list-management-error-500 2017-06-14 11:05:19 +02:00
moctardiouf
e591a4160f PHRAS-1359_remove_back_slash_n (#2098)
removing \n into SQL requests causing memcached content deletion issues.
2017-05-18 11:04:20 +02: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
cefb2f99f4 Merge pull request #2033 from alchemy-fr/4.0
Port PHRAS-1292 in master
2016-12-19 13:41:41 +01:00
Nicolas Maillat
3547d33ba3 Change right mask to asset dir PHRAS-1294
Change right mask to asset dir PHRAS-1294 into master
2016-12-12 16:45:02 +01:00
Nicolas Maillat
b151faaba7 Change right mask to asset dir PHRAS-1294
Change right mask to asset dir PHRAS-1294
2016-12-12 16:44:02 +01:00
jygaulier
f412a031b9 Update BuildSubdefs.php 2016-12-12 14:46:44 +01:00
jygaulier
0f491e640a Update BuildSubdefs.php 2016-12-12 14:44:55 +01:00
Jean-Yves Gaulier
a16ce93110 PHRAS-1293_CLI-BUILD-SUBDEFS-RECORDS-IGNORED
- fix : no more subdefs ignored when mode=scheduled
- change : --min_record is now --min_record_id ; --max_record is now --max_record_id
- add : options --maxrecs, --maxduration, --ttl
2016-12-08 19:34:45 +01:00
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