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

9160 commits

Author SHA1 Message Date
Bjoern Schiessle
794d3ef949 improved visual feedback if recovery key password gets changed 2014-10-07 12:32:09 +02:00
Bjoern Schiessle
5fa1cbc4e5 improved visual feedback if recovery key gets enabled/disabled 2014-10-07 12:32:09 +02:00
Vincent Petry
396a71b005 Merge pull request #11378 from owncloud/sort-indicator-style 
fix position and style of sort indicator
 2014-10-07 11:06:37 +02:00
Jan-Christoph Borchardt
2b8066bff3 reduce bottom padding in filelist, fix perceived glitching, fix #11213 2014-10-07 10:44:01 +02:00
Jenkins for ownCloud
01be0af209 [tx-robot] updated from transifex 2014-10-07 01:54:46 -04:00
Morris Jobke
e5b4e54141 Merge pull request #11392 from owncloud/fix_version_previews 
we also encrypt/decrypt files in the versions folder
 2014-10-06 13:03:48 +02:00
Bjoern Schiessle
9147219377 we also encrypt/decrypt files in the versions folder for previews and if encryption is enabled/disabled 2014-10-06 12:02:08 +02:00
Jenkins for ownCloud
6e991a53ec [tx-robot] updated from transifex 2014-10-06 01:54:57 -04:00
Jenkins for ownCloud
f191e5b088 [tx-robot] updated from transifex 2014-10-05 01:54:50 -04:00
Jenkins for ownCloud
537f046e66 [tx-robot] updated from transifex 2014-10-02 01:54:48 -04:00
Arthur Schiwon
3b3ad0bc4f fix changed variable name 2014-10-01 21:44:36 +02:00
Jan-Christoph Borchardt
3cd6b99a0b fix position and style of sort indicator 2014-10-01 15:21:28 +02:00
Lukas Reschke
001f223baa Merge pull request #10104 from owncloud/s3-overwrite 
Fix S3 copy and rename overwriting target directory
 2014-10-01 13:07:28 +02:00
Jenkins for ownCloud
553274b28f [tx-robot] updated from transifex 2014-10-01 06:56:17 -04:00
Arthur Schiwon
6c502e11f8 make scrutinizer happy, very minor changes 2014-10-01 11:55:53 +02:00
Arthur Schiwon
f9e085b020 init a new paged search on read operations to satisfy OpenLDAP 2014-09-30 17:00:25 +02:00
Lukas Reschke
306bf71c62 Use SVG previews for public sharing 
Fixes https://github.com/owncloud/core/pull/11367#issuecomment-57306037 and https://github.com/owncloud/core/issues/9218
 2014-09-30 15:49:49 +02:00
Arthur Schiwon
2b9696efae abandond paged search only if PHP supports them 2014-09-30 13:13:52 +02:00
Arthur Schiwon
53ec32807a abandon ongoing paged search before starting a new one 2014-09-30 12:42:37 +02:00
Arthur Schiwon
9a63693227 properly cancel a Paginated Results operation in order to avoid protocol errors, fixes #10526 2014-09-30 12:42:37 +02:00
Jenkins for ownCloud
5292a14cdf [tx-robot] updated from transifex 2014-09-30 01:55:11 -04:00
Martin Konrad
fd9b79b218 Add a CLI command that deletes an LDAP config 
With this change LDAP configurations can be managed completely from
the command line.
 2014-09-30 03:23:00 +02:00
Lukas Reschke
659b9fc030 Merge pull request #11337 from danbartram/better_encryption_recovery_labels 
Add clickable labels to encryption recovery radios
 2014-09-29 22:06:00 +02:00
Lukas Reschke
b13b86502f Merge pull request #11347 from mark0n/create_empty_config 
Add a CLI command that creates an empty LDAP config
 2014-09-29 21:42:07 +02:00
Lukas Reschke
8c8e5c168e Merge pull request #10107 from owncloud/sharing_group_shares 
[sharing] group shares
 2014-09-29 20:26:41 +02:00
Lukas Reschke
6b45cb5416 Merge pull request #11321 from owncloud/ldap-fix-memberof-detection 
dn needs to be fetched to be able to detect memberOf support
 2014-09-29 14:46:10 +02:00
Bjoern Schiessle
6e7acb8ae0 some small fixed, suggested by scrutinizer 2014-09-29 11:23:18 +02:00
Bjoern Schiessle
e5f0dded84 throw a exception if we can't handle the provided path 2014-09-29 11:13:06 +02:00
Jenkins for ownCloud
63726ea9e2 [tx-robot] updated from transifex 2014-09-29 01:54:33 -04:00
Martin Konrad
b57960aeec Add a CLI command that creates an empty LDAP config 
This is needed to configure the user_ldap app without using the
wizard (e.g. using tools like Puppet).
 2014-09-29 00:21:20 -04:00
Jenkins for ownCloud
84923475c0 [tx-robot] updated from transifex 2014-09-28 01:55:09 -04:00
Dan Bartram
1b9c31d349 Add clickable labels to encryption recovery radios 
Add clickable radio button labels to the encryption recovery settings
pages:
* settings-admin
* settings-personal

Pressing on the radio button text now toggles the state of the radio
button.
 2014-09-27 16:20:06 +01:00
Jenkins for ownCloud
3a16b1bb68 [tx-robot] updated from transifex 2014-09-27 01:54:48 -04:00
Arthur Schiwon
6041ae6224 dn needs to be fetched to be able to detect memberOf support 2014-09-26 15:36:49 +02:00
Jenkins for ownCloud
1631937990 [tx-robot] updated from transifex 2014-09-26 01:54:59 -04:00
Bjoern Schiessle
52b6469b0c call \OCP\Share::getItemsSharedWithUser() to get exclude list, this way all checks are executed, e.g. to check if the share is really visible 2014-09-25 14:26:31 +02:00
Bjoern Schiessle
d5fc011c90 some small fixes 2014-09-25 11:29:57 +02:00
Jenkins for ownCloud
f46e49529f [tx-robot] updated from transifex 2014-09-25 01:55:32 -04:00
Robin Appelman
e8280c80da Show a proper error message when trying to scan the filesystem for a non existing user 2014-09-24 15:48:54 +02:00
Bjoern Schiessle
5c7fe91041 clear share table after each test run 2014-09-24 14:02:02 +02:00
Lukas Reschke
aeb516c3c9 Check for blacklisted characters 
Fixes https://github.com/owncloud/core/issues/11264

(This should in future get moved to the mountpoint class - but that is something for @icewind1991 ;-))
 2014-09-23 19:30:32 +02:00
Jan-Christoph Borchardt
1e915cc145 Merge pull request #11109 from owncloud/nstamm-patch-1 
DragnDrop Upload text style
 2014-09-23 14:03:08 +02:00
Jan-Christoph Borchardt
8c33a8e6fd adjust text size and opacity of drag'n'drop upload text style 2014-09-23 13:36:47 +02:00
Jan-Christoph Borchardt
a062db4fd0 Merge pull request #11234 from owncloud/fix-icon-classes 
Fix icon classes, disappeared delete icon
 2014-09-23 12:39:06 +02:00
Vincent Petry
75593f87d5 Merge pull request #11137 from owncloud/enc-pregfix 
Fix share key pattern matching
 2014-09-23 12:36:34 +02:00
Vincent Petry
1e631754d7 Fix share key finding algorithm in various cases 
Instead of inaccurate pattern matching, use the list of users who we
know have access to the file to build the list of share keys.

This covers the following cases:

- Move/copy files into a subfolder within a share
- Unsharing from a user
- Deleting files directlry / moving share keys to trashbin
 2014-09-23 12:33:07 +02:00
Lukas Reschke
5d977f97b0 Merge pull request #11032 from owncloud/harden-redirect 
Do only follow HTTP and HTTPS redirects
 2014-09-23 11:34:44 +02:00
Lukas Reschke
ff6c5331e9 Merge pull request #11224 from owncloud/fix_recovery_admin_user 
first check if a private key exists, if not it is always a recovery szenario
 2014-09-23 10:13:58 +02:00
Jenkins for ownCloud
479e4410c5 [tx-robot] updated from transifex 2014-09-23 02:05:45 -04:00
Lukas Reschke
6eeb905871 Do only follow HTTP and HTTPS redirects 
We do not want to follow redirects to other protocols since they might allow an adversary to bypass network restrictions. (i.e. a redirect to ftp:// might be used to access files of a FTP server which might be in a secure zone and not be reachable from the net but from the ownCloud server)

Get final redirect manually using get_headers()

Migrate to HTTPHelper class and add unit tests
 2014-09-22 20:02:32 +02:00
Jan-Christoph Borchardt
1583ae1ed6 force show the loading icon in list for deletion, not only on hover 2014-09-22 18:24:52 +02:00
Jan-Christoph Borchardt
2ac953e6a8 correct progress-icon to icon-loading-small 2014-09-22 18:24:32 +02:00
Jan-Christoph Borchardt
91d9d45c6c correct delete-icon to icon-delete, fix #11128 2014-09-22 18:17:33 +02:00
Bjoern Schiessle
9105e17307 unit tests for grouping of shares pointing to the same source 2014-09-22 17:54:47 +02:00
Bjoern Schiessle
89c3b650e6 group shares and combine permissions 2014-09-22 17:25:15 +02:00
Vincent Petry
828ae65681 Merge pull request #11186 from owncloud/trash-fixdoubledeleteracecondition 
Added extra check to avoid deleting key folders
 2014-09-22 16:36:23 +02:00
Morris Jobke
70937dabcd Merge pull request #11167 from owncloud/env-movetomountreenableproxy 
Reenable file proxy when renaming between mount points
 2014-09-22 16:30:19 +02:00
Bjoern Schiessle
744110905b first check if a private key exists, if not it is always a recovery szenario 2014-09-22 15:05:03 +02:00
Volkan Gezer
d16b8c03e9 fix button text l10n 2014-09-22 09:32:03 +02:00
Georg Ehrke
9fd23d2edf files_sharing: add route for ajax/publicpreview 2014-09-21 18:21:42 +02:00
Jenkins for ownCloud
a1c39f74b7 [tx-robot] updated from transifex 2014-09-21 01:54:29 -04:00
Jenkins for ownCloud
e55c4bb807 [tx-robot] updated from transifex 2014-09-20 01:54:34 -04:00
Vincent Petry
8aca127e52 Added extra check to avoid deleting key folders 
Whenever a delete operation is called twice in a row, it could happen
that the first call already deleted the file.

The second call would return an empty $ownerPath because the file does
not exist. That empty $ownerPath would run the key deletion operation on
the wrong path.

This fix adds checks in many places to make sure we don't use $ownerPath
when it's empty or null.
 2014-09-19 19:01:02 +02:00
Volkan Gezer
01808c8c84 fix typo 2014-09-19 18:22:09 +02:00
Lukas Reschke
fed8100177 Merge pull request #10968 from owncloud/admin-groupsselect2 
Use select2 for the groups excluded from sharing in admin page
 2014-09-19 16:50:56 +02:00
Lukas Reschke
fb033cce98 Merge pull request #11104 from owncloud/enc_create_backup_on_recovery 
[encryption] create backup from all keys before recovery
 2014-09-19 16:40:19 +02:00
Lukas Reschke
e94ec409ae Merge pull request #11171 from owncloud/fix-route 
Match more URL fragments
 2014-09-19 16:04:29 +02:00
Bjoern Schiessle
a280859bf8 make sure that we really catch the files folder only 2014-09-19 11:47:18 +02:00
Bjoern Schiessle
2ee14c4734 create backup from all keys before recovery 2014-09-19 11:47:18 +02:00
Jenkins for ownCloud
786312d0e8 [tx-robot] updated from transifex 2014-09-19 01:55:44 -04:00
Lukas Reschke
7956765c12 Match more URL fragments 
Fixes https://github.com/owncloud/core/pull/11009#issuecomment-56103341
 2014-09-18 23:18:07 +02:00
Vincent Petry
f2a01dddbc Reenable file proxy when renaming between mount points 
When moving a folder into another mount point, $renamedFiles is empty
because that goes over a different mechanism.

In such case, this fix makes sure that the file proxy is reenable to
avoid breaking the subsequent files that are being moved.
 2014-09-18 19:21:04 +02:00
Morris Jobke
112e570989 Merge pull request #11141 from owncloud/update_encrytionlink 
update encryption doc link
 2014-09-18 18:19:53 +02:00
Volkan Gezer
ccaea93d6b update encryption doc link 
I don't know how we missed to update this :/

update ldap doc link
 2014-09-18 18:14:51 +02:00
Arthur Schiwon
4ed926b954 fix retrievel of group members and cache group members 2014-09-18 17:12:35 +02:00
Morris Jobke
338db48c0b Merge pull request #9541 from owncloud/force_loading_of_encryption_app 
force loading of encryption app to show correct error
 2014-09-18 09:04:53 +02:00
Jenkins for ownCloud
dd6b0b1319 [tx-robot] updated from transifex 2014-09-18 01:54:39 -04:00
Lukas Reschke
7db0d55129 Merge pull request #11105 from owncloud/jsunit-legacyfileactionsfix 
Tentative fix for legacy file actions unit test side effect
 2014-09-17 18:10:49 +02:00
Lukas Reschke
14571d4103 force loading of encryption app 2014-09-17 17:13:25 +02:00
Robin Appelman
6d60630f08 Skip test for unsuported feature for amazon s3 2014-09-17 15:52:00 +02:00
Robin Appelman
11ac9ce28b Fix copy overwrite for amazon s3 2014-09-17 15:52:00 +02:00
Robin Appelman
3b08b3fad4 Fix amazon s3 rename overwrite 2014-09-17 15:51:57 +02:00
Robin Appelman
6e12d830d5 Fix AmazonS3 rmdir on the root 2014-09-17 15:50:27 +02:00
Robin Appelman
2f22e67570 Also check if the file itself is updatable 2014-09-17 11:35:16 +02:00
Robin Appelman
d25a9a118f Check if a folder is deletable before we try to recursively delete it 2014-09-17 11:35:16 +02:00
Jenkins for ownCloud
2a89bc7b51 [tx-robot] updated from transifex 2014-09-17 01:55:27 -04:00
Lukas Reschke
45b17207cc Merge pull request #10745 from owncloud/fix-10708-doctrine 
Use Doctrine Platform to generate SQL query for table truncation.
 2014-09-16 23:56:20 +02:00
Lukas Reschke
21afcb3e94 Merge pull request #10902 from owncloud/fix-ellepsis 
Adding link to ellipsis and fixing styling
 2014-09-16 21:09:47 +02:00
Lukas Reschke
368391e401 Merge pull request #11009 from owncloud/tobiasKaminsky-route 
REST API for thumbnails
 2014-09-16 19:31:51 +02:00
Lukas Reschke
d2743e6ad6 Merge pull request #7254 from owncloud/core-sortalgo 
Fixed JS sort comparator to be consistent between JS and PHP
 2014-09-16 17:29:03 +02:00
Nicolas Stamm
a2a1f5da6a DragnDrop Upload text style 
The 8px margin was uggly.
 2014-09-16 16:51:48 +02:00
Lukas Reschke
4669ea3835 Merge pull request #10680 from helmutschneider/aws-2.6.15 
Update AWS sdk to 2.6.15
 2014-09-16 16:34:16 +02:00
Thomas Müller
7e2bff8545 adding unit test to truncate the table 2014-09-16 16:17:25 +02:00
Vincent Petry
05cf940983 Tentative fix for legacy file actions unit test side effect 
Sometimes the JS unit test with legacy file actions fail.

This fix runs the legacy file actions tests on a dummy instead of the
real one.
 2014-09-16 15:38:44 +02:00
Clark Tomlinson
140c89f1c3 Adding link to ellipsis and fixing styling 2014-09-16 09:18:01 -04:00
tobiasKaminsky
e62d5b7e55 Route for thumbnail generation 
Thumbnail generation

Removed Log

Added requested changes

Added requested changes.

- Fix code style
- Add exception if file does not exist
- Switch route styling

Replaces https://github.com/owncloud/core/pull/10805

Fix codestyle

Fix codestyle

Migrate to appframework

Fix typo
 2014-09-16 15:00:58 +02:00
Lukas Reschke
ba5d3fb96b Merge pull request #11081 from owncloud/trash_fix_expire 
also expire file if timestamp = limit, happens if trashbin_retention_obl...
 2014-09-16 13:58:12 +02:00
Morris Jobke
61b040cbe8 Merge pull request #10663 from owncloud/files_trashbin_original_path 
Show original path information in trashbin and for shares
 2014-09-16 12:49:17 +02:00
Jenkins for ownCloud
1e6ac31bde [tx-robot] updated from transifex 2014-09-16 01:54:33 -04:00
Lukas Reschke
627252fe81 Merge pull request #11060 from owncloud/rmobslang 
remove obsolete language files
 2014-09-15 17:31:10 +02:00
Bjoern Schiessle
f23116ce50 also expire file if timestamp = limit, happens if trashbin_retention_obligation is set to zero 2014-09-15 13:00:04 +02:00
Andreas Fischer
31898aa635 Merge pull request #11021 from owncloud/do-not-double-decode 
Do not double decode values

* owncloud/do-not-double-decode:
  Do not double decode values
 2014-09-15 07:58:45 +02:00
Jenkins for ownCloud
8d647fa267 [tx-robot] updated from transifex 2014-09-15 01:54:26 -04:00
Lukas Reschke
90e91a9d10 Merge pull request #11050 from owncloud/enc-flockfix 
Remove passing by reference to allow for proper GC
 2014-09-15 00:31:10 +02:00
Jenkins for ownCloud
d8c7a52979 [tx-robot] updated from transifex 2014-09-14 01:54:35 -04:00
Volkan Gezer
5d1fa60e0d remove obsolete language files 2014-09-13 15:29:11 +02:00
Jenkins for ownCloud
518ed10c77 [tx-robot] updated from transifex 2014-09-13 05:17:34 -04:00
Vincent Petry
da9f9ae9b3 Remove passing by reference to allow for proper GC 
The garbage collector in PHP 5.3.10 does not properly release the file
handle when calling fclose() due to the fact that it is passed by
reference.
This has the side-effect of preventing file locks to be released as well
when the files_locking app is enabled.

This fix removes the useless passing by reference and now the file
handle and file lock are freed properly.
 2014-09-12 19:51:47 +02:00
Jenkins for ownCloud
d6834b6389 [tx-robot] updated from transifex 2014-09-12 03:28:56 -04:00
Robin McCorkell
99d41bec5d Show original path information in trashbin and sharing views 
Path will only be shown if in subdirectory, not in root.
 2014-09-11 15:45:42 +01:00
Lukas Reschke
99e9e762d1 Do not double decode values 
Fixes https://github.com/owncloud/core/issues/11012
 2014-09-11 15:34:57 +02:00
Thomas Müller
e6af67d5ea Merge pull request #9698 from owncloud/fix-9666 
Load apps in tests, fixes #9666
 2014-09-11 08:05:00 +02:00
Jenkins for ownCloud
0dcd8079dc [tx-robot] updated from transifex 2014-09-11 01:54:41 -04:00
Robin McCorkell
08e38a1072 Fix mkdir error in mountconfig.php 2014-09-10 17:28:25 +02:00
Robin McCorkell
b754a8261a Load apps in test situations 2014-09-10 17:28:25 +02:00
Jenkins for ownCloud
c119a9fd32 [tx-robot] updated from transifex 2014-09-10 01:54:54 -04:00
Lukas Reschke
c3d90b96c8 Merge pull request #10922 from owncloud/explicit-scan-transactions 
Use bigger transactions when doing explicit file system scans
 2014-09-09 23:32:32 +02:00
Vincent Petry
412da87e65 Move select2 from files_external to core 2014-09-09 18:03:05 +02:00
Jenkins for ownCloud
317e6d03b4 [tx-robot] updated from transifex 2014-09-09 01:55:47 -04:00
Lukas Reschke
70abce0482 Merge pull request #10739 from owncloud/eventsource-public 
Add EventSource to the public API
 2014-09-08 18:46:27 +02:00
Lukas Reschke
0ec9c2ccf8 Merge pull request #10885 from owncloud/swift-hasupdated 
Fix hasUpdated for folders in openstack swift
 2014-09-08 18:19:59 +02:00
Lukas Reschke
c79c894dbb Merge pull request #10755 from owncloud/shorter_sharing_links 
Shorter sharing links
 2014-09-08 17:26:20 +02:00
Lukas Reschke
2d847934ed Merge pull request #10938 from owncloud/useSecureMimetype 
Use secure mimetype for content delivery
 2014-09-08 17:13:54 +02:00
Lukas Reschke
bca57b4b28 Merge pull request #10890 from owncloud/fix-10888 
if only one attribute is requested, the returned array has 0 as key inst...
 2014-09-08 16:39:48 +02:00
Lukas Reschke
312ed18d15 Use secure mimetype for content delivery 
Adds some hardening against potential CSP bypassed.
 2014-09-08 15:57:39 +02:00
Vincent Petry
bd63f475bc Merge pull request #10891 from owncloud/files-moveoperationcatchexception 
Catch exceptions when moving files
 2014-09-08 15:09:02 +02:00
Robin Appelman
644755df66 Use bigger transactions when doing explicit file system scans 2014-09-08 14:15:41 +02:00
Jenkins for ownCloud
9fc45016f9 [tx-robot] updated from transifex 2014-09-07 01:54:42 -04:00
Jenkins for ownCloud
6ca2ba6fde [tx-robot] updated from transifex 2014-09-06 01:55:03 -04:00
Clark Tomlinson
50993c1a05 Merge pull request #10860 from owncloud/scrolltofix 
Scroll to file on search or add
 2014-09-05 10:35:59 -04:00
Vincent Petry
e43c9b84c4 Catch exceptions when moving files 
When moving files on storages that don't expose permissions, the storage
itself might throw an exception when the permission is denied.

This fix ensures that exceptions are caught and forwarded to the client
instead of just hanging.
 2014-09-05 14:54:06 +02:00
Arthur Schiwon
3c9668f605 if only one attribute is requested, the returned array has 0 as key instead of attribute name. fixes #10888 2014-09-05 14:05:37 +02:00
Robin Appelman
a1f4a0601b Fix hasUpdated for folders in swift backend 2014-09-05 13:23:10 +02:00
Robin Appelman
3d7aff84e5 Fix configuration of rackspace 2014-09-05 13:22:35 +02:00
Vincent Petry
5913a694de Merge pull request #10870 from owncloud/dnd-droponreadonlyfolderfix 
Added permission check for drag and drop
 2014-09-05 12:20:48 +02:00
Jenkins for ownCloud
0736a6695e [tx-robot] updated from transifex 2014-09-05 01:54:39 -04:00
Vincent Petry
f1bfe35cda Added permission check for drag and drop 
When dropping files onto a read-only folder, a notification
is now shown instead of attempting to upload.

This for both the drag for upload and drag from inside the file list
cases.
 2014-09-04 20:18:24 +02:00
kondou
2a4c51389c Use a route instead of s.php and convert tokens asap 2014-09-04 15:23:55 +02:00
Robin Appelman
fa3393674c Better phpdoc and method naming 2014-09-04 13:26:51 +02:00
Vincent Petry
6ca9e27438 Scroll to new file/folder after adding 
When creating a new file from the menu, the list now scrolls to that
file.
 2014-09-04 12:34:17 +02:00
Vincent Petry
9ae000676c Fixed scrollto for search results 
Now passing the "scrollto" URL argument to the file list class which
will also automatically scroll and highlight the matching element.

This code is triggered by the search box when in a different folder and
also by the activity app.
 2014-09-04 12:20:11 +02:00
Jenkins for ownCloud
a8861c70c8 [tx-robot] updated from transifex 2014-09-04 01:55:22 -04:00
pdessauw
63dff87953 Merge pull request #9195 from owncloud/fix-733 
Scroll to uploaded file in file list
 2014-09-03 15:07:22 -04:00
Clark Tomlinson
27de0e5621 Hiding add to your own cloud if server2server sharing is not enabled 2014-09-03 10:04:46 -04:00
pdessauw
0d078e48ce Highlight every uploaded files and scroll down to the last one 2014-09-03 09:59:01 -04:00
Robin Appelman
65608d7c92 Use the public api to get event sources 2014-09-03 13:36:15 +02:00
Johan Björk
d2979da864 Fix failing AmazonS3::touch on updated aws sdk 2014-09-03 12:09:12 +02:00
Johan Björk
dadb1fad2a Update AWS sdk to 2.6.15 2014-09-03 12:09:06 +02:00
Jenkins for ownCloud
8787162ec9 [tx-robot] updated from transifex 2014-09-03 01:54:34 -04:00
Robin Appelman
724ff6264a Remove unneeded file initialization in encryption, already handled in a hook 2014-09-02 16:15:42 +02:00
Jenkins for ownCloud
689bbbe937 [tx-robot] updated from transifex 2014-09-02 01:56:07 -04:00
Jenkins for ownCloud
e6e04bde4f [tx-robot] updated from transifex 2014-09-01 01:59:19 -04:00
Lukas Reschke
8009df0b60 Merge pull request #10420 from owncloud/external-share-self-signed 
Make external shares work with imported self signed certificates
 2014-08-31 15:50:30 +02:00
Robin Appelman
2fcedcc503 fix test 2014-08-31 10:47:50 +02:00
Robin Appelman
c1b11571ea Move certificate management interface from files_external to core 2014-08-31 10:47:50 +02:00
Robin Appelman
298011bf29 fix indention 2014-08-31 10:45:11 +02:00
Robin Appelman
dcc4f96d3e Verify names of certificates 2014-08-31 10:45:11 +02:00
Robin Appelman
c2ebc192a6 Make external shares work with imported self-signed certificates 2014-08-31 10:45:11 +02:00
Robin Appelman
ecdbf00628 Move certificate management code to core 2014-08-31 10:45:10 +02:00
Robin Appelman
d0266c0bf8 Use public api for getting l10n 2014-08-31 10:08:22 +02:00
Jenkins for ownCloud
23137f4798 [tx-robot] updated from transifex 2014-08-31 01:56:20 -04:00
Robin McCorkell
a8dc4368c0 Merge pull request #10428 from owncloud/files_external_better_config 
Improve external storage configuration UI
 2014-08-30 15:11:39 +01:00
Robin McCorkell
0e8a973579 Improve UI of external storage configuration 
* Highlight fields that need to be filled
 * Remove (required) and (optional) strings where possible
 * Focus first configuration field when creating new external storage
 * Add ability to force external storage re-check
 * Various jQuery improvements
 * Prevent wrapping of checkboxes in configuration
 2014-08-30 09:02:37 +01:00
Jenkins for ownCloud
53f3b7ab52 [tx-robot] updated from transifex 2014-08-30 01:57:04 -04:00
Andreas Fischer
7458e21f2c Use Doctrine Platform to generate SQL query for table truncation. 2014-08-29 20:53:51 +02:00
Morris Jobke
033b0361ed Merge pull request #9214 from owncloud/wizard_email_detection 
LDAP: Wizard email attribute detection
 2014-08-29 12:58:51 +02:00
Thomas Müller
2b63c375a4 Merge pull request #10719 from owncloud/files-external-personal-undefined 
Prevent undefined index error loading external storages
 2014-08-29 11:59:34 +02:00
Arthur Schiwon
aa0ddf21b5 adjust static method vars as well 2014-08-29 11:14:36 +02:00
Arthur Schiwon
371cab367d trigger email detection by Wizard upon any user filter filter change. before it happenend only upon user automatic list filter creation, but not on manual editing 2014-08-29 11:14:36 +02:00
Arthur Schiwon
34761dabb1 write log message, if original value was changed 2014-08-29 11:14:36 +02:00
Arthur Schiwon
f47a4a8c15 add unit test for mail detection 2014-08-29 11:14:35 +02:00
Arthur Schiwon
441c600c90 remove Access as hard dependency, inject it instead 2014-08-29 11:14:16 +02:00
Arthur Schiwon
baa49cd58a Wizad: email attribute detection 2014-08-29 11:14:16 +02:00
Jörn Friedrich Dreyer
f551917a3c kill OC::$session 
maintain deprecated \OC::$session when getting or setting the session via the server container or UserSession

restore order os OC::$session and OC::$CLI

remove unneded initialization of dummy session

write back session when $useCustomSession is true

log warning when deprecated app is used
 2014-08-29 10:22:21 +02:00
Robin McCorkell
bffccdbea7 Add missing 'personal' mount configuration option 2014-08-29 09:08:46 +01:00
Jenkins for ownCloud
359590d576 [tx-robot] updated from transifex 2014-08-29 01:56:59 -04:00
Clark Tomlinson
54eb2f42df Merge pull request #10647 from owncloud/implementing_momentjs 
Implementing momentjs
 2014-08-28 11:47:37 -04:00
Vincent Petry
f4e6cd5f3e Merge pull request #10658 from owncloud/sftp_prevent_error 
Prevent errors on broken SFTP config
 2014-08-28 17:09:36 +02:00
Clark Tomlinson
92685acf60 Implementing moment.js 
Updating Usages

Removing unused method

Adding JS Doc
 2014-08-28 09:28:45 -04:00
blizzz
6fa609325c Merge pull request #8507 from owncloud/ajaxify_user_list_for_files_external 
Ajaxify user list for files external
 2014-08-28 13:39:21 +02:00
Arthur Schiwon
1c0cc6c7bc fix wizard test, adjust to changed parameters of the tested method, introduced by 9caa354cfc 2014-08-28 11:53:40 +02:00
Arthur Schiwon
dbd51d15e1 Port of #8623 
set result entry identifier earlier, i.e. before a continue for the same level can happen. otherwise  will always get the same value and we end up in an infinite loop

add unit test to make sure the infinite loop never comes back

Conflicts:
	apps/user_ldap/tests/wizard.php
 2014-08-28 11:52:33 +02:00
Jenkins for ownCloud
1b342a70d6 [tx-robot] updated from transifex 2014-08-28 01:56:36 -04:00
Robin McCorkell
87167d3141 Prevent errors on broken SFTP config 2014-08-27 09:02:14 +01:00
Jenkins for ownCloud
2740908a5b [tx-robot] updated from transifex 2014-08-27 01:54:40 -04:00
Jenkins for ownCloud
c733842a9a [tx-robot] updated from transifex 2014-08-26 01:56:33 -04:00
Clark Tomlinson
58ab105515 Merge pull request #10421 from owncloud/share-external-delete 
Remove no longer existing files from the cache when scanning external storage
 2014-08-25 11:28:50 -04:00
Vincent Petry
5e2f627d3d Merge pull request #10108 from owncloud/files_external-allowed-backend 
Only load personal external storages for allowed backends
 2014-08-25 17:07:35 +02:00
Lukas Reschke
f33312f767 Use AppFramework instead of custom controller 2014-08-25 11:50:19 +02:00
Jörn Friedrich Dreyer
6202ef3258 use displayname lookup route in files_external settings 2014-08-25 11:50:19 +02:00
Jörn Friedrich Dreyer
e09e11b93e no need to load user display names 2014-08-25 11:50:19 +02:00
Jörn Friedrich Dreyer
393d136faf fix deletion of shares 2014-08-25 11:50:19 +02:00
Jörn Friedrich Dreyer
308e8d6379 replace chosen with select2 to provide ajaxified user and group selection for files_external, fixes #7499 
remove minified select2 js

show avatars for users, simpler results

remove unneeded users and groups from settings template

fix css, escape user and group names
 2014-08-25 11:50:19 +02:00
Jörn Friedrich Dreyer
bff39f796e add select2 to app specific thirdparty 2014-08-25 11:49:23 +02:00
Vincent Petry
8ab1c84161 Merge pull request #10591 from owncloud/routes_for_files_external 
explicit routes for files_external
 2014-08-25 11:45:41 +02:00
Jenkins for ownCloud
adca48aa93 [tx-robot] updated from transifex 2014-08-25 01:56:07 -04:00
Jenkins for ownCloud
70db496b58 [tx-robot] updated from transifex 2014-08-24 01:56:10 -04:00
Jenkins for ownCloud
047ec64ac0 [tx-robot] updated from transifex 2014-08-23 01:57:00 -04:00
Jörn Friedrich Dreyer
ffe54e260a explicit routes for files_external 2014-08-22 11:51:39 +02:00
Jenkins for ownCloud
8c94153d3e [tx-robot] updated from transifex 2014-08-22 01:56:25 -04:00
blizzz
52d5429768 Merge pull request #10522 from owncloud/removeLoadAppScript 
Remove loadAppScriptFile
 2014-08-21 19:59:31 +02:00
Morris Jobke
0cb189353f Merge pull request #10548 from owncloud/encryption-app-description 
Better description to prevent people from misunderstanding the use case of encryption app
 2014-08-21 13:01:18 +02:00
Bernhard Posselt
ba8eed0788 Better description to prevent people from misunderstanding the use case 2014-08-21 12:05:56 +02:00
Jenkins for ownCloud
952fac8493 [tx-robot] updated from transifex 2014-08-21 01:56:31 -04:00
Clark Tomlinson
61f63718ce Merge pull request #10562 from Volker-E/master 
fixing #10561 & HTML structure
 2014-08-20 17:27:25 -04:00
Lukas Reschke
92c80dd946 Merge pull request #10518 from owncloud/fix_storage_const_autoload 
Fix storage const autoload
 2014-08-20 23:23:42 +02:00
Volker E.
98d0d48b54 fix HTML structure by rmv. obsolete input end tag 2014-08-20 22:36:58 +02:00
Jörn Friedrich Dreyer
6c593c6adf Merge pull request #10423 from owncloud/urlencode_s3_copyobject_copysource 
urlencode s3 copyObject() copysource
 2014-08-20 15:48:51 +02:00
Jenkins for ownCloud
ea8c0bce08 [tx-robot] updated from transifex 2014-08-20 01:56:58 -04:00
Clark Tomlinson
5ddea98df2 Merge pull request #10525 from owncloud/remove-download-message 
remove obsolete 'Download preparing' message for zip downloads, fix #3755
 2014-08-19 14:17:15 -04:00
Jan-Christoph Borchardt
e713e97df5 remove obsolete 'Download preparing' message for zip downloads, fix #3755 2014-08-19 16:44:28 +02:00
Jan-Christoph Borchardt
3d8031564e fix multiselect bar offset on shared page 2014-08-19 15:51:10 +02:00
Lukas Reschke
381340c9b2 Add routing to user_ldap 2014-08-19 15:26:15 +02:00
Lukas Reschke
b12af9ea7f Add routing to files_versions 2014-08-19 15:25:16 +02:00
Lukas Reschke
8524e61fcc Add routing to files_trashbin 2014-08-19 15:24:47 +02:00
Lukas Reschke
520ee969f2 Add routing to files_encryption 2014-08-19 15:23:45 +02:00
Lukas Reschke
ad202250a8 Add routing to files_sharing 2014-08-19 15:22:54 +02:00
Lukas Reschke
f9881abf25 Use proper routes for files 2014-08-19 15:19:18 +02:00
Morris Jobke
b3b3354809 move to public namespace 2014-08-19 14:05:08 +02:00
Stephan Peijnik
2df52e54d7 Fix STORAGE_* constants usage by moving those constants into \OC\Files\Filesystem. 
As constants not defined within a class cannot be automatically found by the
autoloader moving those constants into a class makes them accessible to
code which uses them.

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
 2014-08-19 13:55:35 +02:00
Björn Schießle
19610157d3 Merge pull request #10425 from owncloud/set_default_share_folder 
Set default share folder
 2014-08-19 10:21:21 +02:00
Björn Schießle
312ed53307 Merge pull request #10494 from owncloud/fix_upload_to_public_folder 
set incognitoMode to true during upload to a public folder
 2014-08-19 10:13:38 +02:00
Morris Jobke
df963b3ccf Merge pull request #10492 from owncloud/hidesharesectionswhendisabled 
Hide sharing sections in files app when sharing API is disabled
 2014-08-19 08:53:19 +02:00
Jenkins for ownCloud
77cfddff0f [tx-robot] updated from transifex 2014-08-19 01:57:09 -04:00
blizzz
8f7676c762 Merge pull request #10340 from owncloud/fix-9887 
better check whether string resembles a DN, fixes #9887
 2014-08-18 19:24:41 +02:00
Arthur Schiwon
97fd39e983 unify tests 2014-08-18 16:55:08 +02:00
Lukas Reschke
594078e22f Fix copyright 2014-08-18 16:52:48 +02:00
Bjoern Schiessle
193a0b1a17 fix broken unit tests 2014-08-18 16:52:48 +02:00
Bjoern Schiessle
c25915cde4 update unit tests with configurable share folder 2014-08-18 16:52:48 +02:00
Bjoern Schiessle
c9903f2e68 make share folder configurable 2014-08-18 16:52:48 +02:00
Bjoern Schiessle
043cd1d02b set incognitoMode to true, getUser should always return false during public upload 2014-08-18 16:39:25 +02:00
Vincent Petry
1de5ae8845 Hide sharing sections in files app when sharing API is disabled 2014-08-18 16:33:29 +02:00
Jenkins for ownCloud
4dd07f572c [tx-robot] updated from transifex 2014-08-18 01:56:30 -04:00
Lukas Reschke
69e0e23789 Merge pull request #10407 from owncloud/rm-obsolete-japanese 
remove obsolete japanese lang code
 2014-08-17 19:07:14 +02:00
Jenkins for ownCloud
b1415fc4fc [tx-robot] updated from transifex 2014-08-17 01:56:22 -04:00
Lukas Reschke
283b99a42d Merge pull request #10276 from owncloud/skip-webdavput 
skip WebdavTest of encryption
 2014-08-16 10:32:04 +02:00
Morris Jobke
5498186333 Merge pull request #10447 from owncloud/share-foldericonfix 
Fixed folder icon update routine when share owner exists
 2014-08-16 10:19:19 +02:00
Jenkins for ownCloud
c132dd6357 [tx-robot] updated from transifex 2014-08-16 01:56:44 -04:00
Lukas Reschke
8d112ff61f Merge pull request #10449 from owncloud/share-clientsidesortnoservercall 
Client side sort for sharing overview
 2014-08-15 21:25:30 +02:00
Volkan Gezer
3da69ed7d0 ssl capital 2014-08-15 20:41:40 +02:00
Vincent Petry
3a99f15af2 Client side sort for sharing overview 
Since the server doesn't support sorting, use client side sort directly
instead of calling reload() first.
 2014-08-15 16:52:41 +02:00
Vincent Petry
607ea636be Fixed folder icon update routine when share owner exists 
Whenever a folder has a "data-share-owner" attribute, the icon is now
properly updated to a shared folder icon.
 2014-08-15 16:19:50 +02:00
Bjoern Schiessle
5a2fef4309 login as user1 before performing a test 2014-08-15 15:48:44 +02:00
Jenkins for ownCloud
93f5e90c9f [tx-robot] updated from transifex 2014-08-15 01:56:14 -04:00
Jan-Christoph Borchardt
f6a6f8541a Merge pull request #10374 from ogasser/compare_upload_limit_against_biggest_file 
Compare upload limit against biggest file
 2014-08-14 23:24:18 +02:00
Jörn Friedrich Dreyer
240b952333 use S3Client::encodeKey(), fixes #8325 2014-08-14 21:46:50 +02:00
Robin Appelman
a645da3640 Merge pull request #10398 from owncloud/external-share-ssl-warn 
Give a better error message for external shares with self-signed ssl certificates
 2014-08-14 16:10:29 +02:00
Robin Appelman
bbe17f35a1 Remove no longer existing files from the cache when scanning external storage 2014-08-14 14:50:52 +02:00
Björn Schießle
27d94e9273 Merge pull request #10295 from owncloud/file_actions_error_handling 
file actions improved error handling
 2014-08-14 11:44:50 +02:00
Jenkins for ownCloud
67b7160e7b [tx-robot] updated from transifex 2014-08-14 01:55:35 -04:00
Thomas Müller
fc462c5edb Merge pull request #10396 from owncloud/kill-filesync 
Kill filesync.php in files/appinfo
 2014-08-13 23:56:59 +02:00
Volkan Gezer
d1f483c9ed remove obsolete japanese lang code 2014-08-13 22:35:08 +02:00
Robin Appelman
bba59bf815 Cast file id's to int so we can compare them properly 2014-08-13 19:18:34 +02:00
Robin Appelman
9509bc403a Give a better error message for external shares with self-signed ssl certificates 2014-08-13 16:46:04 +02:00
Morris Jobke
cad52dbce9 Kill filesync.php in files/appinfo 
* ref comment: https://github.com/owncloud/core/issues/10392#issuecomment-52050567
 2014-08-13 15:58:43 +02:00
Vincent Petry
f282a5cff0 Merge pull request #9754 from owncloud/enc_support_aes_256 
[encryption] support aes 256
 2014-08-13 12:34:21 +02:00
Jenkins for ownCloud
609a52ebe2 [tx-robot] updated from transifex 2014-08-13 01:54:44 -04:00
Morris Jobke
d4eaa74b76 fixes from git push force 2014-08-12 21:29:05 +02:00
Bjoern Schiessle
53c5a84eac add unit tests 2014-08-12 21:15:39 +02:00
Bjoern Schiessle
da1feafc78 fix detection of system wide mount points 2014-08-12 21:14:22 +02:00
Oliver Gasser
eb2669448d Compare upload limit against biggest file 
When uploading multiple files from the web interface, compare the PHP
upload limit against the largest file, not against the sum of all files.
 2014-08-12 19:46:04 +02:00
Arthur Schiwon
eb7d70fc39 adjust login test to code changes 2014-08-12 16:13:17 +02:00
Volkan Gezer
e18b0fca47 Merge pull request #10357 from owncloud/l10n-alert-fix 
Fix alert text
 2014-08-12 13:56:33 +02:00
Jenkins for ownCloud
e4221869c2 [tx-robot] updated from transifex 2014-08-12 01:56:16 -04:00
Volkan Gezer
f2a775acb8 Fix alert text 2014-08-12 01:13:30 +02:00
Volkan Gezer
4dd9414f2c Transifex suggestion by mnestis 2014-08-11 21:31:15 +02:00
blizzz
c46b60e822 Merge pull request #9848 from dupondje/master 
Fix memberOf detection. Fixes: #9835
 2014-08-11 16:58:30 +02:00
Arthur Schiwon
fc6793f2ae better check whether string resembles a DN, fixes #9887 2014-08-11 16:40:41 +02:00
Jean-Louis Dupond
e46fc7a18a Fix initializing in #9848 2014-08-11 13:50:13 +02:00
Vincent Petry
173059f6d0 Fixed file list sorting 
Now using a natural sort algorithm that is more consistent between JS
and PHP (although not perfect in some corner cases)

- added OC.Util.naturalSortComparator that uses the same algo that was
  used for the user list
- changed user list and files list to use OC.Util.naturalSortComparator
- removed toLowerCase() and changed the comparator to use
  String.localeCompare()
- added unit tests
- added OC_NaturalSort that is used by OCP\Util::naturalSortCompare()
 2014-08-11 13:28:53 +02:00
Robin Appelman
86ae3bd1e7 Merge pull request #10303 from owncloud/sharing-breadcrumb-folder-name 
use OC_Util::basename
 2014-08-11 13:10:45 +02:00
Bjoern Schiessle
bc8e1ebf75 new unit test added 2014-08-11 12:03:08 +02:00
Bjoern Schiessle
5b75b15292 no error if we try to delete a file which no longer exists 2014-08-11 12:03:08 +02:00
Bjoern Schiessle
5bbecdb9ee no special action for folder named 'Shared' needed 2014-08-11 12:03:08 +02:00
Bjoern Schiessle
b3cff4beb6 add error message if user wants to rename a file which no longer exists 2014-08-11 12:03:08 +02:00
Jean-Louis Dupond
fc662917e7 Fix remarks in #9848 2014-08-11 09:15:56 +02:00
Jenkins for ownCloud
411f6c7704 [tx-robot] updated from transifex 2014-08-11 01:54:32 -04:00
Jenkins for ownCloud
c920ca32e8 [tx-robot] updated from transifex 2014-08-10 01:55:15 -04:00
Jenkins for ownCloud
f12f835485 [tx-robot] updated from transifex 2014-08-09 01:55:08 -04:00
Thomas Müller
7b6b99f55a Merge pull request #10290 from owncloud/check_quota_on_new_via_web 
check quota when trying to download a file via new -> web
 2014-08-08 17:32:50 +02:00
Jörn Friedrich Dreyer
c24957565c check quota when trying to download a file via new -> web 2014-08-08 14:35:33 +02:00
Bjoern Schiessle
008498dcad only show "share with others" and "share by link" navigation bar entries if user is allowed to share files 2014-08-08 12:12:24 +02:00
Morris Jobke
fa260b1649 Merge pull request #10280 from owncloud/lazyloading-earlier 
trigger lazy loading earlier, fix #9823
 2014-08-08 10:02:43 +02:00
Jenkins for ownCloud
d63b9e68c4 [tx-robot] updated from transifex 2014-08-08 01:55:11 -04:00
Jan-Christoph Borchardt
5ee0a57598 trigger lazy loading earlier, fix #9823 2014-08-08 00:27:31 +02:00
Morris Jobke
5e7b164560 Merge pull request #10248 from owncloud/enc_remove_keys_from_session 
add logout hook to remove keys from session
 2014-08-07 23:01:11 +02:00
Thomas Müller
461fdd854f Merge pull request #10261 from owncloud/fix-9829 
ldap_ prefix will be added in invokeLDAPMethod(), having it would lead t...
 2014-08-07 21:38:12 +02:00
Arthur Schiwon
2676e681e9 ldap_ prefix will be added in invokeLDAPMethod(), having it would lead to a unexisting function, fixes #9829 2014-08-07 17:15:36 +02:00
Bjoern Schiessle
0b3ddbed68 add logout hook to remove keys from session 2014-08-07 15:29:35 +02:00
Thomas Müller
6da9c09467 Merge pull request #10238 from owncloud/fix-public-download-with-encryption-master 
we can only close the session if encryption is not used
 2014-08-07 14:29:54 +02:00
Robin Appelman
f1091280de Merge pull request #10184 from owncloud/getbyid-node 
Fix Folder::getById
 2014-08-07 13:40:17 +02:00
Jan-Christoph Borchardt
9e6b65fabe Merge pull request #10223 from dannosaur/patch-1 
fix tiny thumbnails in public preview/share mode
 2014-08-07 12:36:57 +02:00
Thomas Müller
8b2fe69bb2 Merge pull request #10218 from owncloud/pzy-master 
Adding link tag to enable facebook timeline previews
 2014-08-07 12:14:30 +02:00
Thomas Müller
d2365afad6 Merge pull request #8915 from owncloud/MorrisJobke-travis 
Travis support for PRs and master, stable5 and stable6
 2014-08-07 11:33:13 +02:00
Thomas Müller
2fb8fcf6cb we can only close the session if encryption is not used 2014-08-07 11:07:11 +02:00
pzy
dc15633111 Update public.php 
added tag to make facebook load a preview picture

Update public.php

add check ifMimeSupported and put the thumbsize in a variable

generate preview for all supported mimes
 2014-08-07 10:44:07 +02:00
Jenkins for ownCloud
2821f7241b [tx-robot] updated from transifex 2014-08-07 01:55:10 -04:00
Dan Jones
4bbea118c2 fix tiny thumbnails in public preview/share mode 2014-08-06 19:32:21 +01:00
Robin Appelman
eb8683e6ee trim leading slash 2014-08-06 14:57:54 +02:00
Robin Appelman
12207ec0c7 Fix SharedCache::getPathById 2014-08-06 13:38:14 +02:00