hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 15:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,248 Commits 268 Branches 107 Tags
5cbb377f29256fd8cfa75c2f6dc46b47ca67d61b
Commit Graph

11248 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thibaud Fabre
5cbb377f29 Merge pull request #1980 from alchemy-fr/feature/native-session-handler 
Native session handler
 2016-10-13 14:40:04 +02:00
Thibaud Fabre
0b06042460 Merge pull request #1979 from alchemy-fr/feature/session-cookie-recommandations 
Session cookie recommandations
 2016-10-13 14:38:36 +02:00
Thibaud Fabre
0c8f507abe PHRAS-1236 Add native session handler config option 
Allows use of custom session handlers via php.ini
 2016-10-13 14:29:23 +02:00
Thibaud Fabre
ca0c015e17 PHRAS-1266 Add PHP configuration recommandations for secure cookies 2016-10-13 14:07:05 +02:00
Thibaud Fabre
fdb645019e Merge pull request #1977 from xrousset78800/fix/hide-cgu-when-insuffisent-privilege 
Hide cgu when insuffisent privilege
 2016-10-12 10:34:54 +02:00
Xavier Rousset
7945994140 PHRAS-1173 SQL fix and template update 2016-10-11 15:27:13 +02:00
Thibaud Fabre
c689a59409 Merge pull request #1975 from alchemy-fr/fix/missing-binaries 
Add MP4Box to provisioning
 2016-10-06 16:25:29 +02:00
Thibaud Fabre
3e99b9ffb4 Add MP4Box to provisioning 2016-10-06 16:11:09 +02:00
Thibaud Fabre
15d5780201 Merge pull request #1973 from alchemy-fr/provisioning/missing-dependencies 
Add some missing Phraseanet dependencies to provisioning
 2016-10-05 16:28:41 +02:00
Thibaud Fabre
0a137e6f01 Add some missing Phraseanet dependencies to provisioning 2016-10-05 16:19:40 +02:00
Thibaud Fabre
01281c2942 Merge pull request #1970 from xrousset78800/fix/update-sharing-logo 
Update logos on sharing page
 2016-10-04 14:58:23 +02:00
Xavier Rousset
632c799f3e PHRAS-1127 Update logos on sharing page 2016-10-04 14:48:15 +02:00
Thibaud Fabre
ee315bbfa6 Merge pull request #1969 from xrousset78800/fix/truncated-tooltip 
Change design to remove tooltip truncate
 2016-09-29 19:01:47 +02:00
Xavier Rousset
b1a0d59710 PHRAS-1235 Change design to remove tooltip truncate 2016-09-29 18:11:58 +02:00
Thibaud Fabre
f2b956b015 Merge pull request #1968 from jygaulier/PHRAS-946_delete-record-api 
PHRAS-946_delete-record-api
 2016-09-29 17:41:24 +02:00
Jean-Yves Gaulier
485b9edf96 PHRAS-946_delete-record-api 
- fix tests
 2016-09-29 16:42:26 +02:00
Jean-Yves Gaulier
7e7668cd1b PHRAS-946_delete-record-api 
- fix tests
 2016-09-29 16:29:07 +02:00
Jean-Yves Gaulier
c6186abe56 PHRAS-946_delete-record-api 
- add : api route to delete record : verb DELETE ; /api/v1/records/{{databox_id}}/{{record_id}}
 2016-09-29 15:54:04 +02:00
Thibaud Fabre
cdc410191c Merge pull request #1960 from jygaulier/PHRAS-1192_quarantaine-by-filenames_4.0 
PHRAS-1192_quarantaine-by-filenames_4.0
 2016-09-29 14:11:08 +02:00
Thibaud Fabre
91aae6a236 Merge pull request #1945 from jygaulier/PHRAS-1178_edit-story-and-records_4.0 
PHRAS-1178_edit-story-and-records_4.0
 2016-09-29 14:10:47 +02:00
Thibaud Fabre
08a8970147 Merge pull request #1944 from jygaulier/PHRAS-842_search-logged-as-es_4.0 
PHRAS-842_search-logged-as-es_4.0
 2016-09-29 14:10:21 +02:00
Thibaud Fabre
722fffee39 Merge pull request #1966 from xrousset78800/fix/add-subdef-rotation-wording 
Rollback and change subdef rotation wording
 2016-09-29 14:07:20 +02:00
Xavier Rousset
b17c244c8f PHRAS-1224 Change subdef rotation wording 2016-09-29 13:44:45 +02:00
Thibaud Fabre
5361906447 Merge pull request #1961 from alchemy-fr/feature/user-delete-webhook 
PHRAS-1239 Add webhook for user deleted events
 2016-09-29 10:44:14 +02:00
Thibaud Fabre
bd7e0987bc Clear log repository on user deletion 2016-09-29 10:22:05 +02:00
Thibaud Fabre
8f99a69add Fix spaces in Makefile 2016-09-28 21:46:23 +02:00
Thibaud Fabre
b98d8a38b2 Fix webhook repository test 2016-09-28 21:35:48 +02:00
Thibaud Fabre
73be6d5615 PHRAS-1239 Add webhook for user deleted events 2016-09-28 21:35:48 +02:00
Thibaud Fabre
2ec2df659f Merge pull request #1951 from alchemy-fr/feature/disable-api 
PHRAS-1212 Add option to disable API via configuration setting
 2016-09-28 21:11:32 +02:00
Thibaud Fabre
2648deec2e Merge pull request #1962 from alchemy-fr/fix/deleted-gitkeeps 
PHRAS-1245 Preserve gitkeep file
 2016-09-28 21:04:07 +02:00
Thibaud Fabre
f62c22bc5c Move setting to registry and form type 2016-09-28 20:58:26 +02:00
Thibaud Fabre
7cf5d28a99 Fix configuration setting access 2016-09-28 20:25:25 +02:00
Thibaud Fabre
5666286e33 Fix typo in api_disable param name 2016-09-28 20:25:25 +02:00
Thibaud Fabre
c13e086120 Add option to disable API via configuration setting 2016-09-28 20:25:25 +02:00
Thibaud Fabre
9c4b3b7429 PHRAS-1245 Preserve gitkeep file 2016-09-28 18:40:26 +02:00
Jean-Yves Gaulier
877beaa40d PHRAS-1178_edit-story-and-records_4.0 
- change : if a record is updated, every "parent" story is considered as updated too (editDateField(s) set)
 - fix : cache is now invalidated after editing records
 - fix : recordeditsuscriber can't run into recursion anymore
 2016-09-28 17:43:37 +02:00
Jean-Yves Gaulier
734904c5e2 PHRAS-1192_quarantaine-by-filenames_4.0 
- fix : export of caption is ok (was failing with 404)
 - fix : codestyle
 2016-09-28 16:38:29 +02:00
Jean-Yves Gaulier
837a294827 PHRAS-1192_quarantaine-by-filenames_4.0 
- add : quarantine thumbnails looks like result thb (zoom, caption, infos, ...) by using the same template
 - removed : some code about highlighting titles
 - fix : double extension on exported files
 2016-09-28 13:16:10 +02:00
Thibaud Fabre
154c2616a7 Merge pull request #1958 from xrousset78800/fix/incorrect-english-translation-in-setup 
Change wording on setup template
 2016-09-27 13:32:56 +02:00
Xavier Rousset
0b16fd577e PHRAS-1234 Change wording on setup template 2016-09-27 12:24:03 +02:00
Thibaud Fabre
675ec2c939 Merge pull request #1957 from alchemy-fr/fix/provisioned-api-settings 
API settings provisioning
 2016-09-27 11:27:13 +02:00
Thibaud Fabre
7d22a716f5 Merge pull request #1956 from alchemy-fr/feature/collection-order-manager 
PHRAS-1006 Add order manager in API collection description
 2016-09-27 11:11:43 +02:00
Thibaud Fabre
87a9f532c8 Set extra API settings during provisioning 2016-09-27 11:11:25 +02:00
Thibaud Fabre
3d8d4f6d99 Fix config editor set command 2016-09-27 11:11:02 +02:00
Thibaud Fabre
ebc515f2c1 PHRAS-1006 Add order manager in API collection description 2016-09-27 10:38:34 +02:00
Thibaud Fabre
36a0f819fc Merge pull request #1955 from alchemy-fr/fix/vagrant-debug-mode 
Allow debugger access to Vagrant host IP addresses
 2016-09-27 10:17:18 +02:00
Thibaud Fabre
b18fa2d228 PHRAS-1214 Allow debugger access to Vagrant host IP addresses 2016-09-27 10:08:42 +02:00
Thibaud Fabre
758938ca09 Merge pull request #1954 from alchemy-fr/feature/edit-config-command 
Add configuration editor command in setup
 2016-09-27 07:55:50 +02:00
Thibaud Fabre
8b843b9357 Add configuration editor command in setup 2016-09-27 07:49:06 +02:00
Thibaud Fabre
a2b7c949fb Merge pull request #1953 from alchemy-fr/feature/improve-makefile 
Split build into smaller targets
 2016-09-27 06:30:11 +02:00