Vincent Petry
5e57d3a0b9
Merge pull request #24244 from owncloud/mount-unique
...
don't get the config for the same mount multiple times
2016-04-25 17:42:20 +02:00
Arthur Schiwon
3e26e1ec16
LDAP Wizard: reset connection status indicator when switching LDAP config
2016-04-25 16:24:44 +02:00
Robin Appelman
dbfdc6282a
do propagation in a single query
2016-04-25 16:18:59 +02:00
Thomas Müller
6321596134
Merge pull request #24052 from owncloud/fix-ldap-cache-race-conditions
...
Fix LDAP race conditions
2016-04-25 14:55:20 +02:00
Thomas Müller
972ce1fe6e
Merge pull request #24240 from owncloud/issue-24233-add-missing-use-statement
...
Add missing use statement
2016-04-25 14:46:29 +02:00
Robin Appelman
ca5b189522
add test
2016-04-25 14:28:01 +02:00
Robin Appelman
7e8fd2c639
don't get the config for the same mount multiple times
2016-04-25 14:21:15 +02:00
Joas Schilling
9491d0f65b
Add missing use statement
2016-04-25 13:22:54 +02:00
Lukas Reschke
604b7a49f6
Merge pull request #24230 from owncloud/you-form-of-activities
...
Translate the current user with "You ..."
2016-04-25 12:57:34 +02:00
Vincent Petry
7a22e3f083
Merge pull request #24214 from owncloud/fix-ldap-connection-unbind-on-login
...
on clone Connection, do not take over the existing LDAP resource
2016-04-25 12:38:09 +02:00
Roeland Jago Douma
5e9b618604
Translate OCS Share API error messages
...
For https://github.com/owncloud/core/issues/22209
2016-04-25 11:08:48 +02:00
Joas Schilling
d4c9566cd5
Translate the current user with "You ..."
2016-04-25 10:30:58 +02:00
Björn Schießle
74de72e75e
Merge pull request #24073 from owncloud/move_federated_sharing_settings_to_app
...
move federated sharing settings to the federatedfilesharing app
2016-04-25 10:19:46 +02:00
Jenkins for ownCloud
dab4633300
[tx-robot] updated from transifex
2016-04-25 01:54:53 -04:00
Jenkins for ownCloud
4dc17e4863
[tx-robot] updated from transifex
2016-04-24 01:55:06 -04:00
Jenkins for ownCloud
afce892e9c
[tx-robot] updated from transifex
2016-04-23 01:56:02 -04:00
Arthur Schiwon
203b0e9cba
on clone Connection, do not take over the existing LDAP resource
...
For one, it solves potential conflicts when using the resource. For the
other, one on the login check (the only place where a clone happens
currently) we do not need to rebind after confirming the user's login
was successful.
2016-04-22 21:43:41 +02:00
Thomas Müller
a3813c55da
Merge pull request #24124 from owncloud/encryped-size-progation
...
dont do optimized size propagation for encrypted files
2016-04-22 15:23:42 +02:00
Björn Schießle
e10105474f
move federated sharing settings to the federatedfilesharing app
2016-04-22 14:55:40 +02:00
Björn Schießle
606b756a94
Merge pull request #23918 from owncloud/cruds-for-federated-shares
...
bring back CRUDS permissions for federated shares
2016-04-22 14:50:42 +02:00
Thomas Müller
3b3cff4f79
Merge pull request #24151 from owncloud/create-personal-calendar
...
Personal calendar should be generated even if the birthday calendar a…
2016-04-22 11:09:45 +02:00
Jenkins for ownCloud
ded84bf571
[tx-robot] updated from transifex
2016-04-22 01:54:58 -04:00
Thomas Müller
a1da081c62
Merge pull request #24157 from owncloud/files-app-is-not-available-on-public-page
...
OCA.Files.App is not available on public page
2016-04-21 23:21:18 +02:00
Thomas Müller
6e4a28ae86
Merge pull request #24155 from owncloud/fix-birthday_calendar-acl
...
Birthday calendar should never have write acl
2016-04-21 16:49:21 +02:00
Björn Schießle
80959ad95a
Merge pull request #24111 from owncloud/chunk-users-in-background-jobs
...
Chunk the users correctly in the trashbin and versions background job
2016-04-21 14:26:41 +02:00
Christoph Wurst
df2a9d1733
OCA.Files.App is not available on public page
2016-04-21 14:23:18 +02:00
Thomas Müller
1d1247069f
Birthday calendar should never have write acl - fixes #24154
2016-04-21 13:36:52 +02:00
Robin Appelman
b7867e9368
Add unit tests for shared size propagation with encryption
2016-04-21 13:13:18 +02:00
Thomas Müller
38c7296867
Personal calendar should be generated even if the birthday calendar already exists - fixes #24082
2016-04-21 12:34:20 +02:00
Vincent Petry
b50d3255fb
Merge pull request #22791 from owncloud/enc_master_key_improvements
...
Enc master key improvements
2016-04-21 11:48:26 +02:00
Jenkins for ownCloud
02ecd040e6
[tx-robot] updated from transifex
2016-04-21 01:58:49 -04:00
Morris Jobke
62a59854f0
Fix LDAP race conditions
...
* getFromCache is wrapped in isCached
* inbetween the two calls the cache entry hits it's TTL
* getFromCache returns null
* this fix only checkes if the returned value is null and
return only non-null values
2016-04-20 21:50:28 +02:00
Thomas Müller
1ab27ddd4a
Merge pull request #24081 from owncloud/migrate-deprecated-jquery-v1-functions
...
migrate deprecated jQuery 1.x functions
2016-04-20 20:38:38 +02:00
Thomas Müller
cd01c440a0
Merge pull request #23919 from owncloud/cyclyc-share-dep-example
...
SharedStorage to new sharing code + cleanup
2016-04-20 20:37:27 +02:00
Björn Schießle
e906796f99
ask for share-permissions on propfind
2016-04-20 17:47:32 +02:00
Thomas Müller
34b753baa0
Merge pull request #23952 from owncloud/hide-hidden-files
...
Add option to hide hidden files
2016-04-20 11:58:38 +02:00
Thomas Müller
aa33ab0c03
Merge pull request #24094 from owncloud/move_dummy_group_backend_to_test
...
Move the group dummy backend to test
2016-04-20 11:55:00 +02:00
Thomas Müller
a6676f31ec
Merge pull request #24097 from owncloud/fix_23632
...
init users mount point before recovery
2016-04-20 11:54:45 +02:00
Joas Schilling
9ebae0bdeb
Chunk the users correctly in the trashbin and versions background job
2016-04-20 10:36:15 +02:00
Björn Schießle
17eb11cce8
Merge pull request #23915 from owncloud/activity-505-always-stream-for-comments
...
Always add activities for comments to the stream
2016-04-20 10:21:09 +02:00
Björn Schießle
a3381b1d0c
we need to initialize the mount points of the given user before we recover
...
access to his files
2016-04-19 17:04:21 +02:00
Christoph Wurst
e4a8456d01
replace $().attr('checked') by $().prop('checked', state) or $().is(':checked')
2016-04-19 16:20:17 +02:00
Christoph Wurst
6c5696d3a8
filter hidden files on the web interface
...
add checkbox to toggle show/hide hidden files
persist show hidden setting
fix settings menu layout
test ApiController::showHiddenFiles
don't show hidden files by default
Store config in Backbone model and inject it into FileList
Filter files only temporarily when rending the file list
Fix file rename validation
2016-04-19 16:08:56 +02:00
Thomas Müller
5b2ef92eb2
Merge pull request #24004 from owncloud/dont-transfer-files-to-not-ready-user
...
Introduce isReadyForUser and verify in file transfer ownership
2016-04-19 15:56:47 +02:00
Roeland Jago Douma
dd7e0d13e5
Move the group dummy backend to test
...
The dummy backend is only used for testing and should thus reside in
tests.
2016-04-19 15:13:31 +02:00
Christoph Wurst
05d203a989
replace $.parseJSON() by JSON.parse()
2016-04-19 15:06:42 +02:00
Lukas Reschke
a86fd873d6
Merge pull request #24076 from owncloud/fix-initial-calendar-and-addressbook-names
...
Fix displayname for initial calendars and address books
2016-04-19 14:30:35 +02:00
Roeland Douma
0c5f915377
Merge pull request #24054 from owncloud/data_fingerprint
...
Add data-fingerprint property
2016-04-19 14:24:27 +02:00
Roeland Jago Douma
b53d6598f1
Move moveFromCache to CacheJail
2016-04-19 14:04:00 +02:00
Roeland Jago Douma
f27d7cbf99
Move copy- and moveFromStorage to jail
2016-04-19 14:04:00 +02:00
Robin Appelman
2f1c62ce0b
Only construct the storage when we start using it
2016-04-19 14:04:00 +02:00
Roeland Jago Douma
c98fef8a51
Fix resolve path
2016-04-19 14:04:00 +02:00
Roeland Jago Douma
92abb5f23d
Fix tests
2016-04-19 14:04:00 +02:00
Roeland Jago Douma
afa37d363f
Fix related logic
2016-04-19 14:04:00 +02:00
Roeland Jago Douma
6123badbfa
Move SharedStorage et al over to the shareManager and jail
2016-04-19 14:04:00 +02:00
Christoph Wurst
37530f27f0
migrate jQuery.fn.unload()
2016-04-19 12:05:09 +02:00
Jenkins for ownCloud
f812f51c5d
[tx-robot] updated from transifex
2016-04-19 01:55:59 -04:00
Thomas Müller
1773dcbef2
Merge pull request #23973 from owncloud/share_move_post_delete_from_group_hook
...
Move post_removeFromGroup to shareManager
2016-04-19 06:59:58 +02:00
Thomas Müller
748134bd90
Fix displayname for initial calendars and address books - fixes #24057
2016-04-18 23:08:37 +02:00
Thomas Müller
d0ad8e6e69
Revert "Fix displayname for initial calendars and address books - fixes #24057"
...
This reverts commit a5d3e5ed68
.
2016-04-18 23:07:49 +02:00
Thomas Müller
a5d3e5ed68
Fix displayname for initial calendars and address books - fixes #24057
2016-04-18 23:06:38 +02:00
Thomas Müller
1626850fc9
Remove deprecated HTTPHelper
2016-04-18 17:28:10 +02:00
Thomas Müller
5c3183cedd
Move version check code out of class Updater
2016-04-18 17:12:59 +02:00
Roeland Jago Douma
dcb2b37e24
Add data-fingerprint property to webdav
2016-04-18 16:08:11 +02:00
Björn Schießle
52669d0ea3
return correct share permissions on propfind
2016-04-18 12:02:06 +02:00
Björn Schießle
d1d80b4f9e
set correct permissions in shareinfo
2016-04-18 12:02:06 +02:00
Thomas Müller
85d809c0d3
Merge pull request #23268 from owncloud/range-requests-should-not-block-the-session
...
Close session for publicwebdav
2016-04-18 09:23:39 +02:00
Thomas Müller
56a37d315b
Merge pull request #24017 from owncloud/share-permissions-namespace
...
Move share-permissions property namespace
2016-04-15 20:12:01 +02:00
Thomas Müller
50e20e531e
Introduce isReadyForUser and verify in file transfer ownership - fixes #23786
2016-04-15 15:07:40 +02:00
Thomas Müller
63a385d2b8
Merge pull request #23933 from owncloud/remember-file-sorting
...
remember file sort order
2016-04-15 14:06:21 +02:00
Robin Appelman
baff79cc63
Fix loading the dropbox autoloader
2016-04-15 12:46:47 +02:00
Roeland Jago Douma
0cebb16e7c
Move share-permissions property namespace
...
Fixes https://github.com/owncloud/core/issues/23741
2016-04-15 10:22:18 +02:00
Thomas Müller
b23037ec5c
Merge pull request #23998 from owncloud/translate-birthday
...
Translate contacts birthday
2016-04-14 23:41:03 +02:00
C. Montero Luque
5911ce530b
Merge pull request #23527 from owncloud/fix-21136
...
disable Paged Search when chunksize is set to 0, fixes #21136
2016-04-14 11:14:19 -04:00
Thomas Müller
55735e1450
Translate contacts birthday - fixes #23982
2016-04-14 16:58:45 +02:00
Morris Jobke
dba08f5fca
Merge pull request #23985 from owncloud/ext-fix-namespaces
...
Fix namespaces for files_external
2016-04-14 16:32:01 +02:00
Thomas Müller
068e73cc47
Merge pull request #23975 from owncloud/change-default-calendar-and-contacts-names
...
Use better names for the default calendars and addressbooks
2016-04-14 11:57:43 +02:00
Roeland Douma
411fac892a
On mount make sure multiple shares with same target map to unique ones ( #23937 )
...
Scenario:
user0 shares a folder 'foo' with user2
user1 shares a folder 'foo' with user2
user2 logs in
Before: show only the 'foo' from user1
After: show both.
* Added intergration tests
2016-04-14 11:50:27 +02:00
Robin McCorkell
9a78cac2eb
Fix OCA\Files\External\Api namespace
2016-04-14 00:49:47 +01:00
Robin McCorkell
4717605d22
Fix storage backend class namespaces and move to subdir
...
All classes that were previously \OC\Files\Storage\FooBar are now
\OCA\Files_External\Lib\Storage\FooBar
2016-04-14 00:44:28 +01:00
Thomas Müller
439de52534
Remove dav migration for 9.1
2016-04-13 15:53:57 +02:00
Thomas Müller
353449bff7
Use better names for the default calendars and addressbooks - fixes #23720
2016-04-13 15:44:59 +02:00
Roeland Jago Douma
6144ced7a0
Move post_removeFromGroup to shareManager
...
The last sharing hook to be moved over.
* Added unit tests
* Removed old tests that relied on old behaviour
* Removed old hooks.php
2016-04-13 15:00:12 +02:00
Thomas Müller
3c0a1d4241
Merge pull request #20118 from owncloud/chunked-upload-dav
...
Initial implementation of the new chunked upload
2016-04-13 14:37:10 +02:00
Christoph Wurst
576f7244e6
fix default value, update js/php tests
2016-04-13 14:25:23 +02:00
Christoph Wurst
a4683bcfa9
persist file sorting changes
2016-04-13 11:28:42 +02:00
Christoph Wurst
3f492dd826
load file sorting mode from the db
2016-04-13 11:28:42 +02:00
Christoph Wurst
4d02233faa
restore selection after re-rendering file rows
2016-04-13 11:20:26 +02:00
Joas Schilling
739542816a
Merge pull request #23945 from owncloud/fix_oc_share_permissions
...
always return the complete permissions the file was shared with
2016-04-13 10:20:25 +02:00
Jenkins for ownCloud
a2da7614a0
[tx-robot] updated from transifex
2016-04-13 01:54:59 -04:00
Björn Schießle
499d131a09
always return the complete permissions the file was shared with
2016-04-12 17:56:56 +02:00
Thomas Müller
e21642ca31
Fix unit test of file plugin
2016-04-12 15:51:09 +02:00
Thomas Müller
bb2e68f72b
Fix chunk file move
2016-04-12 14:26:42 +02:00
Stefan Weil
16df1c5188
apps: Fix typos (found by codespell) ( #23862 )
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-04-12 12:52:51 +02:00
Thomas Müller
72f5c539e8
Initial implementation of the new chunked upload - as specified in https://dragotin.wordpress.com/2015/06/22/owncloud-chunking-ng/
2016-04-12 12:32:04 +02:00
Roeland Douma
495a964ca2
Migrate post_groupDelete hook to share manager ( #23841 )
...
The hook now calls the share manager that will call the responsible
shareProvider to do the proper cleanup.
* Unit tests added
Again nothing should change it is just to cleanup old code
2016-04-12 09:46:25 +02:00
Joas Schilling
48c41b888c
Always add activities for comments to the stream
2016-04-11 14:57:51 +02:00
Morris Jobke
929a28421a
Merge pull request #23798 from owncloud/federated-unshare-background-job
...
re-try to send unshare notification if remote server is not available
2016-04-11 11:13:00 +02:00
Thomas Müller
8652ef28aa
Merge pull request #23868 from owncloud/scrutinizer-patch-2
...
Scrutinizer Auto-Fixes
2016-04-11 10:38:02 +02:00
Thomas Müller
35b8c0dd68
Merge pull request #22615 from owncloud/add-blacklisted-files-to-capabilities
...
Add blacklisted_files to capabilities
2016-04-11 10:10:10 +02:00
Jenkins for ownCloud
c6f65a3c79
[tx-robot] updated from transifex
2016-04-11 01:54:50 -04:00
Thomas Müller
f9683aaf3d
Merge pull request #23863 from owncloud/fix_unit_tests
...
Fix unit tests warnings
2016-04-10 21:59:39 +02:00
Thomas Müller
24c2252ff4
Adding VCFExportPlugin
2016-04-10 12:43:15 +02:00
Jenkins for ownCloud
a29e732607
[tx-robot] updated from transifex
2016-04-10 01:54:49 -04:00
Jenkins for ownCloud
e68c4b1d73
[tx-robot] updated from transifex
2016-04-09 12:28:39 -04:00
Scrutinizer Auto-Fixer
3ebeb07a30
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2016-04-08 15:11:37 +00:00
Roeland Jago Douma
2c77bfa0d0
Fix dav comments
2016-04-08 15:23:23 +02:00
Roeland Jago Douma
7f4f0b20ad
Fix encryption tests
2016-04-08 15:23:17 +02:00
Roeland Jago Douma
4c9e257b27
Fix filesplugin
2016-04-08 15:23:13 +02:00
Roeland Jago Douma
db0c3bd535
Fix Share20OCSTest
2016-04-08 15:22:49 +02:00
Thomas Müller
6f3eeeeb36
Merge pull request #23510 from owncloud/birthdays-on-shared-addressbooks
...
Propagate birthdays of shared addressbooks to the sharee's birthday c…
2016-04-08 15:19:38 +02:00
Roeland Jago Douma
eda71240e2
Add unit tests for public auth webdav
2016-04-08 14:17:24 +02:00
Roeland Jago Douma
375f6fcab1
Move public webdav auth over to share manager
...
The public webdav auth should use the shiny new share manager.
2016-04-08 14:17:13 +02:00
Bjoern Schiessle
fbd5c28c39
re-try to send unshare notification if remote server is not available
2016-04-08 11:32:04 +02:00
Thomas Müller
6eefea1bb6
Merge pull request #23806 from owncloud/multiline-javascript-strings-for-translations
...
Also use Javascript as language in l10n.pl - fixes #13924
2016-04-07 14:13:37 +02:00
Jan-Christoph Borchardt
be9b685926
Merge pull request #23444 from owncloud/add-loading-spinner
...
Add loading spinner to "Add to owncloud"
2016-04-07 13:52:34 +02:00
Joas Schilling
0de15a86f0
Merge pull request #23773 from owncloud/share_move_delete_user_hook
...
Migrate post_userDelete hook to share manager
2016-04-07 13:01:10 +02:00
Thomas Müller
a5a48ae65c
Move some translation stings around to enable xgettext to detect them
2016-04-07 12:59:59 +02:00
Joas Schilling
bba28590b7
Remove xxx from ownCloud we dont want to see that 🙈
2016-04-07 12:18:44 +02:00
Erik Pellikka
73d5889c5d
add loading spinner to add to owncloud input field
...
Update public.js
Update public.js
2016-04-07 04:33:46 -04:00
Jenkins for ownCloud
1576a9a10b
[tx-robot] updated from transifex
2016-04-07 01:56:01 -04:00
Thomas Müller
dda739c0cc
Merge pull request #23501 from owncloud/alarms_for_birthdayevents
...
add VALARM for birthday events
2016-04-06 14:31:07 +02:00
Lukas Reschke
e2ea289943
Merge pull request #23777 from owncloud/ldap-null-user
...
Handle case where the user is not known
2016-04-06 12:58:08 +02:00
Morris Jobke
22898fa107
Use proper shortcut methods in templates
2016-04-06 10:25:04 +02:00
Thomas Müller
01b26d78a0
Merge pull request #23793 from owncloud/hard-code-dav-endpoints
...
All webdav endpoints within remote.php are now hardcoded - helps to p…
2016-04-06 08:34:37 +02:00
Jenkins for ownCloud
fb8c8ef38b
[tx-robot] updated from transifex
2016-04-06 01:56:24 -04:00
Thomas Müller
7bdde98617
All webdav endpoints within remote.php are now hardcoded - helps to prevent migration issues like #23610 - furthermore there is no need to dynamically lookup all the endpoints we already know
2016-04-05 09:59:43 +02:00
Robin McCorkell
d47824f4cf
Remove any stray socket files before creating new ones
2016-04-05 09:17:21 +02:00
Roeland Jago Douma
db5ea95e29
Add capability to show if group sharing is enabled
...
fixes #23477
Now clients can correct wording to properly reflect who a user can share
with.
2016-04-04 19:35:01 +02:00
Thomas Müller
f6b846584b
Handle case where the user is not known - fixes #23759
2016-04-04 16:56:59 +02:00
Joas Schilling
a4dfc7194d
Add blacklisted_files to capabilities
2016-04-04 15:00:31 +02:00
Roeland Jago Douma
e0cee43cf0
Migrate post_userDelete hook to share manager
...
This makes the post_userDelete hook call the sharemanager. This will
cleanup to and from this user.
* All shares owned by this user
* All shares with this user (user)
* All custom group shares
* All link share initiated by this user (to avoid invisible link shares)
Unit tests are added for the defaultshare provider as well as the
federated share provider
2016-04-04 14:15:38 +02:00
Thomas Müller
f6cea3c9c4
Merge pull request #23557 from owncloud/sabre-plugin-browser-error-page
...
In case of exception we return an html page in case the client is a b…
2016-04-04 13:51:23 +02:00
Björn Schießle
53c1902706
Merge pull request #23743 from owncloud/issue-23686-files-transferownership-share-unmount
...
Unmount the share before deleting it, so we don't try to use it later on
2016-04-04 11:11:24 +02:00
Joas Schilling
ac330daef2
Inject the Mount Manager
2016-04-04 09:08:55 +02:00
Jenkins for ownCloud
deca08a683
[tx-robot] updated from transifex
2016-04-02 01:55:25 -04:00
Joas Schilling
3dac3a01c5
Unmount the share before deleting it, so we don't try to use it later on
2016-04-01 21:05:55 +02:00
Jenkins for ownCloud
cce6194368
[tx-robot] updated from transifex
2016-04-01 01:56:19 -04:00
Thomas Müller
63b01a3616
Merge pull request #22834 from owncloud/webdav_property_for_share_permissions
...
Add sharePermissions webdav property
2016-03-31 23:18:53 +02:00
Thomas Müller
690eef26dd
Merge pull request #23274 from Senorsen/add-urlencode-ftp-sftp
...
Add urlencode to username part of ftp and sftp links
2016-03-31 23:18:10 +02:00
Morris Jobke
1fac22c2c8
Merge pull request #23564 from owncloud/public-ajaxbasicauth
...
Return 401 DummyBasicAuth in case of ajax call in public link page
2016-03-31 22:23:12 +02:00
Morris Jobke
3b4903a3ea
Merge pull request #23655 from owncloud/better-ldap-design
...
Design LDAP wizard to better integrate into the design
2016-03-31 22:22:55 +02:00
Roeland Jago Douma
89478a0961
Fix unit tests
2016-03-31 21:25:23 +02:00
Frank Karlitschek
6d40e69e29
Merge pull request #23517 from owncloud/gdrive-stream-download
...
GDrive stream download with RetryWrapper
2016-03-31 21:17:10 +02:00
Frank Karlitschek
3142dcc331
Merge pull request #23397 from paurisa/Fixed_23316
...
Fixed Issue 23316 - Invisible buttons should be visible
2016-03-31 21:15:59 +02:00
Roeland Jago Douma
5334bcce66
Correct share permissions for external storages
2016-03-31 20:17:59 +02:00
Roeland Jago Douma
8c0ef4c4bd
Add sharePermissions webdav property
...
This property can be queries by the clients so they know the max
permissions they can use to share a file with. This will improve the UX.
The oc:permissions proptery is not enough since mountpoints have
different permissions (delete + move by default).
By making it a new property the clients can just request it. On older
servers it will just return a 404 for that property (and thus they know
they have to fall back to their hacky work arounds). But if the property
is returned the client can show proper info.
* unit tests
* intergration test
2016-03-31 20:12:34 +02:00
Thomas Müller
dea3985e86
Merge pull request #23516 from owncloud/dropbox-stream-download
...
Dropbox stream download with RetryWrapper
2016-03-31 20:07:36 +02:00
Lukas Reschke
ba69a90ab5
Enforce type
2016-03-31 19:32:30 +02:00
Vincent Petry
262547ba3d
Return 401 DummyBasicAuth in case of ajax call
2016-03-31 19:31:31 +02:00