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

3384 commits

Author SHA1 Message Date
Bart Visscher
15f5325078 Don't use routes when displaying error page 2013-02-22 21:39:44 +01:00
Björn Schießle
eabfd9b69b put value assignment into brackets 2013-02-22 16:45:57 +01:00
Bernhard Posselt
608ebb59dd Merge pull request #1859 from owncloud/blacklist-fix 
Add OC\Files\Filesystem::isFileBlacklisted
 2013-02-22 07:43:13 -08:00
Björn Schießle
d8137fdf66 return both, count and result if the operation succeeded or failed. Maybe in some cases it is useful to know how much bytes where copied 2013-02-22 16:43:11 +01:00
Robin Appelman
62c65bc1c8 Add OC\Files\Filesystem::isFileBlacklisted 2013-02-22 16:13:08 +01:00
Jörn Friedrich Dreyer
e8da90d0f4 Merge pull request #1711 from owncloud/style-cleanup 
Codestyle cleanup
 2013-02-22 07:02:51 -08:00
Björn Schießle
5b94959686 using the number of writen bytes as indicator if streamCopy() was successfully. Instead check if fwrite returns the number of bytes or false 2013-02-22 14:56:50 +01:00
Georg Ehrke
f51d8c1cd9 fix order of mount commands 2013-02-22 14:19:29 +01:00
Jörn Friedrich Dreyer
16a5f15f85 keep transparency when resizing or cropping png/gif 2013-02-22 12:42:40 +01:00
Thomas Tanghus
efe33c508e Don't walk objects with array_walk_recursive() 2013-02-22 00:51:54 +01:00
Bart Visscher
bf0b9bac8b Remove unneeded code for user layout template 2013-02-22 00:22:43 +01:00
Jenkins for ownCloud
734a463297 [tx-robot] updated from transifex 2013-02-22 00:08:47 +01:00
Bart Visscher
19c5213b53 Join split translated strings 2013-02-21 23:47:56 +01:00
Bart Visscher
88bea55f97 Update hint by the internal version number. 
So we don't repeat the 4.5 <=> 4.90 mixup
 2013-02-21 21:30:25 +01:00
Björn Schießle
0a6e9933fc Merge pull request #1812 from owncloud/add-logging-to-webdav-test-master 
Enhancment to the WebDAV-Testing ...
 2013-02-21 05:58:34 -08:00
Frank Karlitschek
c5e0dda887 add a safe_mode check 2013-02-21 11:09:00 +01:00
Michael Gapczynski
d29c2b0169 Reuse $freeSpace variable 2013-02-23 16:00:50 -05:00
Michael Gapczynski
a2d3333a09 Don't throw insufficient storage exception if free space is unknown 2013-02-23 15:37:44 -05:00
Bart Visscher
bb75dfc021 Whitespace fixes 2013-02-22 19:05:36 +01:00
Björn Schießle
c8c0e72e73 Merge pull request #1768 from houqp/issue_1739 
bug fix for issue 1739
 2013-02-21 01:09:15 -08:00
Jenkins for ownCloud
dcd93a53e4 [tx-robot] updated from transifex 2013-02-21 00:15:58 +01:00
Thomas Mueller
7b7994b56b WebDAV-Testing: 
- write the exception to the log
- in case curl is missing we should return true as well
 2013-02-20 23:11:38 +01:00
Frank Karlitschek
59fd9b2bd2 5.0.0 beta 1 2013-02-20 19:09:58 +01:00
Thomas Mueller
5062ae250b Merge branch 'master' into master-sqlserver 
Conflicts:
	lib/files/cache/cache.php
 2013-02-20 10:55:20 +01:00
Michael Gapczynski
702c27b0e6 Merge branch 'master' into external_storage_ui_feedback 
Conflicts:
	apps/files_external/js/settings.js
	apps/files_external/lib/smb.php
	apps/files_external/templates/settings.php
	lib/files/storage/common.php
 2013-02-19 19:12:14 -05:00
Frank Karlitschek
3878203679 Merge pull request #1731 from owncloud/unknown-freespace 
Give storage backends the option to define having no known free space
 2013-02-19 15:18:12 -08:00
Jenkins for ownCloud
99758dce2b [tx-robot] updated from transifex 2013-02-20 00:03:28 +01:00
Jenkins for ownCloud
76c4dc6296 [tx-robot] updated from transifex 2013-02-19 00:06:51 +01:00
Qingping Hou
2c78c5ccab bug fix for issue 1739, two changes included: 
* fix typo in OC_Group_Database::DisplayNamesInGroup's SQL clause
* check array_diff return value in OC_Group::displayNamesInGroups,
  when there is no difference between two arrays, it will return
  NULL, so we have to take care of it.
 2013-02-18 18:05:58 -05:00
Thomas Müller
d9035d4fdc Merge pull request #1728 from owncloud/mountconfig 
Use json for new mount configuration files
 2013-02-18 14:56:25 -08:00
Frank Karlitschek
f554347db5 Merge pull request #1724 from owncloud/long-storage-id 
Cache: hash long storage ids to ensure they fit in the database
 2013-02-18 07:17:27 -08:00
Robin Appelman
2bbb57e429 merge master into mountconfig 2013-02-18 15:12:15 +01:00
Thomas Mueller
2675290325 Merge branch 'master' into master-sqlserver 2013-02-18 11:39:04 +01:00
Jenkins for ownCloud
3b9796bfcc [tx-robot] updated from transifex 2013-02-18 00:06:45 +01:00
Thomas Müller
55d6b96348 Merge pull request #1719 from owncloud/fixing-1659-master 
Fixing 1659 master
 2013-02-17 11:47:35 -08:00
Robin Appelman
451daf3ab1 Keep user quota into account when the storage backend has unkown free space 2013-02-17 20:09:03 +01:00
Robin Appelman
d96146a017 Give storage backends the option to define having no known free space 
When this is the case only the configured max upload size is taking into account for uploading
 2013-02-16 03:27:50 +01:00
Robin Appelman
6da2c6c83e Create new mountconfig files in json 2013-02-16 01:50:40 +01:00
Robin Appelman
46626915ef Use a parser to read custom mount configuration instead of including the php files 2013-02-16 01:30:44 +01:00
Jenkins for ownCloud
83f0c8ce61 [tx-robot] updated from transifex 2013-02-16 00:05:50 +01:00
Robin Appelman
0c1ec758e8 Cache: hash long storage ids to ensure they fit in the database 2013-02-15 22:11:39 +01:00
Thomas Mueller
40739350c9 class Mapper no respects an unchanged physical root which will be excluded from slugifying the path 2013-02-15 17:42:17 +01:00
Thomas Mueller
b488800bd5 fix error in recursive search 2013-02-15 17:41:22 +01:00
Robin Appelman
b8e2454f68 Fix strict standard warning in user template 2013-02-15 16:10:06 +01:00
Thomas Müller
2ce398c68e Merge pull request #1715 from owncloud/fixing-1640-master 
changing the bit mask of OC_USER_BACKEND_SET_DISPLAYNAME
 2013-02-15 03:58:05 -08:00
Thomas Mueller
297c50db18 changing the bit mask of OC_USER_BACKEND_SET_DISPLAYNAME 2013-02-15 12:24:49 +01:00
Jan-Christoph Borchardt
8b09fbc150 Merge pull request #1700 from owncloud/fixing-1680-master 
Fixing 1680 master
 2013-02-15 03:21:49 -08:00
Thomas Mueller
102619ab87 we should never drop a database 2013-02-15 08:22:31 +01:00
Thomas Müller
166693426d Merge pull request #1712 from owncloud/debug-exception 
Don't catch errors/exceptions when debug is enabled
 2013-02-14 20:40:31 -08:00
Robin Appelman
ab70f9bd25 Fix quotes in OC_User::isEnabled 
this broke login
 2013-02-15 03:20:02 +01:00
Robin Appelman
0395715348 set DEBUG from xdebug session before we first use it 2013-02-15 03:15:09 +01:00
Robin Appelman
bcabdd7dd5 Don't cache errors/exceptions when debug is enabled 2013-02-15 03:14:41 +01:00
Jenkins for ownCloud
b169073169 [tx-robot] updated from transifex 2013-02-15 00:06:50 +01:00
Thomas Mueller
4b80466880 Merge branch 'master' into master-sqlserver 
Conflicts:
	lib/db.php
	lib/files/cache/cache.php
	lib/files/cache/legacy.php
	lib/setup.php
 2013-02-14 22:54:48 +01:00
Thomas Mueller
78a3625ddf final adoptions for mssql connectivity 2013-02-14 21:59:24 +01:00
Bart Visscher
9058d398a7 Merge pull request #1662 from owncloud/style-cleanup 
Style cleanup
 2013-02-14 12:54:36 -08:00
Lukas Reschke
be194c5b5b Invalidate existing HSTS headers 2013-02-14 19:23:29 +01:00
Thomas Mueller
e96f6ffa52 filter l10n-* files 2013-02-14 17:24:06 +01:00
Thomas Mueller
8877087b57 adding a compatibility.js as a single source to define all fallback function declarations 2013-02-14 12:20:04 +01:00
Bart Visscher
ffae6f4b84 Style-fix: Breakup long lines 2013-02-14 08:38:37 +01:00
Bart Visscher
2d6d0a4ad4 Whitespace indent fixes 2013-02-14 08:36:26 +01:00
Bart Visscher
2679123846 Add braces around single line if statements 2013-02-14 08:36:26 +01:00
Bart Visscher
cd35d257bb Fix NoSpaceAfterComma and SpaceBeforeComma 2013-02-14 08:36:26 +01:00
Bart Visscher
d3ef967993 Fix indentation style 2013-02-14 08:36:26 +01:00
Bart Visscher
5c4a804ddb Fix SpaceBeforeOpenBrace errors 2013-02-14 08:36:26 +01:00
Jenkins for ownCloud
bfe6334cd9 [tx-robot] updated from transifex 2013-02-14 00:06:51 +01:00
Thomas Müller
e1e77fe3be Merge pull request #1598 from owncloud/fixing-1424-master 
Fixing 1424 master
 2013-02-13 12:59:30 -08:00
Thomas Mueller
bc43dd704f Merge branch 'master' into fixing-1424-master 
Conflicts:
	settings/js/users.js
 2013-02-13 01:18:01 +01:00
Jenkins for ownCloud
68fa0b7dcc [tx-robot] updated from transifex 2013-02-13 00:05:40 +01:00
Thomas Mueller
a814361ca7 Merge branch 'master' into external_storage_ui_feedback 2013-02-12 23:01:54 +01:00
Thomas Mueller
b31cc83a2d $this->numericId should be determined based on table storages not filecache 2013-02-12 17:26:58 +01:00
Thomas Müller
251b676a06 Merge pull request #1616 from owncloud/cache_fixes_rebase 
Cache: reuse known folder sizes when doing a shallow scan - rebase
 2013-02-12 08:07:49 -08:00
Robin Appelman
b54dcd1999 Cache: fix scanner trying to use existing data when file isn't in cache 2013-02-12 16:48:21 +01:00
Thomas Mueller
f2baf1ae0e fixing syntax error 2013-02-12 16:18:48 +01:00
Jenkins for ownCloud
8d9352a40d [tx-robot] updated from transifex 2013-02-12 15:12:46 +01:00
Robin Appelman
e1fe5279dd Cache: also preserve etags for files 2013-02-12 14:56:57 +01:00
Thomas Mueller
a953786d79 Merge branch 'master' into external_storage_ui_feedback 2013-02-12 11:01:14 +01:00
Michael Gapczynski
6eba790a75 Merge branch 'master' into external_storage_ui_feedback 
Conflicts:
	apps/files_external/js/dropbox.js
	apps/files_external/js/google.js
	apps/files_external/js/settings.js
	apps/files_external/lib/amazons3.php
	apps/files_external/lib/dropbox.php
	apps/files_external/lib/google.php
	apps/files_external/lib/smb.php
	apps/files_external/lib/swift.php
	apps/files_external/lib/webdav.php
	lib/filestorage.php
 2013-02-11 20:27:05 -05:00
Thomas Mueller
bcbf2e667b fixing sql server syntax for database creation 2013-02-12 01:17:01 +01:00
Thomas Mueller
98d7e0f7cd write any database messages / non critical errors to the log - don't pollute the browser 2013-02-12 01:14:53 +01:00
Thomas Mueller
8136851010 fixing indent 2013-02-12 01:05:47 +01:00
Thomas Mueller
b2dfdacaa1 fixing undefined variables 2013-02-12 01:04:35 +01:00
Thomas Mueller
76b31f870c Merge branch 'master' into master-sqlserver 2013-02-12 00:32:38 +01:00
Thomas Müller
53111ccdc8 Merge pull request #1634 from irgsmirx/patch-6 
Update/Bugfix lib/files/cache/legacy.php during database upgrade
 2013-02-11 15:31:28 -08:00
Jenkins for ownCloud
fb23ac3ce2 [tx-robot] updated from transifex 2013-02-12 00:21:45 +01:00
Thomas Müller
04bf8c1b66 Merge pull request #1596 from owncloud/fix_470 
webdav put improvements
 2013-02-11 13:10:48 -08:00
Thomas Mueller
5731a1b01c introduce new virtual method hasUserListings() to determine if a user backend can list it's users. 2013-02-11 22:01:52 +01:00
Thomas Mueller
037fcde133 Merge branch 'master' into fixing-1424-master 2013-02-11 21:42:27 +01:00
irgsmirx
062befd1fc Update lib/files/cache/legacy.php 
Fixing a bug that occurs when trying to update a non-existent 'fscache' table in the database - if unfixed upgrading does not succeed.

Unfortunately I could not get a call to PEAR::isError working. That is why I check for the existence of a property present in class MDB2_Error.
 2013-02-11 20:28:36 +01:00
Jenkins for ownCloud
39d19a9274 [tx-robot] updated from transifex 2013-02-11 15:42:41 +01:00
Thomas Müller
766fbead96 Merge pull request #1578 from owncloud/mysql_admin_fix 
added l10n for db error messages
 2013-02-11 06:35:49 -08:00
Lukas Reschke
eed48c8159 Merge pull request #1608 from owncloud/fix-shared-links 
Fix shared links
 2013-02-11 05:17:24 -08:00
Thomas Mueller
c544a631d5 fixing indent 2013-02-11 14:14:37 +01:00
Bernhard Posselt
e70aef603f Merge pull request #1573 from owncloud/fixing-ctor-local-storage-master 
adding dtor to Local and revert call to it within Temporary
 2013-02-11 04:40:54 -08:00
Robin Appelman
2921d2fb78 Cache: don't create a new etag when the mtime hasn't changed 2013-02-11 13:33:56 +01:00
Robin Appelman
d84c3cd014 Cache: actually use parameter 2013-02-11 13:33:48 +01:00
Robin Appelman
299649b40e Cache: reuse known folder sizes when doing a shallow scan 2013-02-11 13:33:41 +01:00
Robin Appelman
56d10e9054 Cache: simplify scanner logic a bit when handeling with unknown folder sizes 2013-02-11 13:33:34 +01:00
Bernhard Posselt
36df2fbdfe fixed argument for translation 2013-02-11 13:11:43 +01:00
Robin Appelman
ad360296b9 Update tests and apps to the new \OC\Files\Filesystem::init signature 2013-02-11 11:06:09 +01:00
Jörn Friedrich Dreyer
99f41de7de only check content lenght on PUT to make litmus happy 2013-02-11 10:31:01 +01:00
Jörn Friedrich Dreyer
2cb2991c04 delete partial file when file upload is aborted 2013-02-11 09:53:07 +01:00
Jörn Friedrich Dreyer
15ab2fd52a check Content-Length to detect aborted uploads 2013-02-11 09:53:07 +01:00
Jörn Friedrich Dreyer
806522d007 also rename file when it has not been present before 2013-02-11 09:53:07 +01:00
Jörn Friedrich Dreyer
72a2075b1c readd renaming and mtime handling to new directory nodes 2013-02-11 09:43:26 +01:00
Jörn Friedrich Dreyer
2644003bf1 send back 'X-OC-MTime: accepted' when X-OC-MTime was applied 2013-02-11 09:34:03 +01:00
Jörn Friedrich Dreyer
d2332f60f3 add a custom header clients can use to skip a n additional propset request 2013-02-11 09:32:28 +01:00
Michael Gapczynski
eeb409a6ec Merge branch 'master' into fix-shared-links 2013-02-10 19:10:06 -05:00
Michael Gapczynski
8e3b8c7f47 Proper fix for shared links 2013-02-10 19:09:58 -05:00
Jenkins for ownCloud
04146f2059 [tx-robot] updated from transifex 2013-02-11 00:04:49 +01:00
Robin Appelman
3292dc3eea Cache: allow file sizes >2GB 2013-02-10 16:44:00 +01:00
blizzz
e4c9fc1381 Merge pull request #1592 from owncloud/display_name_setting 
add switch to enable/disable the possibility to change the display name by the user
 2013-02-10 06:52:03 -08:00
Frank Karlitschek
dc12dd523e Merge pull request #1581 from owncloud/mapper_md5 
Mapper: use md5 hashes for database indexes
 2013-02-10 06:47:44 -08:00
Frank Karlitschek
bc2bfea399 Merge pull request #1588 from owncloud/etag_quotes 
wrap etags in quotes when doing a propfind on a folder
 2013-02-10 06:44:45 -08:00
Lukas Reschke
d08a3bb46e Merge pull request #1590 from owncloud/fix_470 
append .part to put files
 2013-02-10 06:38:31 -08:00
Lukas Reschke
32b1c7ad5d Merge pull request #1589 from owncloud/use-sanitizeHTML 
Use sanitizeHTML instead of stripslashes + htmlspecialchars
 2013-02-10 06:23:01 -08:00
Björn Schießle
d8fee28b3b add switch to enable/disable the possibility to change the display name by the user 2013-02-10 14:43:31 +01:00
Jörn Friedrich Dreyer
1263511a17 append .part to put files 2013-02-10 14:16:45 +01:00
Lukas Reschke
46103e62d2 Coding style 2013-02-10 14:09:49 +01:00
Administrator
4e5a3fbcaf - Fixed indentations. 
- Fixed a bug in legacy.php: there was an error that was not checked for if the table 'fscache' did not exist in the database.
 2013-02-10 14:08:00 +01:00
Lukas Reschke
6f785e211b Merge pull request #1030 from hkjolhede/master 
SFTP support in files_external app
 2013-02-10 05:06:00 -08:00
Lukas Reschke
1b10032556 Use sanitizeHTML instead of stripslashes + htmlspecialchars 2013-02-10 14:03:40 +01:00
Robin Appelman
121c1f2fc0 wrap etags in quotes when doing a propfind on a folder 2013-02-10 13:55:20 +01:00
Administrator
41ec976fd7 Bugfixes and cleanup MS SQL Server installation 2013-02-10 13:07:59 +01:00
Tom Needham
6d74aa0d00 more code style 2013-02-10 12:46:41 +01:00
Tom Needham
28498e1af4 Code style and remove OAuth code 2013-02-10 12:44:59 +01:00
Tom Needham
266ba2806d Remove debug call, correct app identifier 2013-02-10 12:35:39 +01:00
Robin Appelman
0c05244f8b Mapper: use md5 hashes for database indexes 
indexing the full path exeeds the maximum index length for MySQL
 2013-02-10 11:49:37 +01:00
Lukas Reschke
01fabd6c65 Merge pull request #1577 from owncloud/typo_catagory 
Typo
 2013-02-10 02:31:34 -08:00
Jenkins for ownCloud
f7d898d835 [tx-robot] updated from transifex 2013-02-10 00:10:29 +01:00
Lukas Reschke
bd2f8980cd Typo 2013-02-09 23:37:42 +01:00
Bernhard Posselt
b2261c31eb added l10n for db error messages 2013-02-09 19:23:36 +01:00
Thomas Müller
b9089fe8d9 Merge branch 'master' into fixing-1424-master 2013-02-09 19:15:23 +01:00
Thomas Müller
0222c589ac Merge pull request #1546 from owncloud/fix-loading-hooks 
Fix loading hooks when going though the routing system
 2013-02-09 09:59:41 -08:00
Thomas Müller
e68cf72458 Merge pull request #1543 from owncloud/utf8-locale-master 
some systems use en_US.UTF8 instead of en_US.UTF-8
 2013-02-09 09:58:05 -08:00
Thomas Müller
460faf3f97 Merge pull request #1569 from owncloud/clean-app-id 
Remove invalid characters from app id to prevent loading of invalid reso...
 2013-02-09 09:56:26 -08:00
Bernhard Posselt
0664b98b4f added icons and mimetypes for .msi and .exe files 2013-02-09 18:09:03 +01:00
Bernhard Posselt
43981e62e2 Revert "added exe and msi filetypes and icon" 
This reverts commit aa1adf42c7.
 2013-02-09 17:46:07 +01:00
Bernhard Posselt
aa1adf42c7 added exe and msi filetypes and icon 2013-02-09 17:41:17 +01:00
Thomas Müller
2b0b6bb63c Merge pull request #1566 from owncloud/fixing-1505-master 
fixes zip download for folders containing a dot .....
 2013-02-09 08:33:44 -08:00
Thomas Müller
d67d9566ce Merge branch 'master' into clean-app-id 2013-02-09 17:28:30 +01:00
icewind1991
5a309c11ca Merge pull request #1572 from owncloud/fix_empty_path_handling 
fix empty path handling
 2013-02-09 08:25:25 -08:00
Thomas Müller
e0da721a7d adding ctor to Local and revert call to it within Temporary 2013-02-09 17:16:13 +01:00
Frank Karlitschek
5a0a9564ce alpha 1 2013-02-09 17:13:43 +01:00
Lukas Reschke
06bba59249 Merge pull request #1618 from owncloud/mapped-storage-unit-testing-linux-master 
Mapped storage unit testing linux master
 2013-02-12 22:58:37 -08:00
Thomas Mueller
92e6409f40 fixing mappedlocal storage to work on non-windows as well 
this allows us to run unit tests on linux - necessary to enable easy regression testing
 2013-02-11 13:53:10 +01:00
Thomas Mueller
f223ab796b Merge branch 'master' into mapped-storage-unit-testing-linux-master 2013-02-11 12:59:23 +01:00
Thomas Müller
8174e5faf1 make MappedLocal available and testable within Linux as well 2013-02-09 19:03:03 +01:00
Jörn Friedrich Dreyer
420b63cbe4 fix empty path handling 2013-02-09 16:58:55 +01:00
Bart Visscher
60411f7d3d Remove unneeded __destruct call in OC\Files\Storage\Temporary 2013-02-09 16:18:30 +01:00
Bart Visscher
9dddcae9ca Remove invalid characters from app id to prevent loading of invalid resources 2013-02-09 15:10:40 +01:00
Henrik Kjölhede
d6b4d25d1d Merge branch 'master' of https://github.com/hkjolhede/owncloud_core 2013-02-09 14:13:54 +01:00
Thomas Müller
279cbeb001 Merge pull request #1481 from owncloud/fixing-1354-master 
basic WebDAV test in place now
 2013-02-09 05:13:33 -08:00
Henrik Kjölhede
41fa65e7be Merge branch 'master' of https://github.com/owncloud/core 
Conflicts:
	apps/files_external/appinfo/app.php
 2013-02-09 14:05:33 +01:00
Thomas Müller
ddc7af9a53 know your libraries ;-) 
strrpos fails in cases the file in the path has no dot but the parent folder
 2013-02-09 13:51:44 +01:00
Tom Needham
5ad1b63f76 Fix api result merging. 2013-02-09 12:50:19 +00:00
icewind1991
ec829bd345 Merge pull request #1512 from owncloud/mapped-filename-storage 
initial version of a local storage implementation which will use unique ...
 2013-02-09 04:45:25 -08:00
Tom Needham
5d14a2cc46 Merge in master 2013-02-09 12:05:48 +00:00
Tom Needham
eefaefe87d Use OC_User::isAdminUser() in lib/api.php 2013-02-09 12:00:44 +00:00
Tom Needham
ab8777a623 Merge branch 'ocs_capabilities' into ocs_multiple_methods 2013-02-09 11:56:30 +00:00
Tom Needham
742cafb03a Change strucutre of cloud/capabilities response 2013-02-09 11:22:29 +00:00
Frank Karlitschek
4a130d106c I'm an evil bastard and I commit this 3 letter text fix without a pull request. 2013-02-09 10:09:37 +01:00
Frank Karlitschek
764409117a Merge pull request #1493 from owncloud/fix_ldap_stored_homedir 
Fix ldap stored homedir
 2013-02-11 02:20:03 -08:00
Bart Visscher
ed1dc3e064 Fix files router download links 2013-02-08 22:05:13 +01:00
Thomas Müller
12bdc6ddb6 Merge pull request #1439 from owncloud/fix-archive-tar-on-win32-master 
quick fixing this require_once.
 2013-02-08 10:18:49 -08:00
Bart Visscher
fba9739448 Always load the apps before trying to match a route 2013-02-08 19:06:59 +01:00
Bart Visscher
340d6fce11 Better way of getting the navigation entries for an app 2013-02-08 18:53:43 +01:00
Thomas Müller
232a98524c some systems use en_US.UTF8 instead of en_US.UTF-8 2013-02-08 17:49:54 +01:00
Thomas Müller
05b46f7828 on creation only test for existing users if the backend supports user creation 
this solves the issue where no users can be created any more if backends are active which always return true on userExists() like WebDAV Auth
 2013-02-08 17:16:18 +01:00
Thomas Müller
ea42014ba4 in case curl is not present we cannot test 2013-02-08 15:23:26 +01:00
Thomas Mueller
4c3d4f7d36 quick fixing this require_once. 
On windows the wrong file will be required: lib/archive/tar.php and not Archive/Tar.php.

Best would be to rename the lib/archive/tar.php or put it into a different folder
 2013-02-08 15:23:07 +01:00
Thomas Müller
1158447499 missing comma in sql statement 2013-02-08 13:49:26 +01:00
Tobias Ramforth
d577f790c8 Added MS SQL Server support 2013-02-08 00:00:51 +01:00
icewind1991
3bd33b69a1 Merge pull request #1527 from owncloud/simplyfy_file_mimetype_parsing 
simplyfy mimetype parsing of 'file' output
 2013-02-07 14:47:10 -08:00
Lukas Reschke
217328e0e3 Merge pull request #1514 from owncloud/fix-setup 
Fix setup
 2013-02-07 13:48:44 -08:00
blizzz
fc7230349b Merge pull request #1530 from owncloud/fix-warning-displayname-layout 
Fix warning with displayname in user layout template
 2013-02-07 11:25:33 -08:00
Robin Appelman
73ed62976d Fix previous commit 2013-02-07 18:30:01 +01:00
Robin Appelman
f3f55654ce Use dummy request method in CLI 2013-02-07 18:28:56 +01:00
Bart Visscher
20b6cb28b1 Fix warning with displayname in user layout template 2013-02-07 18:07:27 +01:00
Robin Appelman
afa1a6d2b3 Don't try to use routes when called from cli 2013-02-07 17:53:38 +01:00
Jörn Friedrich Dreyer
1ef3e4c5c6 simplyfy mimetype parsing of 'file' output 2013-02-07 17:46:16 +01:00
Thomas Müller
0efcf33e2f Merge pull request #1451 from eMerzh/fix_1065 
Add Redirect to getUrlContent fix #1065
 2013-02-07 06:27:58 -08:00
Thomas Mueller
5788d36c8d Merge branch 'master' into fixing-1354-master 
Conflicts:
	settings/admin.php
	settings/templates/admin.php
 2013-02-07 10:44:28 +01:00
Bart Visscher
149d079fd4 Move loading of js_config to templatelayout 
Also check for installed flag because this isn't available before setup
 2013-02-07 08:09:53 +01:00
Jenkins for ownCloud
35bd7a400d [tx-robot] updated from transifex 2013-02-07 00:11:04 +01:00
Thomas Mueller
fd8cb9974b initial version of a local storage implementation which will use unique slugified filename on the local filesystem. 
This implementation will only be enabled on windows based system to solve the issues around UTF-8 file names with php on windows.
 2013-02-06 23:41:52 +01:00
Frank Karlitschek
223f538bb8 Merge pull request #1500 from chriskoch/patch-1 
Update lib/public/util.php
 2013-02-06 13:00:10 -08:00
Lukas Reschke
2dfe67423d Merge pull request #1509 from owncloud/correct-public-contacts-tests 
Correct lib/public/contacts.php tests
 2013-02-06 12:29:51 -08:00
Lukas Reschke
e969a78cf9 Merge pull request #1443 from owncloud/use-module-file-info-master 
we get best results regarding mime type detection if we use fileinfo - l...
 2013-02-06 11:53:13 -08:00
Sam Tuke
ae8cfe6569 Added comments 2013-02-06 17:43:03 +00:00
Bart Visscher
3582f7bd09 Execute the post setup check after finishing the setup 2013-02-06 17:56:45 +01:00
Bart Visscher
a4d3cc798f Correct lib/public/contacts.php tests 2013-02-06 17:37:47 +01:00
Christian Koch
a4f909cefd Update lib/public/util.php 
The call of \OC_MAIL::send() overrides all optional parameters. This is not necessary. But if you want to have html mail templates (what I'm thinking about) it is a real problem
 2013-02-06 17:22:07 +01:00
Thomas Müller
efdaea4557 Merge pull request #1357 from owncloud/alternative-loging-master 
add support for apps to register alternative login methods
 2013-02-06 06:49:58 -08:00
Björn Schießle
9e08f85c5e port already approved bugfix to master, https://github.com/owncloud/core/pull/1479 2013-02-06 14:19:32 +01:00
Björn Schießle
9d73e7eb1e let the user change his display name, if supported by the back-end 2013-02-06 11:38:03 +01:00
Arthur Schiwon
a721f7d59f check whether user belongs to the backend before calling getHome() 2013-02-06 02:26:35 +01:00
Thomas Müller
74157902d7 Merge pull request #1476 from owncloud/disable-error-handler-while-running-phpunit 
disable error handler while running phpunit
 2013-02-05 14:35:11 -08:00
Thomas Mueller
1adcc5fd23 basic WebDAV test in place now 2013-02-05 23:33:44 +01:00
Thomas Mueller
10ea45c916 fix failing test cases due to wrong typing 2013-02-05 20:19:54 +01:00