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
73ed62976d
Fix previous commit
2013-02-07 18:30:01 +01:00
f3f55654ce
Use dummy request method in CLI
2013-02-07 18:28:56 +01:00
20b6cb28b1
Fix warning with displayname in user layout template
2013-02-07 18:07:27 +01:00
afa1a6d2b3
Don't try to use routes when called from cli
2013-02-07 17:53:38 +01:00
0efcf33e2f
Merge pull request #1451 from eMerzh/fix_1065
...
Add Redirect to getUrlContent fix #1065
2013-02-07 06:27:58 -08:00
35bd7a400d
[tx-robot] updated from transifex
2013-02-07 00:11:04 +01:00
223f538bb8
Merge pull request #1500 from chriskoch/patch-1
...
Update lib/public/util.php
2013-02-06 13:00:10 -08:00
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
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
ae8cfe6569
Added comments
2013-02-06 17:43:03 +00:00
a4d3cc798f
Correct lib/public/contacts.php tests
2013-02-06 17:37:47 +01:00
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
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
9e08f85c5e
port already approved bugfix to master, https://github.com/owncloud/core/pull/1479
2013-02-06 14:19:32 +01:00
9d73e7eb1e
let the user change his display name, if supported by the back-end
2013-02-06 11:38:03 +01:00
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
10ea45c916
fix failing test cases due to wrong typing
2013-02-05 20:19:54 +01:00
5221ee0c5a
offer change password only when the action is supported by the user backend
2013-02-05 19:26:00 +01:00
e6400b3059
Merge pull request #1474 from samtuke/master
...
Improvements to files_encryption
2013-02-05 09:58:35 -08:00
77369d8164
disable error handler while running phpunit
2013-02-05 16:44:02 +01:00
50faddfa40
Minor improvement to comments
2013-02-05 15:37:40 +00:00
9446017821
spell check
2013-02-05 16:24:40 +01:00
1fd807a7d6
pass the argument to the ctor
...
Conflicts:
lib/files/storage/temporary.php
2013-02-05 16:24:11 +01:00
ac11c842e6
setlocale test is pointless on Windows
2013-02-05 15:46:55 +01:00
d8084c132e
new function \OC_Util::runningOnWindows()
2013-02-05 15:43:12 +01:00
fd90b82acd
Merge github.com:owncloud/core
2013-02-05 13:44:45 +00:00
98f37f4bed
[tx-robot] updated from transifex
2013-02-05 00:20:29 +01:00
c5079a63a8
Add Redirect to getUrlContent fix #1065
2013-02-04 23:38:10 +01:00
6e5f211ad1
Merge pull request #1449 from owncloud/fixing-namespace-local-storage-master
...
fixing namespace in local storage
2013-02-04 12:52:56 -08:00
3b8c071df4
Merge pull request #1234 from owncloud/fix-issue-192
...
Fix sharing issue with collection and children mismatches
2013-02-04 11:52:20 -08:00
02e6adfdb3
fixing namespace
2013-02-04 20:49:01 +01:00
a7e62b0366
Merge pull request #1444 from owncloud/writable-temp-folder-for-session-data-master
...
in case file based session handling in enabled - we need to make sure th...
2013-02-04 11:11:15 -08:00
f04a91bd60
Merge pull request #1445 from owncloud/CSP_font
...
Allow loading of external fonts
2013-02-04 10:36:43 -08:00
5fcb35efd6
Also allow local files
2013-02-04 18:43:26 +01:00
bb90b0ee6e
Allow the loading of local font files embedded via data:
2013-02-04 18:38:16 +01:00
8de0f96a24
Allow loading of external fonts
...
Required by several applications like our pdf viewer
2013-02-04 17:51:52 +01:00
301afac291
Merge pull request #1427 from TheSFReader/master
...
The mimetype/mimepart need to be readable, even from searchByMime
2013-02-04 06:44:40 -08:00
0a113600f7
in case file based session handling in enabled - we need to make sure the configured folder is writable
2013-02-04 15:32:01 +01:00
6058c2f734
we get best results regarding mime type detection if we use fileinfo - let's tell the admin about that
2013-02-04 15:04:26 +01:00
814369e0cd
Merge pull request #1436 from owncloud/cache_check_path
...
Cache: check for invalid paths in getFileInfo/getDirectoryContent
2013-02-04 05:51:34 -08:00
7c33d0a5a7
Cache: fix copy-paste errors
2013-02-04 13:28:31 +01:00
f7258cc5e8
Merge pull request #1423 from owncloud/getowner
...
Add getOwner to Filesystem and View classes
2013-02-04 03:08:13 -08:00
80dd8d7802
Cache: check for invalid paths in getFileInfo/getDirectoryContent
2013-02-03 23:34:27 +01:00
3def7f8187
Make fileblacklist configurable
2013-02-03 23:03:06 +01:00
d03155a8d5
translate the mimtype/mimepart to readable in the searchByMime function
2013-02-03 11:06:26 +01:00
a3b922763e
Merge pull request #1416 from herbrechtsmeier/set_include_path_early
...
initPaths: set include path before any owncloud function is called
2013-02-03 00:25:21 -08:00
743c330f03
Merge pull request #1422 from TheSFReader/master
...
Correct the Cache Scanner so that it doesn't try and scan subdirs of a non-dir path when renaming
2013-02-03 00:24:49 -08:00
6093d961a0
Add getOwner to Filesystem and View classes
2013-02-02 18:50:40 -05:00
2936140838
[tx-robot] updated from transifex
2013-02-03 00:06:15 +01:00
blizzz
Robin Appelman
Bart Visscher
Thomas Müller
Frank Karlitschek
Lukas Reschke
Sam Tuke
Christian Koch
Björn Schießle
Brice Maron
TheSFReader
Michael Gapczynski