Jörn Friedrich Dreyer
80ded08ec4
hide irrelevant stuff in empty filelist
2015-01-02 10:28:41 +01:00
Jörn Friedrich Dreyer
a6204efa0d
show audio icon & image previews
2015-01-02 10:28:41 +01:00
Jörn Friedrich Dreyer
b93f2ddcb5
hide header when no files in list match
2015-01-02 10:28:41 +01:00
Jörn Friedrich Dreyer
7e6c660b00
filter new rows
2015-01-02 10:28:41 +01:00
Jörn Friedrich Dreyer
606f802b7b
move search results below filelist, show hint when results are off screen, use js plugin mechanism
2015-01-02 10:28:41 +01:00
Jenkins for ownCloud
4b357274bb
[tx-robot] updated from transifex
2015-01-02 01:54:28 -05:00
Jenkins for ownCloud
ec6e70889a
[tx-robot] updated from transifex
2015-01-01 01:54:30 -05:00
Jenkins for ownCloud
573be9092d
[tx-robot] updated from transifex
2014-12-31 01:54:33 -05:00
Jenkins for ownCloud
c8e946f633
[tx-robot] updated from transifex
2014-12-29 01:54:27 -05:00
Thomas Müller
9f327457dc
Merge pull request #13023 from owncloud/provisioning_api-2
...
[jenkins] Add provisioning_api app
2014-12-28 14:29:49 +01:00
Thomas Müller
85e02460c8
Merge pull request #13025 from lyonel/master
...
user_ldap is too verbose by default
2014-12-27 21:39:23 +01:00
Thomas Müller
688a4022df
Merge pull request #13012 from owncloud/small_fix
...
only send activity if we have a valid path and the file is readable
2014-12-27 21:38:47 +01:00
Jenkins for ownCloud
d2e53d1022
[tx-robot] updated from transifex
2014-12-27 01:54:33 -05:00
Jenkins for ownCloud
0836ce9cd8
[tx-robot] updated from transifex
2014-12-26 01:54:28 -05:00
Jenkins for ownCloud
e0fc26a5cb
[tx-robot] updated from transifex
2014-12-25 01:54:29 -05:00
Tom Needham
dc85c20b18
Add provisioning_api app
...
enable unit tests for provisioning api
fix admin docu key
2014-12-24 22:15:20 +01:00
Lyonel Vincent
f94b300602
Be less verbose when using a paged search
...
Lower the priority from INFO to DEBUG
2014-12-24 16:35:36 +01:00
Lyonel Vincent
5a00b33a90
Be less verbose when disabling SSL cert validation
...
change log level from WARN to DEBUG
2014-12-24 16:32:27 +01:00
Jenkins for ownCloud
801b9e0494
[tx-robot] updated from transifex
2014-12-24 01:54:33 -05:00
Bjoern Schiessle
8c48be453e
only send activity if we have a valid path and the file is readable
2014-12-23 13:32:54 +01:00
Morris Jobke
5352b4b2b8
Merge pull request #10292 from owncloud/external-share-delete
...
Fix trashbin when deleting a file over an external share
2014-12-23 11:21:06 +01:00
Jenkins for ownCloud
d8f04f5a97
[tx-robot] updated from transifex
2014-12-23 01:55:23 -05:00
Björn Schießle
711220e82d
Merge pull request #12997 from owncloud/sharing_activities
...
add activity if public shared file/folder was downloaded
2014-12-22 23:31:07 +01:00
Robin Appelman
3afcc71764
Make sure the path passed to the activity manager is normalized
2014-12-22 18:50:00 +01:00
Bjoern Schiessle
393deb5961
add activity if public shared file/folder was downloaded
2014-12-22 18:50:00 +01:00
Thomas Müller
cf595ecc67
Merge pull request #12860 from owncloud/remove-apparently-unused-file
...
Remove unused file
2014-12-22 14:47:14 +01:00
Morris Jobke
eab4c029c2
Merge pull request #12961 from owncloud/try_to_cache_keys
...
cache keys to read them only once from the hard disc
2014-12-22 09:50:29 +01:00
Jenkins for ownCloud
92c8cd3933
[tx-robot] updated from transifex
2014-12-22 01:54:49 -05:00
Morris Jobke
510488ad3e
Merge pull request #12942 from owncloud/favs-missingsharedsubdirs
...
Fix issues with searchByTag in shared storage
2014-12-21 10:38:34 +01:00
Jenkins for ownCloud
312891c603
[tx-robot] updated from transifex
2014-12-21 01:54:36 -05:00
Arthur Schiwon
61ed363f82
planned refactorings for OC 8
2014-12-20 18:28:29 +01:00
Arthur Schiwon
3ca70d647a
move from \OC\Preferences to \OCP\IConfig
2014-12-20 16:33:37 +01:00
Arthur Schiwon
144d95de7d
basic adjustments for OC 8. I.e. no visible issues, LDAP tests pass.
2014-12-20 16:09:04 +01:00
Jenkins for ownCloud
5a54ca380d
[tx-robot] updated from transifex
2014-12-20 01:56:24 -05:00
Arthur Schiwon
4fa39250e7
LDAP User Cleanup: Port from stable7 without further adjustements
...
LDAP User Cleanup
background job for user clean up
adjust user backend for clean up
register background job
remove dead code
dependency injection
make Helper non-static for proper testing
check whether it is OK to run clean up job. Do not forget to pass arguments.
use correct method to get the config from server
methods can be private, proper indirect testing is given
no automatic user deletion
make limit readable for test purposes
make method less complex
add first tests
let preferences accept limit and offset for getUsersForValue
DI via constructor does not work for background jobs
after detecting, now we have retrieving deleted users and their details
we need this method to be public for now
finalize export method, add missing getter
clean up namespaces and get rid of unnecessary files
helper is not static anymore
cleanup according to scrutinizer
add cli tool to show deleted users
uses are necessary after recent namespace change
also remove user from mappings table on deletion
add occ command to delete users
fix use statement
improve output
big fixes / improvements
PHP doc
return true in userExists early for cleaning up deleted users
bump version
control state and interval with one config.php setting, now ldapUserCleanupInterval. 0 will disable it. enabled by default.
improve doc
rename cli method to be consistent with others
introduce ldapUserCleanupInterval in sample config
don't show last login as unix epoche start when no login happend
less log output
consistent namespace for OfflineUser
rename GarbageCollector to DeletedUsersIndex and move it to user subdir
fix unit tests
add tests for deleteUser
more test adjustements
Conflicts:
apps/user_ldap/ajax/clearMappings.php
apps/user_ldap/appinfo/app.php
apps/user_ldap/lib/access.php
apps/user_ldap/lib/helper.php
apps/user_ldap/tests/helper.php
core/register_command.php
lib/private/preferences.php
lib/private/user.php
add ldap:check-user to check user existance on the fly
Conflicts:
apps/user_ldap/lib/helper.php
forgotten file
PHPdoc fixes, no code change
and don't forget to adjust tests
2014-12-19 19:47:54 +01:00
Björn Schießle
8164415b45
Merge pull request #12749 from owncloud/server2server-sharing-ng
...
server to server sharing next generation
2014-12-19 19:04:44 +01:00
blizzz
ad6814f920
Merge pull request #12101 from owncloud/ldap_split_mapping
...
Ldap split mapping from Access superclass
2014-12-19 18:52:30 +01:00
Arthur Schiwon
ec0f80fee9
Split mapping from Access and Helper classes into it's own. Fully test them, too.
...
remove unused methods
split mapping methods off from Access class
fix DB query handling
move 'clear mapping' methods from static helper to new mapping class
add tests
test directly with DB
finishing tests and fix return value from setDNbyUUID
add corresponding class for groups and make abstract test class neutral. helper tests is now obsolete as the tested functions were moved to the new mapper class.
add missing info to PHPDoc
add unmap method
fix namespaces
fix test inheritance
PHPDoc and a small code restructure for scrutinizer, no effective changes
PostgreSQL does not accept LIMIT in DELETE queries
phpdoc fixes, no code changes
2014-12-19 18:26:12 +01:00
Bjoern Schiessle
aea991c22e
cache keys to read them only once from the hard disc
2014-12-19 16:04:13 +01:00
Bjoern Schiessle
24993280ed
Next step in server-to-server sharing next generation, see #12285
...
Beside some small improvements and bug fixes this will probably the final state for OC8.
To test this you need to set up two ownCloud instances. Let's say:
URL: myPC/firstOwnCloud user: user1
URL: myPC/secondOwnCloud user: user2
Now user1 can share a file with user2 by entering the username and the URL to the second ownCloud to the share-drop-down, in this case "user2@myPC/secondOwnCloud".
The next time user2 login he will get a notification that he received a server-to-server share with the option to accept/decline it. If he accept it the share will be mounted. In both cases a event will be send back to user1 and add a notification to the activity stream that the share was accepted/declined.
If user1 decides to unshare the file again from user2 the share will automatically be removed from the second ownCloud server and user2 will see a notification in his activity stream that user1@myPC/firstOwnCloud has unshared the file/folder from him.
2014-12-19 15:20:24 +01:00
Thomas Müller
2d64797320
Merge pull request #12956 from owncloud/jenkins-user-backend-names
...
[jenkins only] introduce names for user backends - IUserBackend
2014-12-19 13:15:50 +01:00
Morris Jobke
678642a6a2
Merge pull request #12935 from owncloud/public-tagsmanagerissue
...
Only populate tags in main file list
2014-12-19 12:48:20 +01:00
Morris Jobke
6da33e1ea7
introduce names for user backends - IUserBackend
...
* LDAP with multiple servers also proved backendName
2014-12-19 10:17:17 +01:00
Thomas Müller
b32dc3f2a4
Merge pull request #12906 from owncloud/keyboardnav-feedback
...
Accessibility: Keyboard navigation feedback
2014-12-19 09:54:28 +01:00
Morris Jobke
39d6ddd38a
Merge pull request #12865 from owncloud/files-tags-webdav
...
Returns tags through WebDAV
2014-12-19 09:33:28 +01:00
Jenkins for ownCloud
028b0efd5c
[tx-robot] updated from transifex
2014-12-19 01:56:51 -05:00
Jan-Christoph Borchardt
7b2ae46762
first part of fixing feedback for file list when using keyboard
2014-12-19 00:34:06 +01:00
Morris Jobke
3036a8714d
Merge pull request #12941 from owncloud/wave-accessibility-compliance
...
Wave accessibility compliance
2014-12-19 00:30:56 +01:00
Morris Jobke
75e8b39826
Merge pull request #12879 from owncloud/mountconfig
...
Add mount specific options
2014-12-18 23:38:14 +01:00
Jörn Friedrich Dreyer
891474b0d6
Merge pull request #12759 from owncloud/core-reduce-js-and-css
...
make sure styles and scripts are only loaded once
2014-12-18 23:18:37 +01:00
Jörn Friedrich Dreyer
49318b4d93
Merge pull request #12896 from owncloud/drop-deprecated
...
first step to drop \OCP\Config:: in favour of IConfig
2014-12-18 23:01:49 +01:00
Morris Jobke
7798ea0cd7
show spinner on file upload in IE8, 9
2014-12-18 22:24:07 +01:00
Vincent Petry
11b3aa2dbe
Fix issues with searchByTag in shared storage
2014-12-18 17:27:56 +01:00
Jan-Christoph Borchardt
cd81687a38
properly escape variable
2014-12-18 17:19:23 +01:00
Jan-Christoph Borchardt
96ae18db59
get rid of unnecessary alt and title attributes
2014-12-18 17:05:27 +01:00
Jan-Christoph Borchardt
7faf3d17e5
fix accessibility for deleted files
2014-12-18 16:54:39 +01:00
Robin Appelman
1ef01de402
Merge pull request #12907 from owncloud/delete-invalid-external-share
...
Fix deleting invalid s2s shares
2014-12-18 16:38:13 +01:00
Jan-Christoph Borchardt
9009f5f727
add empty alt text to decorative preview of public share image
2014-12-18 16:00:55 +01:00
Jan-Christoph Borchardt
137d19f6b1
fix accessibility for 'New' file inputs
2014-12-18 15:52:42 +01:00
Vincent Petry
4b1b93507d
Only populate tags in main file list
...
Moved populateTags to be done on the main file list.
This prevents the public file list to go through the same code and cause
an error when there is no user.
2014-12-18 15:36:18 +01:00
Jan-Christoph Borchardt
0e78415cb1
fix accessibility of file upload
2014-12-18 14:12:34 +01:00
Vincent Petry
10a0fc2856
Merge pull request #12925 from owncloud/fix-js-unit-tests
...
be more explicit in JS unit tests - caused by accessibility issues
2014-12-18 12:10:11 +01:00
Jan-Christoph Borchardt
ea548cdaaa
fix accessibility of logos
2014-12-18 10:51:41 +01:00
Jenkins for ownCloud
5c6e08213e
[tx-robot] updated from transifex
2014-12-18 01:56:40 -05:00
Morris Jobke
ec0401f97b
be more explicit in JS unit tests - caused by accessibility issues
2014-12-18 01:27:58 +01:00
Thomas Müller
82f8726903
Merge pull request #12900 from owncloud/more-accessibility
...
More accessibility fixes for Files
2014-12-18 01:21:01 +01:00
Thomas Müller
a581dcaadb
Merge pull request #12924 from owncloud/improve-emptystates
...
Improve empty states
2014-12-18 01:10:13 +01:00
Jan-Christoph Borchardt
0bda42b8e3
add empty state for external storages
2014-12-17 21:57:31 +01:00
Morris Jobke
7c1b9aedd5
Setup a docker container that holds a webdav instance to test files_external
...
document docker parameter and use random host port
fix typo
copy autotest.sh to autotest-external.sh
adds ability to add start* and stop* scripts in env in external tests
run files_external WebDAV tests against ownCloud instance
introduce executor number to be able to shut down the correct docker container
fetch docker images in advance - this also fetches latest versions of the docker images
add second argument to autotest-external.sh which can specify a single test to run
print out the explicit test run
change naming schema of files_external setup scripts
2014-12-17 21:50:35 +01:00
Jan-Christoph Borchardt
59dec3834f
wording fix for Files app empty state
2014-12-17 21:45:51 +01:00
Jan-Christoph Borchardt
38931176df
apply empty state for 'Deleted files'
2014-12-17 21:45:34 +01:00
Jan-Christoph Borchardt
ab2ae91b11
improve empty state of 'All files'
2014-12-17 21:27:14 +01:00
Jan-Christoph Borchardt
16c62a346c
improve empty states for sharing and shared links as well
2014-12-17 21:22:28 +01:00
Jan-Christoph Borchardt
e3192bfa26
use empty state for 'Shared with you' as well
2014-12-17 21:13:53 +01:00
Jan-Christoph Borchardt
2be66044cc
even better empty state for Favorites, and general Empty State style
2014-12-17 20:59:26 +01:00
Robin McCorkell
c20be24559
Merge pull request #12793 from owncloud/mountconfig-store-id
...
Add the storage id to the mount config
2014-12-17 17:53:11 +00:00
Morris Jobke
a641bb7592
Merge pull request #12902 from owncloud/fix-filelist-thumbnails
...
Propertly restore thumbnail on cancel/rename/move
2014-12-17 17:13:21 +01:00
Vincent Petry
0b3f0716fc
Returns and update tags through WebDAV PROPFIND and PROPPATCH
...
Added oc:tags and oc:favorites in PROPFIND response.
It is possible to update them with PROPPATCH.
These properties are optional which means they need to be requested
explicitly
2014-12-17 16:50:35 +01:00
Robin Appelman
e656af4c83
Root always exists
2014-12-17 16:09:41 +01:00
Robin Appelman
d075b1d743
Add the storage id to the mount config
2014-12-17 14:22:03 +01:00
Jan-Christoph Borchardt
6f4ed59883
use method to only visually hide elements, show only for screen reader
2014-12-17 14:12:13 +01:00
Robin Appelman
fd85424742
Add getMountPoint to FileInfo
2014-12-17 14:03:50 +01:00
Robin Appelman
95a145f67f
Load mount specific options from the mount config
2014-12-17 14:03:50 +01:00
Jan-Christoph Borchardt
532ba99f1c
Merge pull request #12895 from owncloud/favorites-polish
...
polish the Favorites design
2014-12-17 13:42:20 +01:00
Jan-Christoph Borchardt
e2977ff4c1
fix favorite star flickering on empty state page
2014-12-17 13:40:57 +01:00
Vincent Petry
ab35459cac
Propertly restore thumbnail on cancel/rename/move
...
Since the thumbnail is now in a div, the code that tries to change the
thumbnail have been adapted here as well.
2014-12-17 13:12:57 +01:00
Jan-Christoph Borchardt
1b5f43e7c3
add text to Settings button
2014-12-17 12:20:38 +01:00
Jan-Christoph Borchardt
9f9aa44b57
add alt text to 'Cancel upload' button
2014-12-17 12:05:45 +01:00
Jan-Christoph Borchardt
4344b3d3cf
fix Delete action text being translatable
2014-12-17 11:55:35 +01:00
Jan-Christoph Borchardt
edc8967c93
add text to Delete action
2014-12-17 11:50:58 +01:00
Jan-Christoph Borchardt
e5875fda38
properly name form labels for the file selection
2014-12-17 11:40:21 +01:00
Jan-Christoph Borchardt
bac2683c55
fix alt text for breadcrumbs home icon
2014-12-17 11:26:42 +01:00
Morris Jobke
d41082f4d6
first step to drop \OCP\Config:: in favour of IConfig
2014-12-17 11:12:37 +01:00
Jan-Christoph Borchardt
c7cf0d0386
fix file list summary left alignment
2014-12-17 11:08:39 +01:00
Jan-Christoph Borchardt
433d1de923
fix empty state for Favorites
2014-12-17 11:04:22 +01:00
Jan-Christoph Borchardt
f2d7fad0fb
put Favorites second in list, after 'All files'
2014-12-17 11:00:16 +01:00
Jenkins for ownCloud
6d80524e67
[tx-robot] updated from transifex
2014-12-17 01:56:41 -05:00
Thomas Müller
775f6a1354
make sure styles and scripts are only loaded once
2014-12-16 18:26:43 +01:00
Jenkins for ownCloud
5b9c453071
[tx-robot] updated from transifex
2014-12-16 01:55:32 -05:00
Lukas Reschke
be3d4fd303
Merge pull request #12360 from owncloud/files-tags
...
Add favorites to files app
2014-12-15 19:55:18 +01:00
Lukas Reschke
a0a3322b94
Remove unused file
...
That file is apparently unused - introduced with 30b58f5677
I guess we can remove it...
2014-12-15 17:29:16 +01:00
Vincent Petry
207d77e5cd
Fixed small code style issues
2014-12-15 17:20:41 +01:00
Jörn Friedrich Dreyer
6602d3ac77
Merge pull request #12555 from owncloud/app_specific_search
...
introduce inApps[] filter for search via ajax query
2014-12-15 16:14:40 +01:00
Vincent Petry
976baed5f9
Remove spinner when toggling file favorite
2014-12-15 15:50:57 +01:00
Vincent Petry
33eb4483b2
Fixed has-favorites CSS
2014-12-15 15:18:29 +01:00
Jan-Christoph Borchardt
fb220a1e09
shift actions to the left a bit to account for right shift due to favorites action, not not overlap with size info
2014-12-15 15:12:37 +01:00
Jan-Christoph Borchardt
4dbe8c6771
add CSS to shift header to account for when favorites are present
2014-12-15 15:11:51 +01:00
Vincent Petry
1d22cd5b22
Use star icon for favorites
2014-12-15 12:44:41 +01:00
Vincent Petry
dfe922b72a
Correctly replace favorites icon when re-rendering file actions
2014-12-15 12:10:54 +01:00
Vincent Petry
a5bb66f4a7
Added favorites feature to the files app
2014-12-15 12:10:54 +01:00
Morris Jobke
b831914aa6
Merge pull request #11991 from owncloud/bower-jquery-ui
...
bower jquery-ui - exported changes to a separate css file
2014-12-15 11:39:31 +01:00
Jenkins for ownCloud
036456fe16
[tx-robot] updated from transifex
2014-12-15 01:54:30 -05:00
Jenkins for ownCloud
6ae0217326
[tx-robot] updated from transifex
2014-12-14 01:54:56 -05:00
Morris Jobke
5b3971f002
Merge pull request #12639 from owncloud/bad_mtime_format
...
Fix formatting of bad dates from external storages
2014-12-13 10:07:10 +01:00
Morris Jobke
edcd2f2706
bower jquery-ui - exported changes to a separate css file
2014-12-13 09:47:34 +01:00
Morris Jobke
29e1c3a898
Merge pull request #12795 from owncloud/files-layoutchanges
...
Move file thumbnail element into the label tag
2014-12-13 09:00:43 +01:00
Jenkins for ownCloud
416e21d902
[tx-robot] updated from transifex
2014-12-13 01:55:24 -05:00
Robin McCorkell
fdbb68a3c3
Return ? if mtime is 0 or -1
...
Tooltip contains 'Unable to determine date'. Fixes #6395
2014-12-12 23:54:18 +00:00
Vincent Petry
4b57892c4e
Merge pull request #12778 from owncloud/searchbytags2
...
Added searchByTags to view, storage and cache
2014-12-12 14:27:19 +01:00
Thomas Müller
6b4502adeb
Merge pull request #12812 from owncloud/remove-53-workaround
...
Remove conditional check for 5.3 compatibility
2014-12-12 13:16:49 +01:00
Joas Schilling
4f92e4a233
Merge pull request #12808 from owncloud/add-special-parameterlist-to-manager
...
Add special parameterlist to manager
2014-12-12 13:03:26 +01:00
Vincent Petry
ffd5e93f70
Merge pull request #12789 from owncloud/external-icon
...
fix and compress files_external icon
2014-12-12 12:46:57 +01:00
Lukas Reschke
5eaa2214b8
Remove conditional check for 5.3 compatibility
2014-12-12 12:25:59 +01:00
Robin Appelman
3bf0922b13
Merge pull request #12527 from owncloud/js-pluginsystem
...
Simple Plugin system for Javascript
2014-12-12 11:43:31 +01:00
Joas Schilling
46def69574
Specify list of activity parameters for sharing extension
2014-12-12 11:41:01 +01:00
Vincent Petry
15ecb28d50
Make $userId mandatory for searchByTags
...
$userId is now a mandatory parameter for searchByTags.
Also fixed some places in the code where the argument was missing (Node
API and View)
2014-12-12 11:18:35 +01:00
Gadzy
ba3957fb8a
Check for share by link enabled
...
Display "Shared by link" section only if sharing by link is enabled.
2014-12-12 10:23:51 +01:00
Morris Jobke
e969fe6b12
Merge pull request #12698 from owncloud/handle_readonly_shared_files
...
Handle readonly shared files
2014-12-12 08:34:28 +01:00
Jenkins for ownCloud
68932b30fd
[tx-robot] updated from transifex
2014-12-12 01:55:24 -05:00
Vincent Petry
a89aad05c0
Replace input checkbox CSS selector with .electCheckBox
2014-12-11 18:23:30 +01:00
Vincent Petry
81e9d43e23
Move file thumbnail into the label element
2014-12-11 18:21:25 +01:00
Vincent Petry
25dde7e93b
Added searchByTags to view, storage and cache
2014-12-11 17:38:50 +01:00
Jörn Friedrich Dreyer
c615b3527f
show readonly message in file conflict dialog, make it always selected
2014-12-11 16:32:27 +01:00
Jan-Christoph Borchardt
c588ccf96a
fix and compress files_external icon
2014-12-11 15:33:31 +01:00
Jenkins for ownCloud
dc506dcfbf
[tx-robot] updated from transifex
2014-12-11 01:55:27 -05:00
Thomas Müller
80ae311329
Merge pull request #11892 from owncloud/remove_triggerupdate
...
Remove triggerupdate.php & add quiet option for CLI scanner
2014-12-10 16:17:29 +01:00
Jörn Friedrich Dreyer
1d490b559c
introduce inApps[] filter for search via ajax query, make file results show up in files app only
...
use more flexible return type
check array with !empty instead of count
2014-12-10 15:51:59 +01:00
Jörn Friedrich Dreyer
0f17486c1d
make path absolute
2014-12-10 11:04:17 +01:00
Morris Jobke
e3de51078d
Merge pull request #12090 from AdamWill/google-rename-delete
...
google: delete original after successful rename
2014-12-10 09:10:17 +01:00
Morris Jobke
3026cdbc80
Merge pull request #12549 from owncloud/shared-cache-non-existing
...
Dont return cached date in shared cache when the file doesn't exist
2014-12-10 08:49:40 +01:00
Jenkins for ownCloud
ea95bb0189
[tx-robot] updated from transifex
2014-12-10 01:55:34 -05:00
Morris Jobke
bfcd5a3802
Merge pull request #11214 from owncloud/issue/10836
...
Add an option to disallow sending sharing emails to non-owncloud users
2014-12-09 14:05:52 +01:00
Joas Schilling
26861a98c5
Merge pull request #12568 from owncloud/autoload-encryption-classes
...
Fix namespaces of encryption classes and encryption tests
2014-12-09 12:56:57 +01:00
Joas Schilling
539c0aeb04
Add an option to disallow sending sharing emails to non-owncloud users
...
Fix #10836
2014-12-09 11:32:39 +01:00
Thomas Müller
9ca8b864e2
Merge pull request #12708 from owncloud/l10nsaved
...
translated saved message in files external
2014-12-09 10:46:35 +01:00
Lukas Reschke
17f85ec5a9
Merge pull request #12688 from owncloud/rename-alt
...
introduce alt text for rename icon - fixes #12067
2014-12-09 10:37:33 +01:00
Lukas Reschke
3566edbcec
Merge pull request #12715 from owncloud/fix-broken-personal-page
...
remove duplicate loaded personal.js - fixes #12674
2014-12-09 10:35:08 +01:00
Morris Jobke
4d2573bff7
Merge pull request #12709 from owncloud/fix-11955
...
Skip headers that can not be split
2014-12-09 09:52:59 +01:00
Joas Schilling
b85e34c1da
Correctly namespace encryption tests
2014-12-09 09:47:27 +01:00
Joas Schilling
e67fe0336b
Use self:: instead of the class name in encryption tests
2014-12-09 09:47:27 +01:00
Joas Schilling
efac8ced90
Update OCA\Encryption to OCA\Files_Encryption in the encryption app itself
2014-12-09 09:47:26 +01:00
Joas Schilling
78a307995c
Fix namespace of Files_Encryption outside of the app
2014-12-09 09:47:26 +01:00
Joas Schilling
7f7006643f
Fix namespace of files_encryption classes and autoload them
2014-12-09 09:47:26 +01:00
Thomas Müller
c36bac3abd
Merge pull request #12406 from owncloud/drop-getApps-getUsers
...
Config cleanup - OC_Preferences refactoring
2014-12-09 09:36:38 +01:00
Morris Jobke
b9fab7441c
remove duplicate loaded personal.js - fixes #12674
2014-12-09 09:27:10 +01:00
Jenkins for ownCloud
8f8f9deb66
[tx-robot] updated from transifex
2014-12-09 01:56:38 -05:00
Lukas Reschke
25a87d4058
Merge pull request #12577 from owncloud/public-mount-api
...
Add a public api for apps to add mounts
2014-12-08 22:57:33 +01:00
Morris Jobke
0d4f0ab871
reduce OC_Preferences, OC_Config and \OCP\Config usage
...
* files_encryption
* files_versions
* files_trashbin
* tests
* status.php
* core
* server container
2014-12-08 22:42:37 +01:00
Victor Dubiniuk
adc7135429
Skip headers that can not be split
2014-12-08 23:43:43 +03:00
Volkan Gezer
26645c072a
translated saved message in files external
2014-12-08 21:40:15 +01:00
Lukas Reschke
de3ead5ab9
Merge pull request #12704 from owncloud/fix-12647-2
...
preserve an asterisk at the start when escaping a search term
2014-12-08 19:14:59 +01:00
Arthur Schiwon
0577bb569a
add doc
2014-12-08 17:22:52 +01:00
Arthur Schiwon
45443ee28c
preserve an asterisk at the start when escaping a search term
2014-12-08 17:19:57 +01:00
Robin Appelman
baf5c44bec
Merge pull request #12696 from owncloud/trashbin-selected-delete
...
Fix deleting selected files in the trashbin
2014-12-08 16:30:53 +01:00
Morris Jobke
1bfa405a93
introduce alt text for rename icon - fixes #12067
2014-12-08 15:49:09 +01:00
Robin Appelman
b2d4e53f66
Fix deleting selected files in the trashbin
2014-12-08 15:16:15 +01:00
Morris Jobke
1362c0b67a
Merge pull request #12452 from owncloud/server2server-ng-ocs
...
OCS API for server-to-server sharing
2014-12-08 14:12:03 +01:00
Lukas Reschke
d3188159d2
Merge pull request #12394 from owncloud/files-fileactionsimprovements
...
Improve FileActions JS to allow for custom rendering
2014-12-08 11:30:21 +01:00
Jenkins for ownCloud
2784d580bd
[tx-robot] updated from transifex
2014-12-08 01:54:57 -05:00
Thomas Müller
d571f42860
Merge pull request #12668 from owncloud/keepspace
...
Keep spaces out of the string
2014-12-07 13:15:37 +01:00
Jenkins for ownCloud
8ee9ee29ea
[tx-robot] updated from transifex
2014-12-07 01:54:32 -05:00
Volkan Gezer
57452a3641
Keep spaces out of the string
...
Otherwise translators cannot notice them on Transifex.
2014-12-07 01:57:34 +01:00
Jenkins for ownCloud
94eb2e782f
[tx-robot] updated from transifex
2014-12-06 01:54:56 -05:00
Lukas Reschke
1be5a3ca89
Merge pull request #12166 from helmutschneider/aws-2.7.5
...
Upgrade AWS sdk to 2.7.5. Fixes #12023
2014-12-05 20:12:53 +01:00
Lukas Reschke
116a1b366a
Merge pull request #11485 from brumsoel/master
...
Fix timestamp comparator return value
2014-12-05 19:53:09 +01:00
Vincent Petry
89db2a0277
Merge pull request #12523 from owncloud/port-11747
...
Only store user credentials when SMB_OC storage is enabled
2014-12-05 18:04:06 +01:00
Jenkins for ownCloud
4d53f163fd
[tx-robot] updated from transifex
2014-12-05 01:55:52 -05:00
Arthur Schiwon
1c369093e5
cache total user count
...
Conflicts:
apps/user_ldap/user_ldap.php
2014-12-04 19:09:13 +01:00
Arthur Schiwon
ee168a121d
Forward port of #12493
...
add ldap-search command to occ
Conflicts:
apps/user_ldap/appinfo/register_command.php
LDAP search filter creation changes:
1. do not prepend * wildcard to search terms. Will result in faster search, but
you don't find "foobar" when looking for "bar"
2. advanced behaviour when search string contains a space and multiple search
attributes are present. The search string is split into single words. The
resulting filter requires that each word at least appears once in any search
attribute. This is supposed to return better results in big LDAPs.
trim search string before passing it on
2014-12-04 19:02:09 +01:00
Vincent Petry
bf887eca8b
Remove obsoleted filelist prototype backup in tests
2014-12-04 18:39:20 +01:00
Robin Appelman
a369d78124
Use the mount config api for files_external
2014-12-04 16:47:30 +01:00
Robin Appelman
f4701d7721
Add public api for mount configurations
2014-12-04 16:47:27 +01:00
Morris Jobke
a0488453ac
Merge pull request #12596 from owncloud/remove-travis-traces
...
Remove last traces of travis integration
2014-12-04 16:04:15 +01:00
Jörn Friedrich Dreyer
3cdaa4094f
add quiet option, ref #8794
2014-12-04 13:44:30 +01:00
Jörn Friedrich Dreyer
7ef6df04da
remove triggerupdate, ref #11872
2014-12-04 13:44:30 +01:00
Bjoern Schiessle
698ecbf308
OCS API for server-to-server sharing
2014-12-04 13:18:13 +01:00
Bjoern Schiessle
1509dd1358
update error message
2014-12-04 12:01:11 +01:00
Bjoern Schiessle
0dd44eaf27
OC8 and later requires PHP >= 5.4, so we can remove the check from the encryption app
2014-12-04 11:17:44 +01:00
Morris Jobke
2c5e4b3d3f
Remove last traces of travis integration
2014-12-04 10:09:13 +01:00
Jenkins for ownCloud
5aad902507
[tx-robot] updated from transifex
2014-12-04 01:54:42 -05:00
brumsel
0dcfd5f20b
Modified filesort test cases to test for large sizes & timestamps
2014-12-03 23:45:57 +01:00
brumsel
4ba520e214
Merge remote-tracking branch 'upstream/master'
2014-12-03 23:04:49 +01:00
Bjoern Schiessle
0a173e2b58
fix typo
2014-12-03 19:46:32 +01:00
Morris Jobke
3fdb1937a3
Merge pull request #12382 from owncloud/enc_reorganize_folders2
...
[encryption] reorganize folder structure (second try to make Jenkins happy)
2014-12-03 16:08:40 +01:00
Thomas Müller
6daa588e1c
Merge pull request #12556 from owncloud/add-route-for-versions
...
Add route for download of versions
2014-12-03 14:01:58 +01:00
Lukas Reschke
8c8c257ce3
Merge pull request #12554 from owncloud/versions-app-autoload
...
Autoload lib files of versions app
2014-12-03 09:34:57 +01:00
Jenkins for ownCloud
af50df8912
[tx-robot] updated from transifex
2014-12-03 01:54:32 -05:00
Lukas Reschke
c4e0c02526
Add route for download of versions
...
Otherwise on master it was not possible anymore to download older versions.
Fixes itself.
2014-12-02 17:52:31 +01:00
Morris Jobke
f9958153ef
Merge pull request #12333 from owncloud/delete-selected-files
...
Fix deleting non deletable files by selecting them
2014-12-02 17:32:04 +01:00
Joas Schilling
1bd018a70c
Autoload exception from files_trashbin
2014-12-02 17:26:42 +01:00
Joas Schilling
694003d147
Autoload lib files of versions app
2014-12-02 17:21:19 +01:00
Bjoern Schiessle
9ca9acf3f8
small fixes
2014-12-02 16:08:06 +01:00
Bjoern Schiessle
2e78217f17
delete old keys if file was moved to a different mount point
2014-12-02 16:03:54 +01:00
Bjoern Schiessle
49cfc30359
upgrade to new folder structure
2014-12-02 16:03:54 +01:00
Robin Appelman
ce10b93519
Dont return cached date in shared cache when the file doesn't exist
2014-12-02 15:28:11 +01:00
Vincent Petry
c02ef69521
Simple Plugin system for Javascript
2014-12-01 16:20:44 +01:00
Lukas Reschke
805be635fa
Only store user credentials when SMB_OC storage is enabled
...
Conflicts:
apps/files_external/lib/smb_oc.php
2014-12-01 11:18:29 +01:00
Adam Williamson
415411a3d5
google: delete original after successful rename
...
In GDrive, filenames aren't unique, and directories are just
special files - so you can have multiple files with the same
name, multiple directories with the same name, and even files
with the same names as directories.
OC doesn't handle this at all, though, and just wants to act
as if file and directory names *are* unique. So when renaming,
we must check if there's an existing object with the same
file or directory name before we commit the rename, and
explicitly delete it if the rename is successful. (Other
providers like dropbox do the same for files, but intentionally
don't do it for directories; we really need to do it for
directories too.)
A good way to observe this is to run the storage unit tests
and look at the state of the Drive afterwards. Without this
commit, there will be several copies of all the test files
and directories. After this commit, there's just one of each.
We can't just say "hey, Drive lets us do this, what's the
problem?" because we don't handle multiple-objects, same-name
cases - getDriveFile() just bails and prints an error if it
searches for the file or directory with a given name and gets
multiple results.
2014-11-30 15:34:35 -08:00
Jenkins for ownCloud
40badba703
[tx-robot] updated from transifex
2014-11-30 01:54:25 -05:00
Jenkins for ownCloud
83d097c524
[tx-robot] updated from transifex
2014-11-29 01:54:28 -05:00
Jenkins for ownCloud
96b0328d39
[tx-robot] updated from transifex
2014-11-28 01:55:29 -05:00
Jenkins for ownCloud
87a2aabb98
[tx-robot] updated from transifex
2014-11-27 01:54:46 -05:00
Morris Jobke
60f7a86323
Merge pull request #12448 from owncloud/no503forRoot
...
Don't show favicon to prevent iteration through subfolders
2014-11-26 17:06:43 +01:00
Lukas Reschke
8af346a84d
Don't show favicon to prevent iteration through subfolders
...
The codepath for generating the favicons iterates through subnodes and if one of those nodes is unavailable is throwing a 503 exception. Since these favicons don't have any use except of "making a tool for developers looking nicer" I consider it feasible to remove them.
2014-11-26 12:38:26 +01:00
Robin Appelman
a2457b5fb9
Merge pull request #6989 from AdamWill/google-1
...
Migrate Google Drive external storage app to v1.0.6-beta of the google-api-php-client library
2014-11-26 12:17:57 +01:00
Robin Appelman
e8cbb8e2d8
Add js unit test
2014-11-26 12:14:35 +01:00
Robin Appelman
9c86665ef4
Dont show the delete button for selected files if one of the selected files is not deletable
2014-11-26 12:14:35 +01:00
Robin Appelman
4321d7522e
Check if files are deletable before trying to delete them
2014-11-26 12:14:35 +01:00
Bjoern Schiessle
a90606fb14
change private/public key names for consistency reasons
2014-11-26 10:57:47 +01:00
Bjoern Schiessle
266f1a2afa
harmonize copyright notice
2014-11-26 10:57:47 +01:00
Bjoern Schiessle
fd86d76f98
new folder structure for keys
...
all keys are now in files_encryption/key/path_to_file/filename/
share keys are named: user.shareKey
file key is named: fileKey
2014-11-26 10:57:47 +01:00
Lukas Reschke
c749570a06
Merge pull request #12411 from owncloud/unknown-command-windows
...
Replace some more "command -v" calls with the Helper method
2014-11-26 10:29:41 +01:00
Morris Jobke
c5fa8f1bdc
Merge pull request #12421 from owncloud/issue/6101-remove-namespace-permission-constants
...
Issue/6101 remove namespace permission constants
2014-11-26 08:31:23 +01:00
Jenkins for ownCloud
3766d98df6
[tx-robot] updated from transifex
2014-11-26 01:54:31 -05:00
Thomas Müller
e6a7022037
Merge pull request #12410 from owncloud/no_session_for_public_share_key
...
don't store private public-share-key in session
2014-11-25 22:26:40 +01:00
Joas Schilling
0274dcba57
Replace some more "command -v" calls with the Helper method
2014-11-25 18:10:03 +01:00
Joas Schilling
2c39aec8cb
Replace deprecated constant with new class constant
2014-11-25 16:30:21 +01:00
Bjoern Schiessle
4643a5d238
replace \OC:: with \OC::->getSession()
2014-11-25 16:15:32 +01:00
Bjoern Schiessle
1d33503487
we no longer need to keep the session open for encryption
2014-11-25 13:37:11 +01:00
Bjoern Schiessle
917bef39b7
don't store private public-share-key in session
2014-11-25 12:32:25 +01:00
Bjoern Schiessle
f274833403
remove unused variable
2014-11-25 10:12:10 +01:00
Morris Jobke
6fb2477fb7
Merge pull request #12262 from owncloud/removeAbsoluteDirectoryPathFromTemplate
...
Don't disclose relative directory path for single shared files of user
2014-11-25 10:09:16 +01:00
Morris Jobke
bc3c835f6a
Merge pull request #12390 from owncloud/use-session-in-case
...
Close session only if encryption app is not enabled
2014-11-25 09:32:16 +01:00
Morris Jobke
02095d4f20
Merge pull request #11837 from owncloud/fix-11328
...
unify count filters and introduce display name attribute detection
2014-11-24 18:13:01 +01:00
Vincent Petry
e689bc745f
Improve FileActions JS to allow for custom rendering
...
This improves the OCA.Files.FileActions class to support passing a
"render" function in the action object.
The default function "_defaultRenderFunction" is used by default and
renders actions in the usual actions container.
Moved "Rename" and "Delete" to custom render functions.
2014-11-24 16:26:50 +01:00
Bjoern Schiessle
1645c8f819
use login name to verify password
2014-11-24 15:44:43 +01:00
Lukas Reschke
8589079590
Close session only if encryption app is not enabled
...
Fixes https://github.com/owncloud/core/issues/12389
2014-11-24 15:02:49 +01:00
Morris Jobke
8782b2237c
Merge pull request #12084 from owncloud/sharing_fix_shared_with_info
...
sharing: make sure that we only find the shares from a given owner
2014-11-24 11:44:43 +01:00
Jenkins for ownCloud
0edcfc1dc1
[tx-robot] updated from transifex
2014-11-24 01:54:35 -05:00
Jenkins for ownCloud
fa3f7ad9e9
[tx-robot] updated from transifex
2014-11-22 01:55:21 -05:00
Arthur Schiwon
9aef83b579
make scrutinizer happier and always count users on assisted mode, even with xp'ed mode (would be a regression otherwise)
2014-11-22 00:51:41 +01:00
Arthur Schiwon
503de94392
make updateCount work properly with new xp'd mode as well as without
2014-11-21 16:23:56 +01:00
Bjoern Schiessle
a7ebfe87c9
also check for the correct owner if it was submitted
2014-11-21 16:17:37 +01:00
Arthur Schiwon
c07c338c90
fix counting when ldapPagingSize is 0
2014-11-21 14:51:20 +01:00
Jenkins for ownCloud
f8421958b3
[tx-robot] updated from transifex
2014-11-21 02:54:26 -05:00
Arthur Schiwon
b5e707b1bf
trigger count on the correct filter
2014-11-20 18:31:40 +01:00
Arthur Schiwon
6b6147dafd
phpdoc and mixed up letters
2014-11-20 18:31:40 +01:00
Arthur Schiwon
031d6c179f
better readbility, no effective changes
2014-11-20 18:31:40 +01:00
Arthur Schiwon
0e6d47123a
use underscore.js for undefined checks
2014-11-20 18:31:40 +01:00
Arthur Schiwon
d8bb8afee3
this happens already before counting, no need anymore
2014-11-20 18:31:40 +01:00
Arthur Schiwon
c9e865629e
JS doc
2014-11-20 18:31:40 +01:00
Arthur Schiwon
4a3fe42b16
a corrected email attribute needs to be saved, not only returned
2014-11-20 18:31:39 +01:00
Arthur Schiwon
f9b4f5f4e5
to reassure that selected attributes still work, do not count all matching entries but limit it to 1 in order to make it faster
2014-11-20 18:31:39 +01:00
Arthur Schiwon
71944a59a5
detectors (email, displayname..) are now started in one place, triggered from only 2 places. more reliable structure and flow, saves requests
2014-11-20 18:31:39 +01:00
Arthur Schiwon
f725cc66a3
consolidate user count filter in wizard and user back end
2014-11-20 18:31:39 +01:00
Arthur Schiwon
cb3af1dce2
detect user display name attribute and return user count depending on its presence
2014-11-20 18:31:39 +01:00
Vincent Petry
391ece46e3
Fix file upload to ext storage when recovery key is enabled
...
Fixes an issue when uploading files to external storage when recovery
keys are enabled
The Util class only works with real users, so instantiating it with the
virtual recovery key user or public key user can cause issues.
2014-11-20 16:43:44 +01:00
Lukas Reschke
713c8e0dac
Merge pull request #12325 from owncloud/removeunneccessarylang
...
cleanup languages. closes #11274
2014-11-20 16:12:49 +01:00
Thomas Müller
cbb9caf030
Merge pull request #12226 from owncloud/remove-phpass
...
Remove phpass and migrate to new Hasher interface
2014-11-20 14:59:59 +01:00
Morris Jobke
46e6104795
Merge pull request #12297 from owncloud/issue/10991-all-testcase
...
Issue/10991 all testcase
2014-11-20 14:53:18 +01:00
Volkan Gezer
995fe4a176
cleanup languages. closes #11274
2014-11-20 14:46:17 +01:00
Morris Jobke
288acb55a0
Merge pull request #12305 from owncloud/sharelist-nodelete
...
Remove delete button in shared with others list
2014-11-20 13:32:07 +01:00
Vincent Petry
63fa8ec69a
JSHint fixes in sharedfilelistSpec unit test file
2014-11-19 17:44:05 +01:00
Vincent Petry
98ec0451be
Remove delete button in shared with others list
...
Whenever a file is shared with others or with link, a delete button used
to be visible that triggered a direct deletion.
This button has been removed to avoid accidental deletion from people
who might believe it was an unshare button. Unsharing is still possible
inside the share dropdown.
2014-11-19 17:42:57 +01:00
Joas Schilling
76ebd3a050
Make apps/ extend the \Test\TestCase and fix overwritten methods
2014-11-19 14:52:09 +01:00
Joas Schilling
bb540722cd
Use base class to reset the file mapper
2014-11-19 14:52:07 +01:00
Lukas Reschke
284ba5b688
Merge pull request #12290 from owncloud/ext-preventbreakageduetobugs2
...
Show warning when invalid user was passed
2014-11-19 14:27:32 +01:00
Lukas Reschke
1c8f9564a4
Merge pull request #11696 from owncloud/addWarningToEncryptionLostPassword
...
Warn for password reset when files_encryption is enabled
2014-11-19 13:05:02 +01:00
Morris Jobke
dc9eaf59dc
Merge pull request #12276 from owncloud/undelete-only-if-files-trashin-is-enabled
...
Only show undelete capability if files_trashbin is enabled
2014-11-19 11:42:19 +01:00
Jenkins for ownCloud
705976ba0a
[tx-robot] updated from transifex
2014-11-19 01:54:59 -05:00
Lukas Reschke
61641293f4
Only show undelete capability if files_trashbin is enabled
...
Fixes the OCS capability API at /ocs/v1.php/cloud/capabilities
2014-11-18 23:06:39 +01:00
Lukas Reschke
a6ebb17610
Remove unused variable and make Scrutinizer happy.
2014-11-18 18:52:00 +01:00
Lukas Reschke
f3ab4f3faf
Don't disclose relative directory path for single shared files of user
...
The "dir" key is used within the public sharing template to indicate in which directory the user currently is when sharing a directory with subdirectories. This is needed by the JS scripts.
However, when not accessing a directory then "dir" was set to the relative path of the file (from the user's home directory), meaning that for every public shared file the sharee can see the path.
(For example if you share the file "foo.txt" from "finances/topsecret/" the sharee would still see the path "finances/topsecret/" from the shared HTML template)
This is not the excpected behaviour and can be considered a privacy problem, this patch addresses this by setting "dir" to an empty key.
2014-11-18 18:51:57 +01:00
Lukas Reschke
5f07fb15dc
Fix case-sensitivity
2014-11-18 18:50:47 +01:00
Lukas Reschke
1b85f40cbe
$file only contains the filename and not the absolute path, that means that files in a subdirectory will not get properly resolved and an empty filesize is returned.
...
This feature only exists on master.
2014-11-18 17:14:26 +01:00
Morris Jobke
230e517f35
Merge pull request #12220 from owncloud/remove-unused-code
...
Remove unused code
2014-11-18 10:36:32 +01:00
Jenkins for ownCloud
91f7c0af6e
[tx-robot] updated from transifex
2014-11-18 01:54:31 -05:00
Bjoern Schiessle
f6efbfcf0b
listen to the post_passwordReset hook, backup the old keys and create a new key pair for the user
2014-11-17 17:50:20 +01:00
Morris Jobke
146cb920c9
Merge pull request #12218 from owncloud/issue/10991-fixes
...
Issue/10991 Make unit tests pass on windows
2014-11-17 16:44:45 +01:00
Lukas Reschke
8dbedbb849
Remove unused code
...
We don't support direct updates from older ownCloud versions except the previous one therefore this code is unused and can be removed.
2014-11-17 14:01:39 +01:00
Lukas Reschke
8595b76df2
Remove phpass and migrate to new Hasher interface
...
This PR removes phpass and migrates to the new Hasher interface.
Please notice that due to https://github.com/owncloud/core/issues/10671 old hashes are not updated but the hashes are backwards compatible so this shouldn't hurt.
Once the sharing classes have a possibility to update the passwords of single shares those methods should be used within the newHash if block.
2014-11-17 13:39:13 +01:00
Joas Schilling
6625d5c88f
Correctly restore previous root mount point after testing
2014-11-17 10:48:19 +01:00
Joas Schilling
b228226700
Fix single run of encryption tests and usages of uniqid() and fopen()
2014-11-17 10:48:13 +01:00
Joas Schilling
a3a064fe96
Skip some more tests on Windows which just can not work at all
2014-11-17 10:48:06 +01:00
Jenkins for ownCloud
9df50c7be6
[tx-robot] updated from transifex
2014-11-17 01:54:33 -05:00
Jenkins for ownCloud
55889d7eb4
[tx-robot] updated from transifex
2014-11-16 01:55:00 -05:00
Jenkins for ownCloud
580d27eed2
[tx-robot] updated from transifex
2014-11-15 01:54:28 -05:00
Vincent Petry
c941c3fa51
Show warning when invalid user was passed
...
Sometimes there are bugs that cause setupFS() to be called for
non-existing users. Instead of failing hard and breaking the instance,
this fix simply logs a warning.
2014-11-14 16:43:23 +01:00
Vincent Cloutier
fad621140b
Added download size on public sharing
2014-11-14 16:26:59 +01:00
Lukas Reschke
988c85d292
Refactor file sharing public link handling
...
fixes download issue introduced by #10755
Conflicts:
apps/files_sharing/public.php
2014-11-14 16:26:59 +01:00
Jörn Friedrich Dreyer
df18bd3e0d
Merge pull request #12162 from owncloud/ext-s3-missingfolderwithsamename
...
Do not remove dir entry if it has the same name as the parent
2014-11-14 10:37:10 +01:00
Jenkins for ownCloud
0811b39e5f
[tx-robot] updated from transifex
2014-11-14 01:54:47 -05:00
Johan Björk
e0056c4a0d
Upgrade AWS sdk to 2.7.5
2014-11-13 23:37:34 +01:00
Vincent Petry
914f4cb6f2
Do not remove dir entry if it has the same name as the parent
...
This fixes an issue when a subdir has the same name as its parent, it
would get exluded from the list.
2014-11-13 17:37:56 +01:00
blizzz
559b34e53d
Merge pull request #12005 from owncloud/bower-multiselect
...
Move multiselect to user_ldap
2014-11-13 14:43:06 +01:00
Vincent Petry
5ca869c324
Merge pull request #9177 from owncloud/jsdocexperiment
...
Improved JS Docs + added build script for JS Docs
2014-11-13 11:16:08 +01:00
Jenkins for ownCloud
a069171cda
[tx-robot] updated from transifex
2014-11-13 01:54:36 -05:00
Morris Jobke
f39cb3fbc9
Migrate multiselect to user_ldap
2014-11-13 00:47:14 +01:00
Vincent Petry
e0b797c43c
Merge pull request #12087 from AdamWill/google-touch
...
google: fix touch() when $mtime is set (Google wants RFC3339) #11267
2014-11-12 18:24:57 +01:00
Jenkins for ownCloud
1846fb0285
[tx-robot] updated from transifex
2014-11-12 01:55:24 -05:00