Commit Graph

33152 Commits

Author SHA1 Message Date
Marius Blüm 7d7eab6199 Merge pull request #85 from nextcloud/downstream-160614
Downstream 16-06-14
2016-06-14 11:40:59 +02:00
Roeland Jago Douma 28d070730d
Fix case with no user 2016-06-14 11:34:41 +02:00
Bjoern Schiessle e7cb21b7e9
allow to execute multiple tests in a directory at once 2016-06-14 11:32:45 +02:00
Björn Schießle da5bc70992 Merge pull request #89 from nextcloud/test-whether-+1-works-in-utf-8
Add 👍 in UTF-8
2016-06-14 11:23:15 +02:00
Lukas Reschke f17ffcfd56 Add 👍 in UTF-8
Let's see whether that works 🙈
2016-06-14 11:02:28 +02:00
Vincent Petry ce676c4eb6 Merge pull request #25076 from owncloud/mount-cache-invalid
handle invalid storages in LazyStorageMountInfo
2016-06-14 10:52:21 +02:00
Roeland Jago Douma ae3d0d96fe
Optimize isSharingDisabledForuser 2016-06-14 10:17:06 +02:00
Vincent Chan 864c3a8fbb fixes direct upload to folder 2016-06-14 09:58:03 +02:00
Thomas Müller d0a2515e2b Us an explicit version of sabre/dav to allow caching on the jenkins slaves - fixes #25087 (#25088) 2016-06-14 09:53:30 +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
Morris Jobke d0e4727ecd Merge pull request #61 from nextcloud/this-is-nextcloud
This is Nextcloud
2016-06-13 20:56:15 +02:00
Marius Blüm 7db4ac9142 update email, remove HackerONE 2016-06-13 20:22:04 +02:00
Lukas Reschke 87f2ad01f8 Merge pull request #77 from nextcloud/lgtm-noself
LGTM: no self approval
2016-06-13 20:13:45 +02:00
Marius Blüm 1080b9d53b LGTM: no self approval 2016-06-13 19:50:36 +02:00
Christoph Wurst 465807490d
create session token only for clients that support cookies 2016-06-13 19:44:05 +02:00
Thomas Müller 990ac34aaa Use proper namespaces - fixes #25078 (#25079) 2016-06-13 19:32:54 +02:00
Christoph Wurst 331d88bcab
create session token on all APIs 2016-06-13 15:38:34 +02:00
Vincent Petry 86d7241be2
Capped cache for cache info in UserMountCache 2016-06-13 15:08:12 +02:00
Roeland Jago Douma 64471b5d4a
Remove shares of the root folder
Fixes #23265

(A possibly costly) repair job to remove cyclic shares.
2016-06-13 15:07:41 +02:00
Jenkins for ownCloud 3840466f9a [tx-robot] updated from transifex 2016-06-13 12:21:11 +00:00
blizzz 5a038ff779 Merge pull request #71 from nextcloud/fix-app-hook
emit correct signal if a app gets disabled
2016-06-13 14:20:39 +02:00
Morris Jobke 0b2940ecb5 Merge pull request #33 from nextcloud/LukasReschke-patch-1
Add JS unit test execution
2016-06-13 14:18:38 +02:00
Morris Jobke c64c723027
Use proper PhantomJS library and run the tests as separate step
* add dependency for phantomjs
2016-06-13 14:04:25 +02:00
Bjoern Schiessle 5f2bc3a96d
emit correct signal if a app get's disabled 2016-06-13 13:36:23 +02:00
Robin Appelman 338cd4033a handle invalid storages in LazyStorageMountInfo 2016-06-13 13:31:45 +02:00
Christoph Wurst 5daa9a5417 fail hard if 2fa provider can not be loaded (#25061) 2016-06-13 12:46:45 +02:00
Stefan Weil f7c41fa4e6 Fix typo (found by codespell) (#25073)
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-06-13 08:23:33 +02:00
Lukas Reschke 01f8434a75 Merge pull request #57 from nextcloud/fdrop-template
smaller files drop fixes
2016-06-13 00:14:34 +02:00
Marius Blüm 07ea4f45e7 Update devmanual Link 2016-06-12 23:28:59 +02:00
Morris Jobke ff0dda9412 Merge pull request #58 from nextcloud/downstream-160611
Downstream 16-06-11
2016-06-12 14:17:31 +02:00
Lukas Reschke bd13a885a1 Merge pull request #63 from nextcloud/master-match-pattern-lgtm-bot
Match more patterns for LGTM bot
2016-06-12 12:05:01 +02:00
Lukas Reschke e61f0373d7 Match more patterns for LGTM bot
Also adds :shipit: and 👍
2016-06-12 11:59:42 +02:00
Marius Blüm 54961dda06 Remove mailinglist-stuff from CONTRIBUTING.md 2016-06-12 09:56:22 +02:00
Marius Blüm 2bd93cd362 Update CONTRIBUTING.md 2016-06-12 09:47:50 +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
Marius Blüm 75f37f550b Merge pull request #48 from nextcloud/design
Upload progress blue, notification white
2016-06-11 10:38:54 +02:00
William Bargent e90931c99b Upload progress nextcloud blue 2016-06-11 08:47:29 +01:00
William Bargent 25470e6992 Sets notification background to white 2016-06-11 08:15:56 +01: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
Marius 74580daa23 Merge pull request #45 from nextcloud/color-inversion
invert colors of favicons to match header and log in site, white on blue
2016-06-10 18:11:31 +02:00
Jan-Christoph Borchardt 6a89518e98 invert colors of favicons to match header and log in site, white on blue 2016-06-10 18:03:29 +02:00
Vincent Petry 52a0c939ab Merge pull request #24863 from owncloud/propagator-batching
Propagator batching for the file scanner
2016-06-10 17:45:52 +02:00
Vincent Petry 21de838b85 Merge pull request #24898 from owncloud/avatar_repair
Repair job to fix permissions for avatars
2016-06-10 17:02:11 +02:00
Vincent Petry 14fde6650c Merge pull request #25003 from owncloud/fix_ocs_path_response
Fix OCS Share API path response
2016-06-10 16:49:50 +02:00
Bjoern Schiessle e991b23d9d
log events from versions app 2016-06-10 15:39:04 +02:00
Bjoern Schiessle 86f12cc3e7
listen to trash bin and group manager hooks 2016-06-10 15:38:57 +02:00