upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-15 19:49:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 53
15707 commits 1031 branches 1221 tags 8.7 GiB
Commit graph

15707 commits

This branch
This branch
All branches
Author SHA1 Message Date
Arthur Schiwon
49e567a5cc LDAP: let proxy for multiple server access methods from Access 2014-02-27 16:18:03 +01:00
Jan-Christoph Borchardt
61a37331ce disable autocomplete for shared link password input, fix #7419 2014-02-26 22:21:36 +01:00
Thomas Müller
d265d290c3 Merge pull request #7426 from owncloud/stable6-fixmailnotificationtranslation 
[stable6] Backported incorrect translation texts for German
 2014-02-26 22:18:42 +01:00
Vincent Petry
cab94eb719 Fix German message for "Enter new" 2014-02-26 15:50:02 +01:00
Vincent Petry
c1cc4df26e Fixed German shared notification message 2014-02-26 15:49:44 +01:00
Bjoern Schiessle
b4f154f9b4 fix path in sharing results if it is a file in the Shared folder 2014-02-26 15:22:20 +01:00
Bjoern Schiessle
ac3f1d6f61 only add "received_from" if a share was found 2014-02-26 14:49:41 +01:00
Morris Jobke
d27f2929d2 Merge pull request #7402 from owncloud/stable6-ie9-navigation 
Stable6 IE9 navigation bar width
 2014-02-26 13:49:03 +01:00
Vincent Petry
6aee04bba4 Merge pull request #7397 from owncloud/stable6-scrollperformance 
Users list scrolling performance / improvements
 2014-02-26 13:19:27 +01:00
Thomas Müller
a88b253c78 introduce new theme function to allow full creation of documentation links: buildDocLinkToKey() 2014-02-26 12:52:49 +01:00
Jan-Christoph Borchardt
751c1b0418 manual backport of IE9 navigation bar pull request #6808, fix #7321 2014-02-26 09:19:02 +01:00
Vincent Petry
a0feffb2a7 Added loading spinner to users list on scroll 2014-02-25 19:37:33 +01:00
Vincent Petry
34d17e6168 Improve users list scrolling performance 
- fixed JS error when avatar mode is disabled
- added spinner at the bottom of the table
- scroll detection now happens earlier
- single/multiselect init is deferred so that the new rows are first appended
  into the list (more responsive) and initialized afterwards
- disabled users sorting after add (assuming they are always sorted on
  the server side)
 2014-02-25 19:37:23 +01:00
Owen Winkler
c30377392b Merge pull request #7394 from owncloud/backport-7344 
Allow apps to add/modify config js output via hook.
 2014-02-25 10:37:33 -05:00
ringmaster
0d2482a1a9 Allow apps to add/modify config js output via hook. 2014-02-25 09:16:38 -05:00
Vincent Petry
149814d95b Replace deleteAll call with unlink call 
The method deleteAll() doesn't officially exist on the Storage class as
it's not defined on the interface, which means it fails on the Quota
storage wrapper and might fail on some external storage classes.
Also, this here is the only use case for that one method.
 2014-02-25 15:01:38 +01:00
Frank Karlitschek
16e24dc4c5 Merge branch 'stable6' of https://github.com/owncloud/core into stable6 2014-02-25 13:56:30 +01:00
Frank Karlitschek
dc11b87a1d 6.0.2 RC1 2014-02-25 13:56:06 +01:00
Bjoern Schiessle
c8d34eaf9c add test case if a file gets moved out from the shared folder 2014-02-25 12:42:34 +01:00
Bjoern Schiessle
9183ade655 don't overwrite keys if rename was done by a stream copy 2014-02-25 12:36:06 +01:00
Vincent Petry
678afc4906 Merge pull request #7386 from owncloud/stable6-fixhostnamewithport 
Fix case where port is missing
 2014-02-25 12:32:41 +01:00
Vincent Petry
6d3b5b24fd Fix case where port is missing 2014-02-25 11:22:53 +01:00
icewind1991
4286eeb531 Merge pull request #7369 from owncloud/stable6-smbmissingfiles 
[stable6] Fixed missing files on SMB storage
 2014-02-24 13:57:57 +01:00
Vincent Petry
0187537a2e Fixed missing files on SMB storage 
Files with attribute "N" weren't parsed out of the file list returned by
smbclient. It seems that these files appear when created on a Linux SMB
mount directly and that have no executable bit.
 2014-02-24 09:22:02 +01:00
Vincent Petry
928947f1c3 Added extra checks for ext storage class 2014-02-22 08:13:11 +01:00
Lukas Reschke
fb1ebf13c6 Adjust version for stable6 2014-02-22 08:09:49 +01:00
Lukas Reschke
ed7e9be7cd Add overwritehost config on setup and upgrade 2014-02-22 07:59:39 +01:00
Bjoern Schiessle
e903c8b57b fix test so that it doesn't depend on the array order 2014-02-21 15:53:11 +01:00
Bjoern Schiessle
210832ddf1 fix usersPath and add unit tests 2014-02-21 15:53:03 +01:00
Vincent Petry
96ebefc597 Updated submodule 
Includes XML fixes
 2014-02-21 15:49:08 +01:00
Bjoern Schiessle
5348e2eb54 fix sharing unit tests 2014-02-21 14:44:09 +01:00
Bjoern Schiessle
f6e6f465f2 add unit test for \OC\URLGenerator::getAbsoluteURL to verify #6935 2014-02-21 13:49:11 +01:00
Thomas Müller
ce87f933a4 Merge pull request #7349 from owncloud/backport-7347 
Backport of #7347 to stable6
 2014-02-21 11:21:06 +01:00
Arthur Schiwon
a04af7854d LDAP: fix and extend tests 2014-02-21 10:15:09 +01:00
Arthur Schiwon
75c7fd2886 LDAP: improve compilation of filters 2014-02-21 10:15:00 +01:00
Lukas Reschke
92b4d52079 Fix "headers are already sent" introduced with #6519 
Backport of #7347
 2014-02-21 10:05:05 +01:00
Thomas Tanghus
91b4045791 Test if $url is already prefixed by '/' 2014-02-20 18:19:05 +01:00
Thomas Tanghus
0f87a0248f Add missing slash in URLGenerator::getAbsoluteURL(). Refs. #6840 2014-02-20 18:18:54 +01:00
Arthur Schiwon
3c9421381b LDAP: prevent other configuration from being deleted when deleting the first one which has an empty prefix for historical reasons 2014-02-20 16:25:50 +01:00
nhirokinet
2d946d2766 Update user.php to fix duplicate session-duplicate 2014-02-20 14:31:28 +01:00
NARUKAWA Hiroki
a422f19fac Security Update: session fixation 
Previous version is vulnerable to session fixation attack in some situations, guessing non-apache-module-php5 environment. Regeneration of session id should be done here.
 2014-02-20 14:31:23 +01:00
Lukas Reschke
ebb1a70abc Check whether the app is set 2014-02-20 11:26:55 +01:00
Lukas Reschke
b9d013e3ce Check whether the Key is set 2014-02-20 11:26:47 +01:00
Lukas Reschke
b044ec0420 An admin should not be able to add remote and public services on its own. This should only be possible programmatically. 
This change is due the fact that an admin may not be expected to execute arbitrary code in every environment.
 2014-02-20 11:26:41 +01:00
Joas Schilling
864f0342af Make google drive client secret and dropbox api secret a password field 
Fix issue #5794

Backport of 828985d
 2014-02-18 18:33:13 +01:00
Joas Schilling
5a2e99c975 External FTP Storage should request hostname instead of URL 
Fix issue #6277

Backport of 658af62
 2014-02-18 18:15:19 +01:00
Lukas Reschke
d07f459409 Use the proper content-type 
We should use the proper content-type `application/xml` instead of the default `text/html` here.

Backport requested.
 2014-02-18 11:45:05 +01:00
Vincent Petry
3d5d6b5ad1 Now using PHP session lifetime as default value for the JS config 
This will fix the heartbeat when the session_lifetime config parameter
hasn't been set explicitly.

Backport of f9763e1fc5
 2014-02-18 10:53:35 +01:00
Vincent Petry
80dcec773a Merge pull request #7225 from owncloud/enc_improved_error_handling_oc6 
[encryption] improved error handling (OC6)
 2014-02-17 11:26:21 +01:00
Bjoern Schiessle
43738dacfb don't block login forever if we are stuck in the middle of the initial encryption 2014-02-17 10:24:04 +01:00