wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
22600 commits 157 branches 562 tags 714 MiB
Commit graph

9644 commits

Author SHA1 Message Date
Tom Needham
a4f270a9ce Add placeholder app.php for provisioning_api so app is detected 2015-01-02 18:52:11 +00:00
Jörn Friedrich Dreyer
ba235eb51d delay hiding no results message until search is triggered 2015-01-02 16:13:15 +01:00
Jörn Friedrich Dreyer
6f820b0209 use " to avoid escaping ' 2015-01-02 14:59:55 +01:00
Jörn Friedrich Dreyer
152c8b3969 text and icon fixes 2015-01-02 14:58:39 +01:00
Jörn Friedrich Dreyer
2eec8dc156 correctly update search results when query is changed, show spinner when searching 2015-01-02 14:22:48 +01:00
Jörn Friedrich Dreyer
0cca9e26c4 show no files found message 2015-01-02 12:50:21 +01:00
Jörn Friedrich Dreyer
9e3f4e043f make OCA.Search.Files available in tests and for other apps 2015-01-02 10:57:25 +01:00
Jörn Friedrich Dreyer
6ba8881343 add file summary filter spec tests 2015-01-02 10:28:42 +01:00
Robin Appelman
f8700ec649 Fix rendering search results 2015-01-02 10:28:42 +01:00
Jörn Friedrich Dreyer
457f5abf6c fix count 2015-01-02 10:28:42 +01:00
Jörn Friedrich Dreyer
4fdd626f0a use correct visibilities 2015-01-02 10:28:42 +01:00
Jörn Friedrich Dreyer
b45d0f03fc fix js tests 2015-01-02 10:28:42 +01:00
Jörn Friedrich Dreyer
8abd954d9a instantiate file search 2015-01-02 10:28:42 +01:00
Jörn Friedrich Dreyer
66cf17b32b don't use full class name to register plugin 2015-01-02 10:28:42 +01:00
Jörn Friedrich Dreyer
8bf048376c allow getting the last query 2015-01-02 10:28:41 +01:00
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