Commit Graph

11889 Commits

Author SHA1 Message Date
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
Nicolas Maillat
1657d96610 add bin/developer orm:generate-proxies deployement
add bin/developer orm:generate-proxies for automated deployement
2016-12-12 11:25:45 +01:00
Nicolas Maillat
e8d0bfc6dc Merge pull request #2034 from jygaulier/PHRAS-1293_CLI-BUILD-SUBDEFS-RECORDS-IGNORED
PHRAS-1293_CLI-BUILD-SUBDEFS-RECORDS-IGNORED
2016-12-09 10:36:00 +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
6a7e8830db Merge pull request #2031 from alchemy-fr/feature/admin-collection-id
Change order and wording for base ID in collection details
2016-12-06 15:32:40 +01:00
Thibaud Fabre
7ac6318436 Merge pull request #2030 from alchemy-fr/fix/config-file-permissions
PHRAS-1289 Add group rights to compiled configuration
2016-12-06 15:32:29 +01:00
Thibaud Fabre
c39f4117bd PHRAS-1289 Add group rights to compiled configuration 2016-12-06 15:01:12 +01:00
Thibaud Fabre
aa5041dbf4 Change order and wording for base ID in collection details 2016-12-06 14:55:23 +01:00
Thibaud Fabre
c8ed4a22f4 Merge 4.0 into master 2016-12-06 14:45:57 +01:00
Thibaud Fabre
6f1a3488ca Merge pull request #2025 from alchemy-fr/feature/merge-4.0
Feature/merge 4.0
2016-12-06 14:43:33 +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
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
f553369445 Merge pull request #2027 from moctardiouf/patch-4
update facebook sdk dependency version
2016-12-06 09:53:49 +01:00
moctardiouf
64fe1bdf78 update facebook sdk dependency version 2016-12-05 18:07:30 +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