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

3344 commits

Author SHA1 Message Date
Vincent Petry
254576e1f7
Do not encode slashes in "dir" URL param in files JS 2016-05-06 17:00:22 +02:00
Vincent Petry
112b703df0
Add anchor icon in sidebar to copy permalink 2016-05-06 16:46:59 +02:00
Vincent Petry
fdeafef6a0
Auto-add fileid in URL for currently displayed folder 2016-05-06 16:46:59 +02:00
Vincent Petry
093e9dd422
Add route to resolve fileid to files app URL 
The following routes will redirect to the files app and display the
matching folder. If the fileid is a file, it will scroll to it.
- http://localhost/owncloud/index.php/f/$fileid
- http://localhost/owncloud/index.php/files/?dir=somedir&fileid=$fileid
 2016-05-06 16:46:59 +02:00
Jenkins for ownCloud
6a95af0a4b [tx-robot] updated from transifex 2016-05-06 01:54:56 -04:00
Jenkins for ownCloud
48be0b781a [tx-robot] updated from transifex 2016-05-05 01:55:08 -04:00
Jenkins for ownCloud
1974ae8da7 [tx-robot] updated from transifex 2016-05-03 01:57:34 -04:00
Joas Schilling
7bfc617b03
Move activity manager to the namespace 2016-05-02 11:57:24 +02:00
Morris Jobke
6b12f96b14 Merge pull request #24341 from owncloud/scan-nfd-showwarning 
Add files:scan warning when NFD or incompatible encoding found
 2016-05-02 09:41:12 +02:00
Jenkins for ownCloud
a323111bd1 [tx-robot] updated from transifex 2016-05-02 02:08:49 -04:00
Jenkins for ownCloud
ff8980d59c [tx-robot] updated from transifex 2016-05-01 01:55:00 -04:00
Jenkins for ownCloud
023c8b0eac [tx-robot] updated from transifex 2016-04-30 01:55:54 -04:00
Vincent Petry
61203eee04
Add files:scan warning when NFD or incompatible encoding found 2016-04-29 16:18:59 +02:00
Jenkins for ownCloud
1f63e8df61 [tx-robot] updated from transifex 2016-04-29 01:54:56 -04:00
Jenkins for ownCloud
2b67f87ea8 [tx-robot] updated from transifex 2016-04-27 01:55:59 -04:00
Jenkins for ownCloud
14c3491977 [tx-robot] updated from transifex 2016-04-26 04:50:32 -04:00
Jenkins for ownCloud
4dc17e4863 [tx-robot] updated from transifex 2016-04-24 01:55:06 -04:00
Jenkins for ownCloud
afce892e9c [tx-robot] updated from transifex 2016-04-23 01:56:02 -04:00
Jenkins for ownCloud
ded84bf571 [tx-robot] updated from transifex 2016-04-22 01:54:58 -04:00
Christoph Wurst
df2a9d1733
OCA.Files.App is not available on public page 2016-04-21 14:23:18 +02:00
Jenkins for ownCloud
02ecd040e6 [tx-robot] updated from transifex 2016-04-21 01:58:49 -04:00
Thomas Müller
1ab27ddd4a Merge pull request #24081 from owncloud/migrate-deprecated-jquery-v1-functions 
migrate deprecated jQuery 1.x functions
 2016-04-20 20:38:38 +02:00
Thomas Müller
34b753baa0 Merge pull request #23952 from owncloud/hide-hidden-files 
Add option to hide hidden files
 2016-04-20 11:58:38 +02:00
Christoph Wurst
6c5696d3a8
filter hidden files on the web interface 
add checkbox to toggle show/hide hidden files

persist show hidden setting

fix settings menu layout

test ApiController::showHiddenFiles

don't show hidden files by default

Store config in Backbone model and inject it into FileList

Filter files only temporarily when rending the file list

Fix file rename validation
 2016-04-19 16:08:56 +02:00
Thomas Müller
5b2ef92eb2 Merge pull request #24004 from owncloud/dont-transfer-files-to-not-ready-user 
Introduce isReadyForUser and verify in file transfer ownership
 2016-04-19 15:56:47 +02:00
Christoph Wurst
05d203a989
replace $.parseJSON() by JSON.parse() 2016-04-19 15:06:42 +02:00
Christoph Wurst
37530f27f0
migrate jQuery.fn.unload() 2016-04-19 12:05:09 +02:00
Thomas Müller
50e20e531e
Introduce isReadyForUser and verify in file transfer ownership - fixes #23786 2016-04-15 15:07:40 +02:00
Thomas Müller
63a385d2b8 Merge pull request #23933 from owncloud/remember-file-sorting 
remember file sort order
 2016-04-15 14:06:21 +02:00
Christoph Wurst
576f7244e6 fix default value, update js/php tests 2016-04-13 14:25:23 +02:00
Christoph Wurst
a4683bcfa9 persist file sorting changes 2016-04-13 11:28:42 +02:00
Christoph Wurst
3f492dd826 load file sorting mode from the db 2016-04-13 11:28:42 +02:00
Christoph Wurst
4d02233faa restore selection after re-rendering file rows 2016-04-13 11:20:26 +02:00
Jenkins for ownCloud
a2da7614a0 [tx-robot] updated from transifex 2016-04-13 01:54:59 -04:00
Thomas Müller
35b8c0dd68 Merge pull request #22615 from owncloud/add-blacklisted-files-to-capabilities 
Add blacklisted_files to capabilities
 2016-04-11 10:10:10 +02:00
Jenkins for ownCloud
c6f65a3c79 [tx-robot] updated from transifex 2016-04-11 01:54:50 -04:00
Jenkins for ownCloud
e68c4b1d73 [tx-robot] updated from transifex 2016-04-09 12:28:39 -04:00
Joas Schilling
bba28590b7
Remove xxx from ownCloud we dont want to see that 🙈 2016-04-07 12:18:44 +02:00
Morris Jobke
22898fa107 Use proper shortcut methods in templates 2016-04-06 10:25:04 +02:00
Jenkins for ownCloud
fb8c8ef38b [tx-robot] updated from transifex 2016-04-06 01:56:24 -04:00
Joas Schilling
a4dfc7194d Add blacklisted_files to capabilities 2016-04-04 15:00:31 +02:00
Björn Schießle
53c1902706 Merge pull request #23743 from owncloud/issue-23686-files-transferownership-share-unmount 
Unmount the share before deleting it, so we don't try to use it later on
 2016-04-04 11:11:24 +02:00
Joas Schilling
ac330daef2 Inject the Mount Manager 2016-04-04 09:08:55 +02:00
Jenkins for ownCloud
deca08a683 [tx-robot] updated from transifex 2016-04-02 01:55:25 -04:00
Joas Schilling
3dac3a01c5 Unmount the share before deleting it, so we don't try to use it later on 2016-04-01 21:05:55 +02:00
Jan-Christoph Borchardt
a8a98d42cb improve emptycontent styles 2016-03-31 15:31:04 +02:00
Jenkins for ownCloud
82da373ee7 [tx-robot] updated from transifex 2016-03-31 01:55:24 -04:00
Jenkins for ownCloud
fc708c1e04 [tx-robot] updated from transifex 2016-03-30 01:57:41 -04:00
Jenkins for ownCloud
dd5bbc31f2 [tx-robot] updated from transifex 2016-03-29 01:55:16 -04:00
Jenkins for ownCloud
a092fe3bf8 [tx-robot] updated from transifex 2016-03-28 01:55:08 -04:00
Jenkins for ownCloud
1079554284 [tx-robot] updated from transifex 2016-03-27 01:55:45 -04:00
Jenkins for ownCloud
3e33b686b1 [tx-robot] updated from transifex 2016-03-26 01:55:15 -04:00
Jenkins for ownCloud
ae97b8e1c2 [tx-robot] updated from transifex 2016-03-25 01:55:47 -04:00
Thomas Müller
ab0db65b23 Merge pull request #23549 from owncloud/dav-sharetypes-remote 
Return remote shares in oc:share-types Webdav property
 2016-03-24 22:44:19 +01:00
Vincent Petry
9ee1f506f2 Return remote shares in oc:share-types Webdav property 
Fixes web UI to properly display the share status icon when an outgoing
remote share exists
 2016-03-24 12:16:57 +01:00
Erik Pellikka
50655cbf7f sidebar click modification 2016-03-24 11:57:40 +01:00
Jenkins for ownCloud
4b3af9dfe7 [tx-robot] updated from transifex 2016-03-24 01:57:28 -04:00
Thomas Müller
61c5717281 Merge pull request #23463 from owncloud/lets-consistently-use-no-referer 
Consistently use rel=noreferrer
 2016-03-23 09:14:54 +01:00
Lukas Reschke
f8ae1bb36e Disable pastezone for jquery.fileupload 
jquery.fileupload offers the [`pastezone`](https://github.com/blueimp/jQuery-File-Upload/wiki/Options#pastezone) functionality. This functionality is enabled by default and if somebody copy-pastes something into Chrome it will automatically trigger an upload of the content to any configured jquery.fileupload element embedded in the JS.

This implementation triggers some problems:

1. The pastezone is defined globally by default (🙈). So if there are multiple fileupload's on a page (such as in the personal settings) then stuff is going to be uploaded to all embedded uploads.
2. Our server code is not able to parse the data. For example for uploads in the files app we expect a file name which is not specified => Just an error is thrown. You can reproduce this by taking a file into your clipboard and in Chrome then pressing <kbd>CTRL + V</kbd>.
3. When copy-pasting some string from MS Office on the personal page a temporary avatar with said content is created.

Considering that this is anyways was never working at all and causes bugs I've set the `pastezone` to `null`. This mens that upload via copy and paste will be disabled.

Lesson learned: Third-party JS libraries can have some weird details.
 2016-03-22 20:28:57 +01:00
Thomas Müller
8852fdaee3 Merge pull request #22789 from owncloud/dav-sharesproperty 
Add webdav property for share info in PROPFIND response
 2016-03-21 11:15:00 +01:00
Jenkins for ownCloud
35bc315f59 [tx-robot] updated from transifex 2016-03-21 01:55:40 -04:00
Lukas Reschke
6ad957906e Consistently use rel=noreferrer 
When linking to external entities we should consistently use rel=noreferrer
 2016-03-20 15:27:20 +01:00
Jenkins for ownCloud
1f1d87d413 [tx-robot] updated from transifex 2016-03-20 01:55:09 -04:00
Jenkins for ownCloud
9c053ed465 [tx-robot] updated from transifex 2016-03-19 01:55:39 -04:00
Jenkins for ownCloud
a6c921267e [tx-robot] updated from transifex 2016-03-18 01:59:00 -04:00
Vincent Petry
950530b162 Display share status info in favorite list 
Returns the shareTypes share status info to the favorites file list.
 2016-03-17 15:35:21 +01:00
Pellaeon Lin
48430d4481 Handle case when breadcrumb and filelist item overlap 
and both receive a drop.

Build breadcrumb over and out callback in filelist.js and
pass them as options to utilize local selectors of filelist

Re-enable td elements after drop to bread crumb

Fix# drop handler still being called after enable,
it seems that waiting for a short time before re-enabling solves the
problem

* Add explanations for setTimeout re-enable td.filename drop handler
 2016-03-17 10:20:57 +01:00
Carla Schroder
0c9eaede41 Some typo corrections in occ command output 2016-03-16 16:14:25 -07:00
Jenkins for ownCloud
2c6617da60 [tx-robot] updated from transifex 2016-03-15 01:55:47 -04:00
Jenkins for ownCloud
e0998c27ff [tx-robot] updated from transifex 2016-03-14 01:56:12 -04:00
Jenkins for ownCloud
5862a067d9 [tx-robot] updated from transifex 2016-03-12 01:55:36 -05:00
Jenkins for ownCloud
1ed831564e [tx-robot] updated from transifex 2016-03-11 01:55:49 -05:00
Thomas Müller
fe3ffcbfc3 Merge pull request #23026 from stweil/master 
apps/files: Fix typos in comments (found and fixed by codespell)
 2016-03-09 16:43:05 +01:00
Stefan Weil
692f312513 apps/files: Fix typos in comments (found and fixed by codespell) 
This contribution is AGPL and MIT licensed.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2016-03-09 15:14:05 +01:00
Morris Jobke
52f02fe93e Remove disabled autocorrect for new file names 
* ref #22784
 2016-03-09 08:38:05 +01:00
Jenkins for ownCloud
afe3fdbf49 [tx-robot] updated from transifex 2016-03-09 01:55:42 -05:00
Jenkins for ownCloud
a8bafb9bf3 [tx-robot] updated from transifex 2016-03-08 01:55:39 -05:00
Thomas Müller
8ef760eb5d Merge pull request #22898 from owncloud/quota-allowuploadwhenfreespaceisunlimited 
Fix uploading to fed share when free space is unlimited
 2016-03-07 14:47:01 +01:00
Thomas Müller
46af7db3e3 Merge pull request #22785 from owncloud/trash-returnfalseon401 
Return false on 401 in file list + trash file list
 2016-03-07 14:41:31 +01:00
Vincent Petry
60d8046c35 Fix uploading when free space is unlimited 
A federated share can report unlimited quota as -3, so the
ajax/upload.php code needs to be adjusted to block uploads when the free
space is unlimited.
 2016-03-07 10:42:36 +01:00
Jenkins for ownCloud
c07b731689 [tx-robot] updated from transifex 2016-03-07 01:56:53 -05:00
Thomas Müller
6dcf70f244 Merge pull request #22807 from owncloud/remove-empty-translations 
ne, or_IN, uz and yo have been removed from transifex and will be rem…
 2016-03-06 19:59:57 +01:00
Jenkins for ownCloud
a98f5c03dc [tx-robot] updated from transifex 2016-03-05 01:56:08 -05:00
Morris Jobke
138219d74a Run cleanup of expired DB file locks to background job 
* fixes #22819

The old way fired a DELETE statement on each destruction of the
DBLockingProvider. Which could cause a lot of queries. It's enough
to run this every 5 minutes in a background job, which in the end
could result in file locks that exists 5 minutes longer - in the
worst case and for not properly released locks.

This makes the DB based locking a lot more performant and could
result in a similar performance to the Redis based locking provider.
 2016-03-04 15:52:23 +01:00
Vincent Petry
3a36163e91 Fix download spinner to work with CSS styles 
A recent change replaced img elements with CSS icons for file actions.
This fix adjusts the logic to work properly with CSS icons instead of
images.
 2016-03-04 10:48:08 +01:00
Thomas Müller
c590372aef Merge pull request #22784 from owncloud/files-newmenu-removebrowsercomplete 
Remove browser autocomplete in new file menu
 2016-03-03 11:54:48 +01:00
Thomas Müller
8cacfce83d ne, or_IN, uz and yo have been removed from transifex and will be removed from git here now as well 2016-03-03 11:29:57 +01:00
Vincent Petry
dbdf2173ac Return false on 401 in file list + trash file list 
This gives a chance to the global ajax error handler to do its work if
the session expired.
 2016-03-03 09:09:30 +01:00
Jenkins for ownCloud
8b76e8c57b [tx-robot] updated from transifex 2016-03-03 01:56:04 -05:00
Vincent Petry
5676216e56 Remove browser autocomplete in new file menu 2016-03-02 17:10:29 +01:00
Joas Schilling
8885cb1eb9 Increase all versions on master which is now 9.1 2016-03-02 08:53:42 +01:00
Lukas Reschke
c353d51810 Remove Scrutinizer Auto Fixer 2016-03-01 17:48:23 +01:00
Lukas Reschke
933f60e314 Update author information 
Probably nice for the people that contributed to 9.0 to see themselves in the AUTHORS file :)
 2016-03-01 17:25:15 +01:00
Jenkins for ownCloud
a06f59c580 [tx-robot] updated from transifex 2016-03-01 01:55:33 -05:00
Jenkins for ownCloud
5800585039 [tx-robot] updated from transifex 2016-02-29 01:55:04 -05:00
Jenkins for ownCloud
a39332832c [tx-robot] updated from transifex 2016-02-28 01:55:12 -05:00
Jenkins for ownCloud
f9826ec948 [tx-robot] updated from transifex 2016-02-27 01:56:08 -05:00
Thomas Müller
e9237dd83c Merge pull request #22671 from owncloud/issue-22670 
Move the tag filter at the end for now
 2016-02-26 10:48:55 +01:00
Thomas Müller
96f15a12a9 Merge pull request #22461 from owncloud/fix_6773 
Allow theming of actions
 2016-02-26 10:47:20 +01:00
Joas Schilling
4549b82553 Move the tag filter at the end for now 2016-02-26 10:15:07 +01:00
Jenkins for ownCloud
5718402277 [tx-robot] updated from transifex 2016-02-26 01:55:44 -05:00
Vincent Petry
867a8aca12 Fix favorite icon unit test for icon image 2016-02-25 23:01:09 +01:00
Vincent Petry
b634f1e2c7 Make more action icons themable + style fixes 
Action icons now appear properly in public link page.
More actions are now CSS icons.
 2016-02-25 23:01:07 +01:00
Roeland Jago Douma
c767030f07 Close class 2016-02-25 22:49:52 +01:00
Roeland Jago Douma
92cff0984d Make file actions use icon CSS classes 
This makes theming of file actions possible
 2016-02-25 22:49:52 +01:00
Jenkins for ownCloud
32f4bea0ae [tx-robot] updated from transifex 2016-02-25 01:58:06 -05:00
Vincent Petry
27544144ce Fix unit tests affected by side effects 
The notification tests were not restoring the clock properly, but
indirectly helped other tests pass.

Since now we're restoring the clock properly, the other tests were fixed
to still work.
 2016-02-22 17:25:32 +01:00
Vincent Petry
8ea80e114a Accumulate notifications instead of blinking 
This makes it possible to display multiple notifications.
If the options.type is set to "error", it will also add a close button.
 2016-02-22 17:25:32 +01:00
Thomas Müller
6c4cdddba8 Merge pull request #21610 from owncloud/quota-sharedfile 
Fix quota check for single shared files
 2016-02-18 14:25:32 +01:00
Vincent Petry
ceaefc2c54 Defer quota check in web UI when overwriting shared file 
When receiving a shared file, the quota for that file counts in the
owner's storage, not the current user's storage.

To make it possible to overwrite the file even when the current user
doesn't have enough space, the quota check is deferred for such files.
 2016-02-17 15:38:21 +01:00
Thomas Müller
7af7d18cfa Merge pull request #16783 from owncloud/handle-redirects-global 
Adding global error handler for ajax calls which run into redirection…
 2016-02-17 14:49:04 +01:00
Vincent Petry
d565290d16 Close file detail sidebar when selecting/unselecting files 
Interacting with the checkboxes, also "Select all" will automatically
close the sidebar now.
 2016-02-15 14:58:44 +01:00
Vincent Petry
b8b77709c0 Add handler for global ajax errors 2016-02-15 12:48:47 +01:00
Jenkins for ownCloud
be34cea970 [tx-robot] updated from transifex 2016-02-15 01:55:28 -05:00
Joas Schilling
0ebb205010 Chunk the queries to make sure they don't time out 2016-02-10 13:04:37 +01:00
Thomas Müller
81d4042af4 Adjust command description 2016-02-09 15:42:41 +01:00
Thomas Müller
10b9bf15f4 Set share owner and share initiator on upate as well 2016-02-09 15:41:06 +01:00
Thomas Müller
cbb7934fb3 Introduce console command to transfer ownerships of files - refs #19154 2016-02-09 15:41:06 +01:00
Thomas Müller
a6ade67dfb Merge pull request #22197 from owncloud/files-filterbysystemtags 
Add file list filter to filter by system tags
 2016-02-09 13:31:00 +01:00
Vincent Petry
847a2426b8 Fix unit tests for system tag filter section 2016-02-09 11:22:05 +01:00
Jenkins for ownCloud
e749a02e6b [tx-robot] updated from transifex 2016-02-09 01:55:36 -05:00
Vincent Petry
ae367c7e97 Fix elementToFile to also return path when defined 
Fixes issue when opening the share dialog for a file inside the favorite
list, and the file is from a subfolder
 2016-02-08 22:33:39 +01:00
Jenkins for ownCloud
feb0522cd0 [tx-robot] updated from transifex 2016-02-07 01:55:33 -05:00
Thomas Müller
5832178f59 Merge pull request #22139 from owncloud/comments-files-cleanup 
cleanup jobs for comments and comment read marks
 2016-02-06 13:26:00 +01:00
Thomas Müller
7141c70cd0 Merge pull request #20618 from owncloud/action-icon-size 
Fix image sizing for action icons in Edge
 2016-02-06 13:25:10 +01:00
Joas Schilling
065141f6f4 Move casting to IExpressionBuilder 2016-02-05 21:26:30 +01:00
Arthur Schiwon
9d2c433b24 fix pgsql 2016-02-05 15:36:21 +01:00
Arthur Schiwon
d537cae063 cleanup jobs for comments and comment read marks 2016-02-05 15:36:21 +01:00
Joas Schilling
d79b0886d0 Remove deprecated and unused standalone tag 2016-02-03 12:56:42 +01:00
Thomas Müller
8049b6e998 Merge pull request #22023 from owncloud/interruptable-commands 
Interruptable commands
 2016-02-02 14:07:07 +01:00
Thomas Müller
181b43da4e Merge pull request #22004 from Pookay/patch-1 
Fix the result at the bottom on IE
 2016-02-01 11:26:33 +01:00
Thomas Müller
0202acb926 Move signal handling to the base class to allow other commands to reuse this feature 2016-02-01 09:47:13 +01:00
Jenkins for ownCloud
c14464875f [tx-robot] updated from transifex 2016-01-30 01:55:56 -05:00
Thomas Müller
e8c449612d Merge pull request #21990 from owncloud/systemtags-cleanup-orphans 
Background cleanup job for system and user tag orphaned when file was deleted
 2016-01-29 14:16:50 +01:00
Vincent Petry
f0caf41232 Cleanup job for system and user tag orphaned when file was deleted 
Whenever a file was deleted (also from trash), the tag mapping is
pointing at a fileid that doesn't exist any more.

This cleanup job will delete such orphaned mapping entries.
 2016-01-29 11:51:47 +01:00
Pookay
9bfc31e666 Fix the result at the bottom on IE 
view issue #21898
 2016-01-29 10:07:15 +01:00
martin.mattel@diemattels.at
e05592d797 occ scan:files Adding more details in the base print out (II) 
Use proper method name

Fixed the interruption logic

Checks the availability of the pcntl_signal function

Fixed typo crtl-c --> ctrl-c

one overseen crtl-c typo
 2016-01-29 08:42:03 +01:00
Jenkins for ownCloud
1765e11f75 [tx-robot] updated from transifex 2016-01-29 01:55:53 -05:00
Thomas Müller
22010517f5 Merge pull request #21752 from owncloud/files-delete-fix 
Only check selection for delete permissions, not parent folder
 2016-01-26 16:13:10 +01:00
Thomas Müller
ef4fca22d1 Merge pull request #21844 from owncloud/drop-image-path 
Remove OC_Helper::imagePath and use the proper public interface
 2016-01-25 10:00:21 +01:00
Jenkins for ownCloud
a331979a67 [tx-robot] updated from transifex 2016-01-25 01:54:39 -05:00
Morris Jobke
75e6734ef4 Remove OC_Helper::imagePath and use the proper public interface 2016-01-24 18:04:20 +01:00
Jenkins for ownCloud
f92119e02f [tx-robot] updated from transifex 2016-01-23 01:55:35 -05:00
Jenkins for ownCloud
50b303f3ad [tx-robot] updated from transifex 2016-01-21 01:55:20 -05:00
Thomas Müller
c9dcf5ceba Merge pull request #21795 from owncloud/remove-unneeded-markup 
Remove unneeded markup for scan process - ref #20545
 2016-01-20 11:30:28 +01:00
Morris Jobke
61c104dcde Remove unneeded markup for scan process - ref #20545 2016-01-20 10:09:59 +01:00
Jenkins for ownCloud
f076bfac32 [tx-robot] updated from transifex 2016-01-20 01:54:54 -05:00
Morris Jobke
6e096936e5 update JS humanFileSize to use KB instead of kB 2016-01-19 10:51:57 +01:00
Robin McCorkell
df7db3685e Remove faulty directory permissions test 2016-01-15 20:46:39 +00:00
Robin McCorkell
a49aff2db7 Only check selection for delete permissions, not parent folder 2016-01-15 16:52:51 +00:00
Jenkins for ownCloud
cd840f01ae [tx-robot] updated from transifex 2016-01-15 01:54:57 -05:00
Jenkins for ownCloud
205fbcbfa3 [tx-robot] updated from transifex 2016-01-14 01:55:43 -05:00
Erik Pellikka
ace66057f2 Fixed issue #21452 
removed whitespace

removed whitespace

Changed it based on PVince81's suggestion
 2016-01-13 14:47:00 +01:00
Thomas Müller
c5a200c419 Merge pull request #21653 from owncloud/update-license-headers-2016 
Update license headers 2016
 2016-01-13 08:29:42 +01:00
Jenkins for ownCloud
eb90fa78ad [tx-robot] updated from transifex 2016-01-13 01:55:56 -05:00
Thomas Müller
682821c71e Happy new year! 2016-01-12 15:02:18 +01:00
Thomas Müller
05f9b40419 Merge pull request #21589 from owncloud/mobile-webDAV-select 
webDAV select bug fixed
 2016-01-11 11:31:33 +01:00
Thomas Müller
2ee39cf4cf Merge pull request #21573 from owncloud/fix_21535_21534 
Do not increase filecount in web on file update
 2016-01-11 11:22:09 +01:00
Julian Müller
0249911536 webDAV select bug fixed 2016-01-11 08:41:16 +01:00
Jenkins for ownCloud
77a8085f84 [tx-robot] updated from transifex 2016-01-11 01:55:34 -05:00
Jenkins for ownCloud
580deb09f8 [tx-robot] updated from transifex 2016-01-10 01:55:57 -05:00
Roeland Jago Douma
665d7b25b0 Add unit test for file update 2016-01-09 22:47:26 +01:00
Roeland Jago Douma
86735c6b5a Updating a file should not update the summary 2016-01-09 22:07:34 +01:00
Jenkins for ownCloud
72b34575df [tx-robot] updated from transifex 2016-01-09 01:55:50 -05:00
Jenkins for ownCloud
88c4cba1f5 [tx-robot] updated from transifex 2016-01-08 01:56:39 -05:00
Joas Schilling
ae285c0654 Remove deprecated shipped flag from info.xml which has no use anymore 2016-01-07 15:15:58 +01:00
Joas Schilling
40f786060e Add ownCloud min and max version for shipped apps 2016-01-07 15:11:49 +01:00
Jenkins for ownCloud
27dfa74d89 [tx-robot] updated from transifex 2016-01-07 01:55:48 -05:00
Jenkins for ownCloud
c77917f48c [tx-robot] updated from transifex 2016-01-06 01:55:16 -05:00
Morris Jobke
80e75aae49 Use color instead of transparency for proper tooltip appearance 
* fixes #21436
 2016-01-05 09:39:24 +01:00
Jenkins for ownCloud
d4034ffca0 [tx-robot] updated from transifex 2016-01-05 01:57:14 -05:00
Jenkins for ownCloud
157bb50a39 [tx-robot] updated from transifex 2016-01-04 01:55:05 -05:00
Jenkins for ownCloud
970495a067 [tx-robot] updated from transifex 2015-12-31 01:55:16 -05:00
Thomas Müller
edd051dc02 Merge pull request #21291 from owncloud/refactor-call-check 
Refactor OC_Util::callCheck
 2015-12-28 10:21:44 +01:00
Thomas Müller
7693c6d84a Merge pull request #21254 from owncloud/files-uploadcanceliconfix 
Correctly render uploadtext indicator only on folders
 2015-12-28 10:21:38 +01:00
Jenkins for ownCloud
89584716f8 [tx-robot] updated from transifex 2015-12-28 01:55:10 -05:00
Vincent Petry
ca14277fca Make a modifiable copy of the webdav properties in JS file list 
Plugins can extend _getWebdavProperties to add custom properties.
These should not be added to the original properties list, so now the
FileList makes a copy of the array.
 2015-12-22 11:17:24 +01:00
Morris Jobke
6f00729124 Refactor OC_Util::callCheck 2015-12-22 09:32:14 +01:00
Jenkins for ownCloud
d0cb4c9ab3 [tx-robot] updated from transifex 2015-12-19 01:55:14 -05:00
Vincent Petry
7ecb9696ba Use showBusyState for upload into folder 
This makes sure that the original icon will be restored properly in case
it's not the default folder icon
 2015-12-18 18:09:54 +01:00
Vincent Petry
d27826bac0 Correctly render uploadtext indicator only on folders 2015-12-18 18:09:46 +01:00
Roeland Jago Douma
b460bde7c6 Removed deprecated OC_Helper::mimeTypeIcon function 2015-12-18 14:00:20 +01:00
Roeland Jago Douma
4f20e3bac0 Removed deprecated OC_Helper::getSecureMimeType 2015-12-18 13:42:59 +01:00
Roeland Jago Douma
1f715289bf Removed deprecated function OC_User::deleteUser 
Replaced with proper OCP calls
 2015-12-17 16:18:40 +01:00
Roeland Jago Douma
835911bce5 Removed deprecated private OC_User::createUser 
All function calls are replaced with the recommended (which was already
the body of the function).
 2015-12-17 16:18:40 +01:00
Roeland Jago Douma
7e44ea5da0 Remove deprecated function OC_User::getManager 
Private deprecated function => removed
Replaced all instances with suggested replacement
 2015-12-17 16:18:34 +01:00
Thomas Müller
38f4407761 Merge pull request #21201 from mmattel/scanFiles_stat_output_II 
Statistics output for ./occ files:scan (rework)
 2015-12-17 14:43:55 +01:00
Jenkins for ownCloud
a7cd8103b5 [tx-robot] updated from transifex 2015-12-17 01:55:09 -05:00
martin.mattel@diemattels.at
b7e8258d99 Statistics output for ./occ files:scan 2015-12-15 19:05:05 +01:00
Vincent Petry
4d9e12b8bc Fix mount type root detection 
Since Webdav doesn't contain that information, we need to rely on the
parent folder's mount type to find out whether a child item is a
shared/external root or not.

Fixed the mount type detection logic and added unit test.

Also added a fix that ignores detection if no parent folder exists (ex:
shared file list, favorites, etc)
 2015-12-14 10:44:47 +01:00
Jenkins for ownCloud
74de12c698 [tx-robot] updated from transifex 2015-12-13 01:54:51 -05:00
Jenkins for ownCloud
f2ac1a80d8 [tx-robot] updated from transifex 2015-12-12 01:55:39 -05:00
Vincent Petry
baa5a69c55 Bring back file delete action text to be based on context 
For received shares, the delete action becomes "Unshare" and for
personal mounts it becomes "Disconnect storage".

This also makes it possible from now on to pass a function to a file
action's "displayName" attribute.
 2015-12-11 15:14:30 +01:00
Scrutinizer Auto-Fixer
ffc49a24f0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-12-10 16:43:37 +01:00
Jenkins for ownCloud
078ca149b5 [tx-robot] updated from transifex 2015-12-10 01:55:17 -05:00
Thomas Müller
bc744ff6de Merge pull request #21038 from owncloud/share-computesharepermissions-notstore 
Fix (re)share permission checks in a few code paths
 2015-12-09 10:04:56 +01:00
Jenkins for ownCloud
dda9525c4b [tx-robot] updated from transifex 2015-12-09 01:55:14 -05:00
Vincent Petry
e241d26316 Compute share permissions in the view 
The share permissions are now computed in the View/FileInfo instead of
storing them directly/permanently on the storage
 2015-12-08 13:04:22 +01:00
Thomas Müller
f3d49a89fe Merge pull request #11131 from owncloud/use-phpini-wrapper 
Replacing ini_get instances with inigetwrapper usages
 2015-12-07 10:20:59 +01:00
Jenkins for ownCloud
f0b1ba713d [tx-robot] updated from transifex 2015-12-05 01:55:14 -05:00