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

32775 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vincent Petry
12683b786d Merge pull request #24991 from owncloud/2fa-do-not-generate-token 
do not generate device token if 2FA is enable for user
 2016-06-08 10:13:04 +02:00
Vincent Petry
9b6125e49b Merge pull request #24992 from owncloud/fix_decrypt_message 
Fix Decrypt message via occ
 2016-06-08 10:12:47 +02:00
Vincent Petry
b7935dcebd Merge pull request #24998 from owncloud/issue-24994-allow-decrypting-user-0-only 
Allow to decrypt user '0' files only
 2016-06-08 10:12:28 +02:00
Vincent Petry
111b4d7051 Merge pull request #24999 from owncloud/initial-userloading-workaround 
decrease initial users to load to 50
 2016-06-08 10:12:09 +02:00
Vincent Petry
56016842d4 Merge pull request #25018 from owncloud/background-contrast 
darker background image for better font contrast
 2016-06-08 10:11:40 +02:00
Vincent Petry
87c150e2fb Merge pull request #25005 from owncloud/parent-storage-time-cast 
don't update storage mtime if we can't get the modified date
 2016-06-08 09:57:17 +02: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
Vincent Petry
1ee4d4d692 Merge pull request #23996 from owncloud/integrations-tests-qa-145 
Added tests about overwriting files and folders as recipient
 2016-06-08 09:55:23 +02:00
Vincent Petry
fa9c96ac4f
Fix GDrive file size when mime type doesn't match contents 
Uploading a txt file with XML contents makes GDrive return the XML mime
type.

This fix makes sure the logic that returns "SPACE_UNKNOWN" for the size
properly rely on the Google Docs mime types.
 2016-06-08 09:46:49 +02:00
Vincent Petry
4fd55c255f Merge pull request #25007 from owncloud/gdrive-fixuploadsamenameasfolder 
Fix GDrive upload file which name might match the one of a folder
 2016-06-08 09:46:15 +02:00
Joas Schilling
68a7aed27b
Adjust test to work with phpunit < 5.2 2016-06-08 09:24:00 +02:00
Christoph Wurst
4bff16e52d
darker background image for better font contrast 2016-06-08 08:34:08 +02:00
Roeland Jago Douma
4a3c67fdb4
Bring back sharedstorage hooks 2016-06-08 08:19:32 +02:00
Jenkins for ownCloud
bbd61cd98a [tx-robot] updated from transifex 2016-06-08 01:54:57 -04:00
Vincent Petry
fb087a0261
Use temporary htaccesstest.txt for data dir security check 2016-06-07 18:36:13 +02:00
Juan Pablo Villafáñez
a2b00582bc Fix test 2016-06-07 18:27:10 +02:00
Juan Pablo Villafáñez
110edd3d3c Rename variable 2016-06-07 18:25:17 +02:00
Joas Schilling
3e3b326c85
Allow to cancel 2FA after login 2016-06-07 18:17:29 +02:00
Lukas Reschke
1aa7db5642 Merge pull request #17 from nextcloud/ci 
Add drone.io support
 2016-06-07 18:04:42 +02:00
Morris Jobke
38451c85f1
skip failing tests 2016-06-07 17:54:40 +02:00
Morris Jobke
a508342924
Add drone.io support 2016-06-07 17:54:30 +02:00
Morris Jobke
b7c6485649 Merge pull request #13 from nextcloud/issue-template-nextcloud 
Replace ownCloud with Nextcloud in the issue template / Fixes #12
 2016-06-07 17:35:29 +02:00
Robin Appelman
2cf7ad8c55 make sure $data['mtime'] is always a timestamp 2016-06-07 17:09:24 +02:00
Juan Pablo Villafáñez
8526bbb347 Add support to know where the storage test comes from 2016-06-07 16:53:16 +02:00
Lukas Reschke
ad6e52360a Merge pull request #11 from nextcloud/license-script-update 
update license script: no more CLA and switch to AGPLv3 or later
 2016-06-07 16:40:31 +02:00
Vincent Petry
15fffb2b10
Fix GDrive upload file which name might match the one of a folder 
Whenever a file is uploaded to GDrive, there is a check for that file
with and without extension, due to Google Docs files having no
extension. This logic now only kicks in whenever the detected
extensionless file is really a Google Doc file, not a folder.

This makes it possible again to upload a file "test.txt" in a folder
that also has a folder called "test"
 2016-06-07 16:29:23 +02:00
Roeland Jago Douma
72c5535492
Extend unit tests 2016-06-07 15:09:26 +02:00
Roeland Jago Douma
2e2ece753f
Fix unit tests 2016-06-07 15:09:25 +02:00
Roeland Jago Douma
7c040c0bf9
Show the path relative to the requesting user 
A share can only be requested by 3 'types' of people

* owner
* initiator
* recipient

So we have to get the path as the current user. Since that is the only
path that has any meaning to the user.
 2016-06-07 15:09:19 +02:00
Robin Appelman
6822689e38 don't update storage mtime if we can't get the modified date 2016-06-07 15:04:24 +02:00
Robin Appelman
f119769c26 Better handling of forbidden files in dav 2016-06-07 14:01:55 +02:00
Robin Appelman
73547f29be Ignore forbidden files while scanning 2016-06-07 14:01:55 +02:00
Robin Appelman
7b1b723e5b dissalow symlinks in local storages that point outside the datadir 2016-06-07 14:01:53 +02:00
Joas Schilling
77db6d3dbd
Improve the UX for "not found" perma links 2016-06-07 13:53:16 +02:00
Vincent Petry
46fe2ddf2e Merge pull request #23845 from owncloud/smb-rename 
implement specific rename handling for SMB
 2016-06-07 12:32:51 +02:00
Jörn Friedrich Dreyer
2989584b45 decrease initial users to load to 50 
Prevents timeouts on the initial loading of users. proper fix will be in https://github.com/owncloud/core/pull/10994
Workaround for https://github.com/owncloud/core/issues/24734
 2016-06-07 11:40:04 +02:00
Sergio Bertolín
67c9e598ae Fixed reviews 2016-06-07 07:55:28 +00:00
Vincent Petry
bf917d7063 Merge pull request #24813 from owncloud/delete-ghost-files 
allow deleting "ghost files" trough the View and Node api
 2016-06-07 09:34:16 +02:00
Joas Schilling
d4ba982131
Allow to decrypt user '0' files only 2016-06-07 09:13:11 +02:00
Christoph Wurst
8f7a4aaa4d
do not generate device token if 2FA is enable for user 2016-06-07 09:09:51 +02:00
Jenkins for ownCloud
f28f6ad2df [tx-robot] updated from transifex 2016-06-07 01:55:08 -04:00
Jan-Christoph Borchardt
d7375de816 Merge pull request #9 from nextcloud/remove-links-to-documentation-in-menu 
Remove "Help" link from personal sidebar
 2016-06-06 23:02:03 +02:00
Lukas Reschke
d4431576dc Merge pull request #15 from nextcloud/add-build-badge 
Add CI badge
 2016-06-06 22:54:59 +02:00
Morris Jobke
39a91b8125 Update README.md 2016-06-06 22:29:16 +02:00
Marius
78eeac7440 Replace ownCloud with Nextcloud in the issue template / Fixes #12 
Fixes #12
 2016-06-06 20:49:08 +02:00
Bjoern Schiessle
a41c579f63
no more CLA and switch to AGPLv3 or later 2016-06-06 19:18:24 +02:00
Lukas Reschke
deef15a3c7
Remove "Help" link from personal sidebar 
At the moment we want to hide the help link from the personal sidebar as it contains the original ownCloud documentation.

Once we have our own documentation with our proper branding and so on we can reenable this.
 2016-06-06 18:40:15 +02:00
Lukas Reschke
d0ff1781be Merge pull request #8 from juliushaertl/fix-readme-projectname 
Change ownCloud to Nextcloud in the support section
 2016-06-06 17:54:36 +02:00
Julius Haertl
b961888791 Update README.md 2016-06-06 17:47:21 +02:00
William Bargent
6256bbdd20 Remove background from curved logo (#24980) 2016-06-06 17:06:28 +02:00