]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
11 years agoCache: return non numberic storage id
Robin Appelman [Mon, 21 Jan 2013 21:01:22 +0000 (22:01 +0100)]
Cache: return non numberic storage id

11 years agoMerge branch 'filesystem' of github.com:owncloud/core into filesystem
Robin Appelman [Sun, 20 Jan 2013 02:11:50 +0000 (03:11 +0100)]
Merge branch 'filesystem' of github.com:owncloud/core into filesystem

11 years agomerge master into filesytem
Robin Appelman [Sun, 20 Jan 2013 02:11:04 +0000 (03:11 +0100)]
merge master into filesytem

11 years agoUpdate mtimes of all parent folders after change inside
Michael Gapczynski [Sun, 20 Jan 2013 02:04:25 +0000 (21:04 -0500)]
Update mtimes of all parent folders after change inside

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 19 Jan 2013 23:06:40 +0000 (00:06 +0100)]
[tx-robot] updated from transifex

11 years agoMerge pull request #1233 from owncloud/visualphpunit
Lukas Reschke [Sat, 19 Jan 2013 19:25:31 +0000 (11:25 -0800)]
Merge pull request #1233 from owncloud/visualphpunit

Add listener for VisualPHPUnit

11 years agoSanitize the exception
Lukas Reschke [Sat, 19 Jan 2013 18:57:17 +0000 (19:57 +0100)]
Sanitize the exception

11 years agoAlso replace the backslash with a minus
Lukas Reschke [Sat, 19 Jan 2013 18:45:28 +0000 (19:45 +0100)]
Also replace the backslash with a minus

For Windows systems

11 years agoMerge pull request #1214 from Raydiation/master
Bernhard Posselt [Sat, 19 Jan 2013 17:44:48 +0000 (09:44 -0800)]
Merge pull request #1214 from Raydiation/master

Load Classpaths of apps before appinfo/routes.php

11 years agoMerge pull request #1230 from owncloud/remove-unused-autocomplete.php
Lukas Reschke [Sat, 19 Jan 2013 13:56:27 +0000 (05:56 -0800)]
Merge pull request #1230 from owncloud/remove-unused-autocomplete.php

Remove uneeded file

11 years agoMerge pull request #1228 from owncloud/generating_zip_message
Jan-Christoph Borchardt [Sat, 19 Jan 2013 12:33:39 +0000 (04:33 -0800)]
Merge pull request #1228 from owncloud/generating_zip_message

Make the ZIP download information friendlier

11 years agoChange the second part of the notification
Lukas Reschke [Sat, 19 Jan 2013 12:12:27 +0000 (13:12 +0100)]
Change the second part of the notification

11 years agoImplement getETag() in shared storage
Michael Gapczynski [Sat, 19 Jan 2013 05:02:40 +0000 (00:02 -0500)]
Implement getETag() in shared storage

11 years agoDisable fancy folder sharing for now
Michael Gapczynski [Sat, 19 Jan 2013 04:57:13 +0000 (23:57 -0500)]
Disable fancy folder sharing for now

11 years agoFix merge
Michael Gapczynski [Sat, 19 Jan 2013 04:56:47 +0000 (23:56 -0500)]
Fix merge

11 years agoAdd listener for VisualPHPUnit
Michael Gapczynski [Sat, 19 Jan 2013 04:03:53 +0000 (23:03 -0500)]
Add listener for VisualPHPUnit

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 18 Jan 2013 23:05:38 +0000 (00:05 +0100)]
[tx-robot] updated from transifex

11 years agoRemove uneeded file
Lukas Reschke [Fri, 18 Jan 2013 22:07:11 +0000 (23:07 +0100)]
Remove uneeded file

I don't saw any usage of this file through the code, I assume it can
safely be removed.

11 years agoMerge pull request #986 from owncloud/fixing-784-master
Thomas Müller [Fri, 18 Jan 2013 22:06:00 +0000 (14:06 -0800)]
Merge pull request #986 from owncloud/fixing-784-master

the maximum upload size is now part of the response of the upload and de...

11 years agoMake the message friendlier
Lukas Reschke [Fri, 18 Jan 2013 21:35:26 +0000 (22:35 +0100)]
Make the message friendlier

11 years agoMerge pull request #1224 from davidgumberg/patch-2
Lukas Reschke [Fri, 18 Jan 2013 20:33:15 +0000 (12:33 -0800)]
Merge pull request #1224 from davidgumberg/patch-2

Typo fix (comment) /lib/base.php

11 years agofixing indent
Thomas Mueller [Fri, 18 Jan 2013 19:09:03 +0000 (20:09 +0100)]
fixing indent

11 years agoTypo fix (comment) /lib/base.php
davidgumberg [Fri, 18 Jan 2013 18:52:29 +0000 (10:52 -0800)]
Typo fix (comment) /lib/base.php

11 years agoFix wrong word in comment
Bart Visscher [Fri, 18 Jan 2013 15:38:36 +0000 (16:38 +0100)]
Fix wrong word in comment

11 years agofix error message, add "appid" to the output to know which app caused the error if...
Björn Schießle [Fri, 18 Jan 2013 14:14:42 +0000 (15:14 +0100)]
fix error message, add "appid" to the output to know which app caused the error if OC_App::getStorage() fails.
Port of approved patch for stable45: https://github.com/owncloud/core/pull/1222

11 years agoMerge pull request #1205 from owncloud/ocs_api
Thomas Müller [Fri, 18 Jan 2013 13:52:51 +0000 (05:52 -0800)]
Merge pull request #1205 from owncloud/ocs_api

Return 401 headers when trying to access a restricted api call

11 years agoMerge pull request #1181 from owncloud/return-503-in-maintenance
Thomas Müller [Fri, 18 Jan 2013 12:02:03 +0000 (04:02 -0800)]
Merge pull request #1181 from owncloud/return-503-in-maintenance

in case of maintenance the error page returns http status 503.

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 17 Jan 2013 23:04:36 +0000 (00:04 +0100)]
[tx-robot] updated from transifex

11 years agospaces to tabs
Bernhard Posselt [Thu, 17 Jan 2013 20:44:40 +0000 (21:44 +0100)]
spaces to tabs

11 years agoload classpaths of apps before routes
Bernhard Posselt [Thu, 17 Jan 2013 20:42:33 +0000 (21:42 +0100)]
load classpaths of apps before routes

11 years agoCorrect spelling of 'Authorization'
tomneedham [Thu, 17 Jan 2013 16:30:14 +0000 (16:30 +0000)]
Correct spelling of 'Authorization'

11 years agoMerge pull request #1148 from seancomeau/topic/setup
Frank Karlitschek [Thu, 17 Jan 2013 06:38:57 +0000 (22:38 -0800)]
Merge pull request #1148 from seancomeau/topic/setup

Fix issue #108

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 16 Jan 2013 23:27:40 +0000 (00:27 +0100)]
[tx-robot] updated from transifex

11 years agoMerge pull request #1204 from Raydiation/master
Bart Visscher [Wed, 16 Jan 2013 21:53:38 +0000 (13:53 -0800)]
Merge pull request #1204 from Raydiation/master

Dont resize content div with javascript but use css box-sizing to do it

11 years agoCache: use a database transition for scanning each folder
Robin Appelman [Wed, 16 Jan 2013 20:58:17 +0000 (21:58 +0100)]
Cache: use a database transition for scanning each folder

gives a massive speed improvement while scanning files

11 years agoFiles: make sure keybinds js is loaded after files js
Robin Appelman [Wed, 16 Jan 2013 20:36:25 +0000 (21:36 +0100)]
Files: make sure keybinds js is loaded after files js

11 years agoCache: no longer using this file
Robin Appelman [Wed, 16 Jan 2013 20:36:04 +0000 (21:36 +0100)]
Cache: no longer using this file

11 years agoFix incorrect indentation
Tom Needham [Wed, 16 Jan 2013 20:29:29 +0000 (20:29 +0000)]
Fix incorrect indentation

11 years agoReturn 401 headers when authentication is required for the api call
Tom Needham [Wed, 16 Jan 2013 20:27:35 +0000 (20:27 +0000)]
Return 401 headers when authentication is required for the api call

11 years agodont show horizontal scrollbar
Bernhard Posselt [Wed, 16 Jan 2013 18:55:16 +0000 (19:55 +0100)]
dont show horizontal scrollbar

11 years ago dont resize content div with javascript but use css box-sizing to do it
Bernhard Posselt [Wed, 16 Jan 2013 18:38:19 +0000 (19:38 +0100)]
 dont resize content div with javascript but use css box-sizing to do it

11 years agoCache: dont migrate permissions, cache them on demain instead
Robin Appelman [Wed, 16 Jan 2013 18:11:33 +0000 (19:11 +0100)]
Cache: dont migrate permissions, cache them on demain instead

11 years agomerge master into filesystem
Robin Appelman [Wed, 16 Jan 2013 18:04:50 +0000 (19:04 +0100)]
merge master into filesystem

11 years agoMerge pull request #1180 from owncloud/whitespace-cleanup
Bart Visscher [Wed, 16 Jan 2013 17:25:57 +0000 (09:25 -0800)]
Merge pull request #1180 from owncloud/whitespace-cleanup

Whitespace cleanup

11 years agoWhitespace cleanup
Bart Visscher [Mon, 14 Jan 2013 19:30:39 +0000 (20:30 +0100)]
Whitespace cleanup

11 years agoSpaces to tabs
Bart Visscher [Mon, 14 Jan 2013 19:30:28 +0000 (20:30 +0100)]
Spaces to tabs

11 years agoMerge pull request #1185 from owncloud/fixing-1162-master
Jan-Christoph Borchardt [Wed, 16 Jan 2013 13:18:53 +0000 (05:18 -0800)]
Merge pull request #1185 from owncloud/fixing-1162-master

handling proper display of files/folders with negative size

11 years agoMerge pull request #1192 from schiesbn/versioning_history_issue_1189
Björn Schießle [Wed, 16 Jan 2013 09:26:43 +0000 (01:26 -0800)]
Merge pull request #1192 from schiesbn/versioning_history_issue_1189

fix for issue #1186, missing variables added

11 years agoMerge branch 'versioning_history_issue_1189' of github.com:schiesbn/core into version...
Björn Schießle [Wed, 16 Jan 2013 09:25:48 +0000 (10:25 +0100)]
Merge branch 'versioning_history_issue_1189' of github.com:schiesbn/core into versioning_history_issue_1189

11 years agoinitialize $versionCreated
Björn Schießle [Wed, 16 Jan 2013 09:18:40 +0000 (10:18 +0100)]
initialize $versionCreated

11 years agoinitialize
Björn Schießle [Wed, 16 Jan 2013 09:18:40 +0000 (10:18 +0100)]
initialize

11 years agoMerge pull request #1195 from owncloud/cache_prepared
Thomas Müller [Wed, 16 Jan 2013 06:23:34 +0000 (22:23 -0800)]
Merge pull request #1195 from owncloud/cache_prepared

Cache prepared statements in OC_DB

11 years agoClear cached prepared statements when switching between mdb2 and pdo
Robin Appelman [Wed, 16 Jan 2013 00:11:19 +0000 (01:11 +0100)]
Clear cached prepared statements when switching between mdb2 and pdo

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 15 Jan 2013 23:21:21 +0000 (00:21 +0100)]
[tx-robot] updated from transifex

11 years agoMerge pull request #1178 from owncloud/return_true_because_of_ponies
Thomas Müller [Tue, 15 Jan 2013 22:01:48 +0000 (14:01 -0800)]
Merge pull request #1178 from owncloud/return_true_because_of_ponies

Remove uneeded return

11 years agoFix regression caused by 31b1a73e1f508a33843835b632ee05c7bfc2aaaf
Daniel Molkentin [Tue, 15 Jan 2013 21:44:40 +0000 (22:44 +0100)]
Fix regression caused by 31b1a73e1f508a33843835b632ee05c7bfc2aaaf

11 years agoCache prepared statements in OC_DB
Robin Appelman [Tue, 15 Jan 2013 19:20:39 +0000 (20:20 +0100)]
Cache prepared statements in OC_DB

11 years agoCache: more efficient upgrading
Robin Appelman [Tue, 15 Jan 2013 18:11:12 +0000 (19:11 +0100)]
Cache: more efficient upgrading

11 years agoCache: show upgrade progress
Robin Appelman [Wed, 2 Jan 2013 23:26:13 +0000 (00:26 +0100)]
Cache: show upgrade progress

11 years agoMerge pull request #1187 from owncloud/fixing-unused-and-undefined-in-master
Bart Visscher [Tue, 15 Jan 2013 15:45:51 +0000 (07:45 -0800)]
Merge pull request #1187 from owncloud/fixing-unused-and-undefined-in-master

Fixing unused and undefined in master

11 years agomerge master into filesystem
Robin Appelman [Tue, 15 Jan 2013 13:57:23 +0000 (14:57 +0100)]
merge master into filesystem

11 years agoMerge branch 'versioning_history_issue_1189' of github.com:schiesbn/core into version...
Björn Schießle [Tue, 15 Jan 2013 13:35:48 +0000 (14:35 +0100)]
Merge branch 'versioning_history_issue_1189' of github.com:schiesbn/core into versioning_history_issue_1189

11 years agofix for issue #1186, missing variables added
Björn Schießle [Tue, 15 Jan 2013 12:29:59 +0000 (13:29 +0100)]
fix for issue #1186, missing variables added

11 years agofix for issue #1189, missing variables added
Björn Schießle [Tue, 15 Jan 2013 12:29:59 +0000 (13:29 +0100)]
fix for issue #1189, missing variables added

11 years agoMerge pull request #1087 from owncloud/ldap_multiple_dns
blizzz [Tue, 15 Jan 2013 12:01:57 +0000 (04:01 -0800)]
Merge pull request #1087 from owncloud/ldap_multiple_dns

LDAP: ability to configure more than one base DN

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 14 Jan 2013 23:05:10 +0000 (00:05 +0100)]
[tx-robot] updated from transifex

11 years agoremove php closing tag
Thomas Mueller [Mon, 14 Jan 2013 22:51:58 +0000 (23:51 +0100)]
remove php closing tag

11 years agoMerge branch 'master' into fixing-unused-and-undefined-in-master
Thomas Mueller [Mon, 14 Jan 2013 22:41:34 +0000 (23:41 +0100)]
Merge branch 'master' into fixing-unused-and-undefined-in-master

11 years agohandling proper display of files/folders with negative size
Thomas Mueller [Mon, 14 Jan 2013 22:39:31 +0000 (23:39 +0100)]
handling proper display of files/folders with negative size
refs #1162

11 years agoMerge pull request #1182 from owncloud/sanitizeHTML-Clean
Lukas Reschke [Mon, 14 Jan 2013 22:37:23 +0000 (14:37 -0800)]
Merge pull request #1182 from owncloud/sanitizeHTML-Clean

Expanded one line if statement - Trivial

11 years agoMove { to same line
Lukas Reschke [Mon, 14 Jan 2013 21:04:31 +0000 (22:04 +0100)]
Move { to same line

11 years agoExpand if to multiple lines
Lukas Reschke [Mon, 14 Jan 2013 21:01:52 +0000 (22:01 +0100)]
Expand if to multiple lines

Oneliners are ugly.

11 years agoMerge pull request #1177 from owncloud/OC_User--isAdminUser()
Bart Visscher [Mon, 14 Jan 2013 20:53:18 +0000 (12:53 -0800)]
Merge pull request #1177 from owncloud/OC_User--isAdminUser()

Check if user is admin - bool

11 years agoin case of maintenance the error page returns http status 503.
Thomas Mueller [Mon, 14 Jan 2013 20:39:55 +0000 (21:39 +0100)]
in case of maintenance the error page returns http status 503.

This is necessary to enable the desktop sync client to react properly.
Currently the SabreDAV plugin OC_Connector_Sabre_MaintenancePlugin is not executed because this error page is returned before the SabreDAV code is executed

11 years agoEnhanced auth is totally unmaintained and broken
Lukas Reschke [Mon, 14 Jan 2013 20:39:49 +0000 (21:39 +0100)]
Enhanced auth is totally unmaintained and broken

Let's remove it, it's also not secure anymore with the introduction of
our API etc...
(And doesn't work with ldap etc…)

11 years agoRename TestException to DatabaseSetupException
Sean Comeau [Mon, 14 Jan 2013 20:36:50 +0000 (12:36 -0800)]
Rename TestException to DatabaseSetupException

11 years agoMerge pull request #1172 from owncloud/isSubDirectory
Bart Visscher [Mon, 14 Jan 2013 20:36:38 +0000 (12:36 -0800)]
Merge pull request #1172 from owncloud/isSubDirectory

Simplify the isSubDirectory() function

11 years agoMerge pull request #1169 from owncloud/webdav_L10n
Bart Visscher [Mon, 14 Jan 2013 20:28:51 +0000 (12:28 -0800)]
Merge pull request #1169 from owncloud/webdav_L10n

user_webdavauth - l10n - Trivial

11 years agoUse a custom exception instead of adding a delimiter to the error message
Sean Comeau [Mon, 14 Jan 2013 19:57:40 +0000 (11:57 -0800)]
Use a custom exception instead of adding a delimiter to the error message

11 years agoMerge pull request #1135 from owncloud/allow_default_click_behaviour
Lukas Reschke [Mon, 14 Jan 2013 19:24:02 +0000 (11:24 -0800)]
Merge pull request #1135 from owncloud/allow_default_click_behaviour

allow default click behaviour

11 years agoRemove uneeded returns
Lukas Reschke [Mon, 14 Jan 2013 19:18:08 +0000 (20:18 +0100)]
Remove uneeded returns

11 years agoAdd a closing )
Lukas Reschke [Mon, 14 Jan 2013 19:10:10 +0000 (20:10 +0100)]
Add a closing )

Thanks Jenkins!

11 years agoRemove uneeded return
Lukas Reschke [Mon, 14 Jan 2013 18:57:28 +0000 (19:57 +0100)]
Remove uneeded return

Thx @Raydiation

11 years agoCP fail
Lukas Reschke [Mon, 14 Jan 2013 18:51:16 +0000 (19:51 +0100)]
CP fail

11 years agoCheck if user is admin - bool
Lukas Reschke [Mon, 14 Jan 2013 18:45:17 +0000 (19:45 +0100)]
Check if user is admin - bool

There was no "isAdminUser()" function which returned bool. This is
irritiating as there were a loooooooot of places in the code which
checked this itself with `OC_Group::inGroup($uid, 'admin)` - why not
use a function for this?
(Especially if you consider that we might change the group name in the
future, which would lead to problems then)

Additionally, @Raydiation needed such a method for his AppFramework :)

11 years agoCheck for string position instead of string existence
Lukas Reschke [Mon, 14 Jan 2013 15:51:31 +0000 (16:51 +0100)]
Check for string position instead of string existence

otherwise /foo/bar would be detected as a subfolder of /bar

THX @icewind1991

11 years agoMerge pull request #1112 from Raydiation/master
Bart Visscher [Mon, 14 Jan 2013 15:35:14 +0000 (07:35 -0800)]
Merge pull request #1112 from Raydiation/master

This fixes a problem that prevented app routes from being loaded after ocs_api merge

11 years agoRevert "fix c&p error"
Daniel Molkentin [Mon, 14 Jan 2013 15:25:03 +0000 (16:25 +0100)]
Revert "fix c&p error"

This reverts commit 9d41322cf0943e3960a4a7dc5878c713b8fedbca.

11 years agofix c&p error
Daniel Molkentin [Mon, 14 Jan 2013 15:15:22 +0000 (16:15 +0100)]
fix c&p error

11 years agoMerge pull request #1170 from owncloud/correctIndention
Thomas Müller [Mon, 14 Jan 2013 12:59:53 +0000 (04:59 -0800)]
Merge pull request #1170 from owncloud/correctIndention

Remove ugly indentation - Trivial

11 years agoMerge branch 'master' of github.com:owncloud/core
Björn Schießle [Mon, 14 Jan 2013 09:33:17 +0000 (10:33 +0100)]
Merge branch 'master' of github.com:owncloud/core

11 years agomerge conflict fixed, settings-personal.php is no longer needed
Björn Schießle [Mon, 14 Jan 2013 09:24:40 +0000 (10:24 +0100)]
merge conflict fixed, settings-personal.php is no longer needed

Conflicts:
apps/files_versions/templates/settings-personal.php

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 13 Jan 2013 23:18:21 +0000 (00:18 +0100)]
[tx-robot] updated from transifex

11 years agoCommentblocks should begin with two *
Lukas Reschke [Sun, 13 Jan 2013 13:54:18 +0000 (14:54 +0100)]
Commentblocks should begin with two *

11 years agoAdd @brief to description
Lukas Reschke [Sun, 13 Jan 2013 13:50:31 +0000 (14:50 +0100)]
Add @brief to description

11 years agoSimplify the isSubDirectory() function
Lukas Reschke [Sun, 13 Jan 2013 13:33:19 +0000 (14:33 +0100)]
Simplify the isSubDirectory() function

isSubDirectory() checks if a specified $sub is a subdirectory of the
$parent, this is needed to prevent file inclusions.

Actually, the current code is more kind of a "hack" which I always
struggle over if browsing through source. So this should be a much
better implementation.

The implementation is really straightforward:
- [realpath()](http://php.net/manual/function.realpath.php) expands all
symbolic links and resolves references to '/./', '/../' and extra '/'
characters in the input path and return the canonicalized absolute
pathname.
- [strpos()](php.net/manual/function.strpos.php) returns FALSE if the
substring wasn't found.

Since this is an absolutely critical piece of code, I'd like to ensure
that this is absolutely safe!

11 years agoRemove ugly indentation
Lukas Reschke [Sun, 13 Jan 2013 00:02:11 +0000 (01:02 +0100)]
Remove ugly indentation

11 years agoThe => This
Lukas Reschke [Sat, 12 Jan 2013 23:45:45 +0000 (00:45 +0100)]
The => This

Sounds better for me.

11 years agoImproved the help text
Lukas Reschke [Sat, 12 Jan 2013 23:37:58 +0000 (00:37 +0100)]
Improved the help text

11 years agolegend - l10n
Lukas Reschke [Sat, 12 Jan 2013 23:32:44 +0000 (00:32 +0100)]
legend - l10n