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

328 Commits

Author SHA1 Message Date
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
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
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
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
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
Xavier Rousset
7945994140 PHRAS-1173 SQL fix and template update 2016-10-11 15:27:13 +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
bd7e0987bc Clear log repository on user deletion 2016-09-29 10:22:05 +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
4a434672b4 Remove limit clause and use maxResults query method 2016-09-21 15:17:27 +02:00
Thibaud Fabre
e9f74c9c52 Fix login issues when multiple validation tokens exist 2016-09-21 15:17:18 +02:00
Jean-Yves Gaulier
27ee4334c2 PHRAS-1161_Backport-PHRAS_1100 
#time 30m
 2016-06-15 15:53:14 +02:00
Benoît Burnichon
086e7c126c Enlarge FeedEntry length to 1024 chars 2016-05-20 17:01:36 +02:00
Thibaud Fabre
fbed39bf56 Change default sort direction for created_on sorts in order manager 2016-05-20 11:49:25 +02:00
Thibaud Fabre
3381d18b22 PHRAS-1107 Fix order pagination in repository 2016-05-19 19:00:47 +02:00
Thibaud Fabre
2e815bc463 Add SQL migration for new order column and fix docblocks 2016-05-11 16:59:36 +02:00
Thibaud Fabre
957d588d6f Add order webhook processor 2016-04-29 02:26:28 +02:00
Thibaud Fabre
1b1debd09c Add notification method on order entity 2016-04-27 18:06:16 +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
718db61448 PHPCS BasketElementRepository 2016-04-11 12:50:37 +02:00
Benoît Burnichon
bc1d5ed2c2 Fix BasketElementRepository findByRecordIds 2016-04-11 12:33:45 +02:00
Jean-Yves Gaulier
1c63194400 PHRAS-1065 #time 1h 
backport PHRAS-947
 2016-04-06 19:10:54 +02:00
Thibaud Fabre
c05cac4800 Hydrate events one by one to preserve memory 2016-04-06 16:16:47 +02:00
Thibaud Fabre
b619bf7bba Change failed to createion_failed 2016-03-23 12:42:31 +01:00
Thibaud Fabre
773a31d4f8 Add extra event types in webhooks 2016-03-23 12:42:31 +01:00
Benoît Burnichon
25745732b6 Fix OrderElement accept/deny todo count 2016-03-22 16:16:09 +01:00
Benoît Burnichon
5b03159245 Add basket owning logic in Order 2016-03-22 16:13:22 +01:00
Benoît Burnichon
1982d0a625 Prepare extraction of class from OrderController 2016-03-22 15:55:54 +01:00
Benoît Burnichon
3944580f8c fix return type from Failure Manager. 
Also require injection of an AuthFailureRepository instance.
Add flush of entities.
 2016-03-15 12:21:56 +01:00
Benoît Burnichon
b0330d8f56 Added RecordReferenceCollection utility method 2016-03-07 12:30:51 +01:00
Benoît Burnichon
c3cb083d25 PHPCS in BasketRepository 2016-02-26 16:18:48 +01:00
Benoît Burnichon
bd43c36715 Remove some deprecated calls 2016-02-23 15:10:49 +01:00
Benoît Burnichon
8a907e9bb0 Add touch capability to record_adapter. 2016-02-23 10:40:01 +01:00
Benoît Burnichon
a95797efbf Change UserSetting value to bigger non-nullable field 2016-02-16 19:13:28 +01:00
Benoît Burnichon
311f563b86 Change bad SQL query which not always is scalar 2016-02-15 16:04:57 +01:00
Benoît Burnichon
14fffe314a PHPCS 2016-02-10 19:38:30 +01:00
Benoît Burnichon
403eb36903 Demote Admin users on request 2016-02-09 12:25:28 +01:00
Thibaud Fabre
dc51e489fe Fix migration from v3.8.8 to v4.0.0 2016-02-03 16:35:20 +01:00
Thibaud Fabre
68b006e76b Fix bugs in webhook management 
- Removes restrictions on event types and names
- Registers service provider in application
 2016-02-02 12:40:05 +01:00
Benoît Burnichon
0ef9b668c2 Remove use of gettext shortcut method. 2016-02-01 14:03:29 +01:00
Thibaud Fabre
fa3e49f5fb Configure event processor factory via DI 2016-01-28 18:42:59 +01:00
Thibaud Fabre
c92d5da9fe Merge branch 'clean-boxes' into merge-clean-boxes 2016-01-06 19:53:43 +01:00
Benoît Burnichon
51023c5533 bump copyright year 2016-01-05 13:38:14 +01:00
Benoît Burnichon
91d79678ae LazaretSession could be created by tasks. 
PHRAS-883
 2015-12-22 17:51:22 +01:00
Benoît Burnichon
53a5ff7f3d Change read status of Basket in Repository 2015-12-22 17:44:34 +01:00
Benoît Burnichon
60247cd2ad Missing basket persist. 2015-12-22 17:44:34 +01:00