Nicolas Le Goff
|
ae25c00ad9
|
Update composer.json
|
2014-12-10 15:45:16 +01:00 |
|
Nicolas Le Goff
|
589169299c
|
Fix merge 3.8
|
2014-12-09 14:01:00 +01:00 |
|
Nicolas Le Goff
|
9f38823f27
|
Merge branch '3.8'
Conflicts:
composer.lock
lib/Alchemy/Phrasea/Application.php
lib/Alchemy/Phrasea/Command/Setup/H264MappingGenerator.php
lib/Alchemy/Phrasea/Controller/AbstractDelivery.php
lib/Alchemy/Phrasea/Controller/Prod/DoDownload.php
lib/Alchemy/Phrasea/Controller/Prod/Edit.php
lib/Alchemy/Phrasea/Controller/Prod/Story.php
lib/Alchemy/Phrasea/Controller/Prod/Upload.php
lib/Alchemy/Phrasea/Controller/Report/Activity.php
lib/Alchemy/Phrasea/Controller/Report/Root.php
lib/Alchemy/Phrasea/Controller/Root/Account.php
lib/Alchemy/Phrasea/Core/PhraseaEvents.php
lib/Alchemy/Phrasea/Core/Version.php
lib/classes/API/V1/adapter.php
lib/classes/User/Adapter.php
lib/classes/databox.php
lib/classes/media/subdef.php
lib/classes/module/report.php
lib/classes/module/report/activity.php
lib/classes/module/report/connexion.php
lib/classes/module/report/download.php
lib/classes/module/report/nav.php
lib/classes/module/report/question.php
lib/classes/module/report/sqlaction.php
lib/classes/module/report/sqlconnexion.php
lib/classes/module/report/sqldownload.php
lib/classes/module/report/sqlfilter.php
lib/classes/task/abstract.php
locale/de_DE/LC_MESSAGES/phraseanet.mo
locale/de_DE/LC_MESSAGES/phraseanet.po
locale/en_GB/LC_MESSAGES/phraseanet.mo
locale/en_GB/LC_MESSAGES/phraseanet.po
locale/fr_FR/LC_MESSAGES/phraseanet.mo
locale/fr_FR/LC_MESSAGES/phraseanet.po
locale/nl_NL/LC_MESSAGES/phraseanet.mo
locale/nl_NL/LC_MESSAGES/phraseanet.po
locale/phraseanet.pot
templates/web/prod/index.html.twig
tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php
tests/classes/api/v1/api_v1_adapterTest.php
tests/classes/report/activityTest.php
tests/classes/report/editTest.php
|
2014-12-09 13:59:29 +01:00 |
|
Nicolas Le Goff
|
3aa8107fb0
|
Merge pull request #1194 from nlegoff/patch-edit-date
[3.8.6] PHRAS-349 #fix edition date for stories
|
2014-12-04 16:51:37 +01:00 |
|
Nicolas Le Goff
|
9733f9d6a5
|
PHRAS-349 #fix edition date for stories
|
2014-12-04 15:29:31 +01:00 |
|
Nicolas Le Goff
|
8ef907d023
|
Merge pull request #1193 from nlegoff/patch-3.8.6
[3.8.6] Patch
|
2014-12-02 20:42:19 +01:00 |
|
Nicolas Le Goff
|
34ef9079ef
|
Fix tests
|
2014-12-02 18:09:33 +01:00 |
|
Nicolas Le Goff
|
2ed2e5ec10
|
Add possibilité to disbale csrf protection
|
2014-12-02 17:48:02 +01:00 |
|
Nicolas Le Goff
|
c4965f4598
|
fix report download
|
2014-12-02 17:40:59 +01:00 |
|
Nicolas Le Goff
|
ca08c269c2
|
Merge pull request #1192 from nlegoff/fix-stream
[3.8.6] Some fixes
|
2014-11-26 00:21:18 +01:00 |
|
Nicolas Le Goff
|
7d0a69c7b9
|
Merge pull request #1191 from nlegoff/master-fix
[3.9] Some fixes
|
2014-11-26 00:21:07 +01:00 |
|
Nicolas Le Goff
|
df3b6fd4fc
|
Merge pull request #1190 from nlegoff/m-fix
[3.8] Some fixes
|
2014-11-26 00:20:37 +01:00 |
|
Nicolas Le Goff
|
616337db33
|
Fix dump calculation
|
2014-11-26 00:19:18 +01:00 |
|
Nicolas Le Goff
|
6f0b5c9c4e
|
Fix dump configuration
|
2014-11-26 00:19:01 +01:00 |
|
Nicolas Le Goff
|
11b070f647
|
Fix IniReset command
|
2014-11-24 17:03:38 +01:00 |
|
Nicolas Le Goff
|
d5531ce8b2
|
Fix Migration
|
2014-11-24 17:03:28 +01:00 |
|
Nicolas Le Goff
|
ec64d41ebb
|
Reduce advanced search window size
|
2014-11-24 16:42:55 +01:00 |
|
Nicolas Le Goff
|
9ea515ab39
|
Fix login issue
|
2014-11-24 16:42:28 +01:00 |
|
Nicolas Le Goff
|
e584f40e17
|
Fix delivery data issue
|
2014-11-24 16:41:38 +01:00 |
|
Nicolas Le Goff
|
80c160d47a
|
Fix missing query parameters while redirect
|
2014-11-24 14:54:29 +01:00 |
|
Nicolas Le Goff
|
d4fdd6e50c
|
Merge pull request #1189 from nlegoff/fix-etags
[3.8] etags calculation
|
2014-11-21 14:56:39 +01:00 |
|
Nicolas Le Goff
|
4b5a1d79fb
|
Fix etags calculation
|
2014-11-21 14:55:10 +01:00 |
|
Nicolas Le Goff
|
5e38583373
|
Merge pull request #1188 from nlegoff/fixes
[3.8] Some improvements
|
2014-11-21 11:00:21 +01:00 |
|
Nicolas Le Goff
|
a79b58ad8a
|
Do not log for thumbnails
|
2014-11-21 10:43:48 +01:00 |
|
Nicolas Le Goff
|
6f7b3c9b46
|
Remove unused table log_thumb
|
2014-11-21 10:37:33 +01:00 |
|
Nicolas Le Goff
|
68af5b3391
|
Returns 304 http code if images are not modified
|
2014-11-21 10:36:52 +01:00 |
|
Nicolas Le Goff
|
31938f23c7
|
Get logs from deleted records as well
|
2014-11-21 09:24:44 +01:00 |
|
Nicolas Le Goff
|
e2267d4f1c
|
Fix download report
|
2014-11-21 09:20:42 +01:00 |
|
Nicolas Le Goff
|
d6b0729e46
|
Merge pull request #1187 from nlegoff/fix-logs
PHRAS-335 #fix dashboard & downloads query
|
2014-11-19 17:41:48 +01:00 |
|
Nicolas Le Goff
|
af78aae182
|
PHRAS-335 #fix dashboard & downloads query
|
2014-11-19 17:40:02 +01:00 |
|
Nicolas Le Goff
|
cbfd549701
|
Merge pull request #1186 from nlegoff/update-imagine
[3.8] PHRAS-348 #fix previews of eps are wrong size
|
2014-11-19 15:53:34 +01:00 |
|
Nicolas Le Goff
|
43eed94871
|
PHRAS-348 #fix previews of eps are wrong size
|
2014-11-19 15:52:33 +01:00 |
|
Nicolas Le Goff
|
bfc46c14f5
|
Merge pull request #1185 from nlegoff/fix-some-bugs
[3.8] Fix some bugs
|
2014-11-19 14:52:40 +01:00 |
|
Nicolas Le Goff
|
2000f4116f
|
Fix tests
|
2014-11-19 14:50:08 +01:00 |
|
Nicolas Le Goff
|
7d44a356e3
|
CUS-120 #fix editon date for records
|
2014-11-18 17:47:33 +01:00 |
|
Nicolas Le Goff
|
52b9850add
|
Fix tests
|
2014-11-18 14:36:50 +01:00 |
|
Nicolas Le Goff
|
eeb79cda99
|
PHRAS-307 #fix update locales
|
2014-11-17 18:56:42 +01:00 |
|
Nicolas Le Goff
|
13759a6c86
|
PHRAS-289 #fix action are for push and validation are inverted
|
2014-11-17 16:52:26 +01:00 |
|
Nicolas Le Goff
|
6a8b79be45
|
PHRAS-335 #fix date mismatching in report
|
2014-11-17 16:50:20 +01:00 |
|
Nicolas Le Goff
|
93516ed1ec
|
PHRAS-347 #fix pagination is broken for order
|
2014-11-17 15:35:01 +01:00 |
|
Nicolas Le Goff
|
d47df2418b
|
PHRAS-335 #fix date mismatching
|
2014-11-17 12:09:01 +01:00 |
|
Nicolas Le Goff
|
0b763c459e
|
PHRAS-342 #fix remove usr list when user is deleted
|
2014-11-17 11:46:28 +01:00 |
|
Nicolas Le Goff
|
ac06fbdc19
|
Merge pull request #1184 from nlegoff/fix-last-bugs
[3.8] Fix some bugs
|
2014-11-13 21:35:08 +01:00 |
|
Nicolas Le Goff
|
efa00928e9
|
PHRAS-333 #fix locale
|
2014-11-13 15:23:29 +01:00 |
|
Nicolas Le Goff
|
701a91e5c2
|
fix tests
|
2014-11-13 12:22:49 +01:00 |
|
Nicolas Le Goff
|
4b8ab74f7b
|
#fix missing image
|
2014-11-12 20:35:08 +01:00 |
|
Nicolas Le Goff
|
2f261c64b2
|
PHRAS-322 #fix missing image
|
2014-11-12 19:43:19 +01:00 |
|
Nicolas Le Goff
|
188a0f44b3
|
PHRAS-333 #fix reset email
|
2014-11-12 19:41:17 +01:00 |
|
Nicolas Le Goff
|
d65e81ebf2
|
PHRAS-334 #fix connected users module display
|
2014-11-12 19:04:21 +01:00 |
|
Nicolas Le Goff
|
6e7f8cbb7e
|
PHRAS-294 #fix default date selection
|
2014-11-12 18:51:07 +01:00 |
|