mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
33,938 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

3372 Commits

Author SHA1 Message Date
Nextcloud bot 67278d12e1
[tx-robot] updated from transifex 2016-07-11 00:09:22 +00:00
Nextcloud bot 4aae157087
[tx-robot] updated from transifex 2016-07-10 00:09:23 +00:00
Nextcloud bot c108d816ac
[tx-robot] updated from transifex 2016-07-09 00:09:16 +00:00
Nextcloud bot a84250e0af [tx-robot] updated from transifex 2016-07-08 00:09:25 +00:00
Lukas Reschke 2a1a3957b6 Merge pull request #333 from nextcloud/sync-master 
Sync master
 2016-07-07 19:29:43 +02:00
Morris Jobke f5ed016170 Merge pull request #312 from nextcloud/files-other-lists-goto 
Add "goto" links for files in non-default file lists
 2016-07-07 15:48:38 +02:00
Morris Jobke ba16fd0d33 Merge branch 'master' into sync-master 2016-07-07 11:29:46 +02:00
Morris Jobke 5ace43f438 Revert "[tx-robot] updated from transifex" 
This reverts commit 3731b2a006.

Revert "[tx-robot] updated from transifex"

This reverts commit 94d91113f1.

Revert "[tx-robot] updated from transifex"

This reverts commit e7cc8bac1e.

Revert "[tx-robot] updated from transifex"

This reverts commit 59fc3ff45a.

Revert "[tx-robot] updated from transifex"

This reverts commit 6a89a63d2e.

Revert "[tx-robot] updated from transifex"

This reverts commit b0bad03234.
 2016-07-07 11:04:08 +02:00
Nextcloud bot 4a0efa38c0 [tx-robot] updated from transifex 2016-07-07 08:58:00 +00:00
Jenkins for ownCloud 38718bf89e [tx-robot] updated from transifex 2016-07-07 01:56:27 -04:00
Nextcloud bot da2363a1dd [tx-robot] updated from transifex 2016-07-06 13:28:06 +00:00
Vincent Petry cf6fe95cbf Merge pull request #25325 from owncloud/filelist-prependslash 
Filelist change dir auto-prepend slash
 2016-07-06 12:44:03 +02:00
Vincent Petry 1f9d728538 Ignore invalid paths in the JS file list (#25368) 2016-07-06 11:55:02 +02:00
Jenkins for ownCloud 6103df97cc [tx-robot] updated from transifex 2016-07-06 01:56:27 -04:00
Robin Appelman d623763aac Add "goto" links for files in non-default file lists 2016-07-05 22:22:55 +02:00
Morris Jobke dd337597b3 for text use max-height to trim whitespace 2016-07-04 17:38:26 +02:00
Morris Jobke 2e5e0c157d adjust padding of text preview 2016-07-04 15:38:16 +02:00
Robin Appelman a4d75a60a9 Add large sidebar previews for text files 2016-07-04 12:54:12 +02:00
Robin Appelman 860b7c36ec Factor out handling sidebar previews 2016-07-04 12:04:32 +02:00
Jenkins for ownCloud 9e0d8fcf41 [tx-robot] updated from transifex 2016-07-04 01:56:34 -04:00
Jenkins for ownCloud cea84cf7a8 [tx-robot] updated from transifex 2016-07-03 01:54:52 -04:00
Jenkins for ownCloud dea7b5be35 [tx-robot] updated from transifex 2016-07-02 01:54:53 -04:00
Björn Schießle 5b4cea4b36 Merge pull request #275 from nextcloud/master-sync-upstream 
[Master] Sync upstream
 2016-07-01 18:31:51 +02:00
Lukas Reschke 76c73d5ec3 Match on 405 2016-07-01 15:19:21 +02:00
Lukas Reschke 4ac9eaab03 Match for /../ 2016-07-01 15:01:48 +02:00
Lukas Reschke 5b65591d84 Do not allow directory traversal using "../" 
We should not allow directory traversals using "../" here.

To test access the following URL once with and then without this patch:

http://localhost/server/index.php/apps/files/?dir=../../This+Should+Not+Be+Here
 2016-07-01 13:36:05 +02:00
Lukas Reschke 179a355b2c Merge remote-tracking branch 'upstream/master' into master-sync-upstream 2016-07-01 11:36:35 +02:00
Vincent Petry 4acb06923d Filelist change dir auto-prepend slash 
Prepend a slash to directories in case it was missing since many places
assume that it's there.
 2016-07-01 11:10:37 +02:00
Vincent Petry 5cfbb9624f Prevent infinite loop in search auto-nextpage 
When loading the next page of search results, make sure that the loop
can end if there are no more elements in case the total doesn't match.

Also added a check to avoid recomputing the search results whenever the
setFilter() is called with the same value. This happens when navigating
away to another folder, the search field gets cleared automatically and
it calls FileList.setFilter('').
 2016-06-30 11:10:48 +02:00
Jenkins for ownCloud 2b0f053126 [tx-robot] updated from transifex 2016-06-29 05:52:18 -04:00
Morris Jobke b6397ef73a Merge pull request #236 from nextcloud/master-sync-upstream 
[Master] sync upstream
 2016-06-28 09:02:03 +02:00
Jenkins for ownCloud 894b7d93f6 [tx-robot] updated from transifex 2016-06-28 01:57:10 -04:00
Lukas Reschke 6670d37658 Merge remote-tracking branch 'upstream/master' into master-sync-upstream 2016-06-27 18:23:00 +02:00
Morris Jobke 5961d5aae4 Add app:check-code for already compatible apps 
* admin_audit, comments, federation
* removed not needed call to OC_Util::checkAdminUser() (is already
  done by the request handler before)
 2016-06-27 16:50:10 +02:00
Vincent Petry 1d4c61af47 Merge pull request #25237 from owncloud/search-filelistnextpageresults 
Prerender file list pages to include search results
 2016-06-27 13:46:25 +02:00
Lukas Reschke 7a9d60d87e
Merge remote-tracking branch 'upstream/master' into master-upstream-sync 2016-06-26 12:55:05 +02:00
Vincent Petry b4cf297758 Prerender file list pages to include search results 
When filtering the file list, if a result is on an unrendered page,
make sure to call _nextPage() to prerender the pages in order to
display all matching results.
 2016-06-24 13:55:14 +02:00
Vincent Petry 39b533d0d8
Hide search results after switching directory 
When clicking on a folder result in the search result list, the result
box for "results in another folder" must disappear.
 2016-06-24 11:32:14 +02:00
Vincent Petry bf3ee69d86
Fix search result link for file results outside default list 
When outside the "All files" list, the search result link must properly
redirect to the "All files" list.
 2016-06-24 11:31:29 +02:00
Jenkins for ownCloud 29068d3845 [tx-robot] updated from transifex 2016-06-24 01:56:13 -04:00
Vincent Chan 0552933770 changes emptycontent icon to drag-accept on file-drag 2016-06-23 11:25:03 +02:00
Jenkins for ownCloud b85bcccc09 [tx-robot] updated from transifex 2016-06-22 01:54:55 -04:00
Lukas Reschke 2b493e2f9d
Merge remote-tracking branch 'upstream/master' into master-sync-upstream 2016-06-21 11:18:22 +02:00
Jenkins for ownCloud bd13353c4d [tx-robot] updated from transifex 2016-06-20 01:54:50 -04:00
Jenkins for ownCloud cc532bb14a [tx-robot] updated from transifex 2016-06-17 02:00:01 -04:00
Morris Jobke 51b067d603
Fix failing JS unit tests 
* fixes #124
 2016-06-16 11:00:58 +02:00
Marius Blüm d9be370b86 Merge pull request #83 from nextcloud/file-drop-highlight 
File drop highlight
 2016-06-15 17:36:16 +02:00
Marius Blüm d38950998c Merge pull request #113 from nextcloud/fix-more-button 
fix padding of 3-dot button on mobile
 2016-06-15 17:32:04 +02:00
Jan-Christoph Borchardt 9f0f003fe9 fix padding of 3-dot button on mobile 2016-06-15 15:15:56 +02:00
Vincent Chan 10f8d643dc store icons in class 2016-06-15 14:42:39 +02:00
Vincent Chan 5315a479f3 fixes responsive/mobile view 2016-06-15 13:11:25 +02:00
Vincent Chan aecdcf737f dragging over folder will highlight folder only 2016-06-15 11:28:53 +02:00
Vincent Chan 6214420974 restrict dropZone to app-content div 2016-06-15 09:45:36 +02:00
Jenkins for ownCloud be4a29d75f [tx-robot] updated from transifex 2016-06-15 05:54:49 +00:00
Vincent Chan 203a07e7f3 change folder icon when dragging over a directory 2016-06-15 01:03:59 +02:00
Vincent Chan 937d21ed29 properly fix folder upload to use delegatedEvent 2016-06-14 11:51:03 +02:00
Vincent Chan 864c3a8fbb fixes direct upload to folder 2016-06-14 09:58:03 +02:00
Jenkins for ownCloud 5887afbb37 [tx-robot] updated from transifex 2016-06-14 08:02:15 +02:00
Arthur Schiwon ae02685e6f
Merge branch 'master' of https://github.com/owncloud/core into downstream-160614 2016-06-14 01:06:25 +02:00
Vincent Chan 433cea30c3 adds visual indication for file drag and drop 2016-06-13 23:00:56 +02:00
Vincent Chan 2abd663419 update jQuery File Upload Plugin (9.12.5) to support dragleave 2016-06-13 22:26:49 +02:00
Jenkins for ownCloud 3840466f9a [tx-robot] updated from transifex 2016-06-13 12:21:11 +00:00
Lukas Reschke 01f8434a75 Merge pull request #57 from nextcloud/fdrop-template 
smaller files drop fixes
 2016-06-13 00:14:34 +02:00
Arthur Schiwon 42c66efea5
Merge branch 'master' of https://github.com/owncloud/core into downstream-160611 2016-06-11 15:34:43 +02:00
Arthur Schiwon ca43c49709
smaller files drop fixes 
* fix infinite spinner on blacklisted files
* move HTML to template
* indentation
 2016-06-11 15:15:37 +02:00
Lukas Reschke 842cc2a788 Merge pull request #19 from nextcloud/files-drop 
add "hide file list" option
 2016-06-10 18:29:09 +02:00
Jenkins for ownCloud e8a66f8e7d [tx-robot] updated from transifex 2016-06-10 05:55:19 +00:00
Lukas Reschke 6e99b0f59d
Make uploading possible via select and cleanup CSS 2016-06-09 17:55:26 +02:00
Joas Schilling 6ec2d1244c
Adjust test to work with phpunit < 5.2 2016-06-09 14:00:02 +02:00
Jenkins for ownCloud 6aab7d7232
[tx-robot] updated from transifex 2016-06-09 14:00:02 +02:00
Joas Schilling a6134a6d2f
Improve the UX for "not found" perma links 2016-06-09 14:00:00 +02:00
Jenkins for ownCloud 355f50bd6c [tx-robot] updated from transifex 2016-06-09 06:16:41 +00:00
Vincent Petry 652b4961f2 Merge pull request #25001 from owncloud/issue-24939-better-ux-on-invalid-perma-link 
Improve the UX for "not found" perma links
 2016-06-08 09:56:24 +02:00
Joas Schilling 68a7aed27b
Adjust test to work with phpunit < 5.2 2016-06-08 09:24:00 +02:00
Jenkins for ownCloud bbd61cd98a [tx-robot] updated from transifex 2016-06-08 01:54:57 -04:00
Joas Schilling 77db6d3dbd
Improve the UX for "not found" perma links 2016-06-07 13:53:16 +02:00
Jenkins for ownCloud 63132483ca [tx-robot] updated from transifex 2016-06-03 02:19:30 -04:00
Jenkins for ownCloud f9f8fb7bf2 [tx-robot] updated from transifex 2016-06-02 01:55:16 -04:00
Vincent Petry 9a9c1b9439 Merge pull request #24822 from owncloud/fix-download-spinner 
fixes size of the download spinner
 2016-05-31 10:42:13 +02:00
Jenkins for ownCloud b2e524b936 [tx-robot] updated from transifex 2016-05-31 01:54:58 -04:00
Vincent Petry 76c0bc29fe Merge pull request #20150 from pellaeon/pr-droppable-hover-visual-cue 
Add visual cue when moving draggable item over droppable item,
 2016-05-30 16:03:36 +02:00
Vincent Chan 3538e90ba1
fixes size of the download spinner 2016-05-30 11:23:54 +02:00
Lukas Reschke aba539703c
Update license headers 2016-05-26 19:57:24 +02:00
Jenkins for ownCloud 567381e361 [tx-robot] updated from transifex 2016-05-26 01:56:23 -04:00
Jenkins for ownCloud f1f7511c61 [tx-robot] updated from transifex 2016-05-24 15:24:38 -04:00
Dmitry Popov 83aa28ed1d My fix for #24272, #23613, File not found when single file in a folder (#24800) 
* Fixed group share searching for members of
multiple group. Issue #11808.

* Fixed group share searching, continued.

Avoid searching for empty group list in getItemSharedWithUser().
Broke tests in previous commit, #12030.

* Simler check for group count.

* Fix for https://github.com/owncloud/core/issues/24783 , described there

* Now it's #24272, 24783 was a duplicate. Previous change was also not very good. Now we don't create ZIP with a single file inside.
 2016-05-24 14:09:05 +02:00
Vincent Petry f8bbbba306 Merge pull request #24682 from f4bsch/master 
dont update search onResize
 2016-05-24 11:47:47 +02:00
Vincent Petry adcf942901 Merge pull request #24750 from owncloud/lenz1111-share_download_range_requests_support 
Http Range requests support in downloads
 2016-05-23 21:01:26 +02:00
Jenkins for ownCloud 357d342467 [tx-robot] updated from transifex 2016-05-23 01:55:10 -04:00
Jenkins for ownCloud 88328000b1 [tx-robot] updated from transifex 2016-05-22 01:56:56 -04:00
Pellaeon Lin 72ac5dd8a1 Make entire file tr droppable, 
so that .canDrop will highlight the entire row when drag hover
 2016-05-21 12:54:29 +08:00
Pellaeon Lin d3ff3c589b Add visual cue when moving draggable item over droppable item, 
ie. breadcrumb and filenameTd
 2016-05-21 12:54:29 +08:00
Piotr Filiciak 9999e05660
Http Range requests support in downloads 
Http range requests support is required for video preview
 2016-05-20 18:16:44 +02:00
Vincent Petry 59a85a4c76 Merge pull request #22576 from owncloud/folder_scroll_fix 
Add scrolling when dragging files. Fixes #12329
 2016-05-20 16:19:01 +02:00
Vincent Petry 2ef751b1ec Merge pull request #24702 from owncloud/background-scan-occ 
add --unscanned option to files:scan to triger a background scan
 2016-05-20 09:29:37 +02:00
Jenkins for ownCloud 67162e636e [tx-robot] updated from transifex 2016-05-20 01:54:52 -04:00
Robin Appelman f313105dbd add "unscanned" option to files:scan to triger a background scan 2016-05-19 14:19:09 +02:00
Jenkins for ownCloud 7ca5b35379 [tx-robot] updated from transifex 2016-05-19 01:54:58 -04:00
Jenkins for ownCloud 765782445a [tx-robot] updated from transifex 2016-05-18 01:54:53 -04:00
Fabian 2a7d3dd831 dont update search onResize 
this.updateSearch() sets the current file list instance and clears the box. This is unnecessary and makes the search box unsuable on some mobile devices where a keyboard fade-in causes a onResize trigger, which would then clear and blur the box.
 2016-05-17 22:57:07 +02:00