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
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
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
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
Arthur Schiwon
5221ee0c5a
offer change password only when the action is supported by the user backend
2013-02-05 19:26:00 +01:00
Lukas Reschke
e6400b3059
Merge pull request #1474 from samtuke/master
...
Improvements to files_encryption
2013-02-05 09:58:35 -08:00
Thomas Mueller
77369d8164
disable error handler while running phpunit
2013-02-05 16:44:02 +01:00
Sam Tuke
50faddfa40
Minor improvement to comments
2013-02-05 15:37:40 +00:00
Thomas Mueller
9446017821
spell check
2013-02-05 16:24:40 +01:00
Thomas Mueller
1fd807a7d6
pass the argument to the ctor
...
Conflicts:
lib/files/storage/temporary.php
2013-02-05 16:24:11 +01:00
Thomas Mueller
ac11c842e6
setlocale test is pointless on Windows
2013-02-05 15:46:55 +01:00
Thomas Mueller
d8084c132e
new function \OC_Util::runningOnWindows()
2013-02-05 15:43:12 +01:00
Sam Tuke
fd90b82acd
Merge github.com:owncloud/core
2013-02-05 13:44:45 +00:00
Jenkins for ownCloud
98f37f4bed
[tx-robot] updated from transifex
2013-02-05 00:20:29 +01:00
Brice Maron
c5079a63a8
Add Redirect to getUrlContent fix #1065
2013-02-04 23:38:10 +01:00
Thomas Müller
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
Thomas Müller
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
Thomas Mueller
02e6adfdb3
fixing namespace
2013-02-04 20:49:01 +01:00
Thomas Müller
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
Thomas Müller
f04a91bd60
Merge pull request #1445 from owncloud/CSP_font
...
Allow loading of external fonts
2013-02-04 10:36:43 -08:00
Lukas Reschke
5fcb35efd6
Also allow local files
2013-02-04 18:43:26 +01:00
Lukas Reschke
bb90b0ee6e
Allow the loading of local font files embedded via data:
2013-02-04 18:38:16 +01:00
Lukas Reschke
8de0f96a24
Allow loading of external fonts
...
Required by several applications like our pdf viewer
2013-02-04 17:51:52 +01:00
Thomas Müller
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
Thomas Mueller
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
Thomas Mueller
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
Thomas Müller
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
Robin Appelman
7c33d0a5a7
Cache: fix copy-paste errors
2013-02-04 13:28:31 +01:00
Thomas Müller
f7258cc5e8
Merge pull request #1423 from owncloud/getowner
...
Add getOwner to Filesystem and View classes
2013-02-04 03:08:13 -08:00
Robin Appelman
80dd8d7802
Cache: check for invalid paths in getFileInfo/getDirectoryContent
2013-02-03 23:34:27 +01:00
Lukas Reschke
3def7f8187
Make fileblacklist configurable
2013-02-03 23:03:06 +01:00
TheSFReader
d03155a8d5
translate the mimtype/mimepart to readable in the searchByMime function
2013-02-03 11:06:26 +01:00
Thomas Müller
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
Thomas Müller
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
Michael Gapczynski
6093d961a0
Add getOwner to Filesystem and View classes
2013-02-02 18:50:40 -05:00
Jenkins for ownCloud
2936140838
[tx-robot] updated from transifex
2013-02-03 00:06:15 +01:00
TheSFReader
42d59d5a16
Remove a warning by making sure the renamed file is a dir before trying and opening it
2013-02-02 23:18:29 +01:00
Robin Appelman
ed4130474a
Dav: update etag in filecache when doing a PROPSET
2013-02-02 18:26:27 +01:00
Robin Appelman
c61c98cbef
Dav: don't overwrite etag from filecache with old etag from properties table
2013-02-02 15:44:05 +01:00
herbrechtsmeier
37e6ac9a2a
initPaths: set include path before any owncloud function is called
...
Ensure we can find basic owncloud classes while detecting the owncloud
paths in function initPaths by add OC::$SERVERROOT . '/lib' to include
path before any owncloud function is called.
This fix a bug with XAMPP that cannot find the class OC_Config in
function OC_Request::scriptName when called from function
OC_Base::initPaths.
2013-02-02 12:07:18 +01:00
Jenkins for ownCloud
b29b55a332
[tx-robot] updated from transifex
2013-02-02 00:08:15 +01:00
Frank Karlitschek
03c18a6186
Merge pull request #1413 from owncloud/enable_removing_search_providers
...
add function to remove a search provider
2013-02-01 10:34:39 -08:00
Jörn Friedrich Dreyer
0c85250380
add function to remove a search provider
2013-02-01 19:21:54 +01:00
Bart Visscher
2488a495c6
Merge pull request #1384 from owncloud/upgrade_fix
...
Check for upgrade/maintance mode before trying to load an app
2013-02-01 07:12:06 -08:00
Thomas Müller
b20529ee44
Merge pull request #1171 from owncloud/move-datadirectory-checks
...
Move data directory permission checks after data directory existence checks
2013-01-31 14:54:46 -08:00
Thomas Müller
caec0c476d
Merge pull request #1287 from owncloud/ocs_xml_attributes
...
API: Treat array keys starting with '@' as XML attributes
2013-01-31 14:39:31 -08:00
Thomas Müller
317261d6df
Merge pull request #1099 from herbrechtsmeier/ssl-proxy
...
add multiple domains reverse SSL proxy support
2013-01-31 14:01:32 -08:00
Brice Maron
17f94de19b
Case insensitive Lang Detection fix #1328
2013-01-31 22:37:46 +01:00
herbrechtsmeier
7747f49263
add SSL proxy support
...
Add support for a reverse proxy that only forwards SSL connections
unencrypted to the web server.
This patch allows to detect the reverse proxy via regular expression for
the remote IP address and conditional overwrite the host name, protocol
and web root.
2013-01-31 18:43:30 +01:00
Stefan Herbrechtsmeier
ab2b79cda6
add multiple domains reverse proxy support
...
Add support for a reverse proxy that handles multiple domains via different
web roots (http[s]://proxy.tld/domain.tld/owncloud).
As the reverse proxy web root is transparent for the web server the
REQUEST_URI and SCRIPT_NAME need manual adjustments. This patch replace
the direct use of this _SERVER variables with function calls and extend
this functions to overwrite the web root. Additionally it adds a Sabre
request backend that extends the Sabre_HTTP_Request to use the same
functions.
2013-01-31 18:42:31 +01:00
Lukas Reschke
b471177439
Merge pull request #1379 from owncloud/improved_appsmanagement
...
Improved appsmanagement
2013-01-31 08:30:55 -08:00
Sam Tuke
31e723a907
Merge github.com:owncloud/core
...
Conflicts:
lib/public/share.php
2013-01-31 16:30:37 +00:00
Jenkins for ownCloud
209d599ec5
[tx-robot] updated from transifex
2013-01-31 17:05:21 +01:00
Frank Karlitschek
f7d281af67
just return "true" for now
2013-01-31 12:24:10 +01:00
Björn Schießle
77765bd967
remove some left over comments
2013-01-31 12:17:23 +01:00
Björn Schießle
ab255e8bb6
add missing brackets
2013-01-31 12:12:39 +01:00
Björn Schießle
9a19c0af4b
search for display name and uid (with no display name) since it is possible that not all users have a seperate display name
2013-01-31 12:09:42 +01:00
Thomas Mueller
e8b423f666
style fixes
2013-01-31 10:30:13 +01:00
Thomas Mueller
665bb41c1f
style fixes
2013-01-31 10:27:02 +01:00
Frank Karlitschek
5112dac102
remove spaces
2013-01-31 10:00:42 +01:00
Robin Appelman
057920b165
Still load js files in maintance mode
2013-01-30 23:05:44 +01:00
Robin Appelman
f452d2d0c4
Check for upgrade/maintance mode before trying to load an app
2013-01-30 22:55:33 +01:00
Robin Appelman
6043789394
Bumb version number for displayname db upgrade
2013-01-30 19:37:02 +01:00
Robin Appelman
207aa22d12
merge master into filesystem
2013-01-30 19:24:24 +01:00
Robin Appelman
af3b0e30ed
Cache: don't insert duplicated during upgrade
2013-01-30 19:19:19 +01:00
Frank Karlitschek
66cab77b6d
merge master
...
Merge branch 'master' into improved_appsmanagement
Conflicts:
settings/apps.php
settings/templates/apps.php
2013-01-30 14:36:17 +01:00
irgsmirx
0bce22966c
Update lib/base.php
...
Correction of typo "locate" -> "locale".
2013-01-30 14:27:08 +01:00
Frank Karlitschek
389c4e8415
mark recommended apps. server part not yet fully implemented
2013-01-30 13:39:53 +01:00
root
3fa4b3abff
apps updater is now working
2013-01-30 12:08:14 +01:00
Jörn Friedrich Dreyer
a6040d0cc7
Merge pull request #1308 from TheSFReader/master
...
Changed the linkTo function (from Helper class) to get rid of an unnecessary (and potentially non conform) leading '&' character when adding arguments
2013-01-30 02:37:11 -08:00
Jenkins for ownCloud
68266e70f2
[tx-robot] updated from transifex
2013-01-30 00:25:41 +01:00
Lukas Reschke
250c565d2b
Merge pull request #1360 from owncloud/display_name
...
introduction of display names
2013-01-29 14:05:54 -08:00
Björn Schießle
6659798197
only change display name if the display name from the current user was changed; add correct display name to new user
2013-01-29 22:33:46 +01:00
Björn Schießle
007bddceba
version dump to trigger db update
2013-01-29 21:04:28 +01:00
Björn Schießle
ebc3d1b2d7
remove dubug value
2013-01-29 21:01:59 +01:00
Arthur Schiwon
79c309da83
Typo
2013-01-29 20:42:21 +01:00
Arthur Schiwon
59bb9931df
Adjust user interface to additions around displayName Handling
2013-01-29 20:09:41 +01:00
Thomas Mueller
825cdf8560
add support for apps to register alternative login methods
...
below the standard login a list of icons/button will be displayed
2013-01-29 17:28:08 +01:00
Michael Gapczynski
ca4c006d5a
Make zip downloads use actual folder names, fix spelling mistakes
2013-01-28 23:51:35 -05:00
Jenkins for ownCloud
8c4931a645
[tx-robot] updated from transifex
2013-01-29 00:06:20 +01:00
Robin Appelman
74f6f85628
merge master into filesystem
2013-01-28 19:37:58 +01:00
Robin Appelman
06c1c35ac9
Fix phpdoc
2013-01-28 19:08:30 +01:00
Björn Schießle
590c4aa710
search display name instead of uid; fix key/value order for array access
2013-01-28 15:58:40 +01:00
Björn Schießle
c00b66fe5b
implement DisplayNamesInGroup for database back-end
2013-01-28 15:47:57 +01:00
Robin Appelman
232cc3211b
add oc:// streamwrapper to provide access to ownCloud's virtual filesystem
2013-01-28 15:35:30 +01:00
Robin Appelman
c9c919da57
Move streamwrappers to seperate files and put them in a namespace
2013-01-28 15:34:15 +01:00
Björn Schießle
e6cc0cd08a
implement display names for the database back-end
2013-01-28 15:07:31 +01:00
Lukas Reschke
99ec26578a
Merge pull request #1313 from owncloud/updater-CSP
...
Make update page with CSP compatible
2013-01-28 05:43:47 -08:00
Björn Schießle
70c3ab3c53
update the display name for the database back-end
2013-01-28 14:23:15 +01:00
Björn Schießle
e0f2ed2757
interface and API to change display names
2013-01-28 14:09:11 +01:00
Björn Schießle
022a7b13b8
prepare user table to show and edit display names
2013-01-28 13:12:44 +01:00
Björn Schießle
996b5cf368
change order, key -> uid and value -> display name, this way it is also possible to have non-unique display names
2013-01-28 13:10:54 +01:00
Thomas Müller
857b15db37
Merge pull request #1318 from j-ed/master
...
added parameter mail_smtpauthtype to set SMTP authentication type.
2013-01-28 01:42:46 -08:00
Thomas Mueller
1d44a99ebb
Merge branch 'master' into updater-CSP
...
Conflicts:
core/templates/update.php
2013-01-28 09:57:24 +01:00
Thomas Müller
31d83fddc4
Merge pull request #1321 from owncloud/csp-fixes
...
Files: CSP fixes
2013-01-28 00:29:46 -08:00
Robin Appelman
bca5ce724e
Merge branch 'master' into filesystem
2013-01-28 02:35:51 +01:00
Robin Appelman
3e59a87153
Filesystem: use the updated Mount::findById in getPath to ensure we get the correct path if the storage is also mounted outside the view
2013-01-28 01:02:04 +01:00
Robin Appelman
577e3b11d7
Filesystem: return all matching mounts in Mount::findById
2013-01-28 00:59:43 +01:00
hkjolhede
77763fb856
Update lib/filestorage/common.php
...
Small cleanup
2013-01-27 16:07:21 +01:00
Robin Appelman
4cae141673
Filesystem: also add getPath to \OC\Filesystem
2013-01-27 00:18:15 +01:00
Robin Appelman
17bcea1585
Filesystem: add View->getPath to the cache api
2013-01-27 00:13:50 +01:00
Robin Appelman
9e2a066c7b
Cache: add function to get storage id and internal path of a file by id
2013-01-27 00:13:50 +01:00
Robin Appelman
69f11151e9
Filesystem: add Mount::findById
2013-01-27 00:13:49 +01:00
Jenkins for ownCloud
00a28062e1
[tx-robot] updated from transifex
2013-01-27 00:06:21 +01:00
TheSFReader
9c7a18044d
Merge remote-tracking branch 'refs/remotes/upstream/master'
2013-01-26 23:19:40 +01:00
Michael Gapczynski
03b947e3ec
Don't check for updates for sub storages, these scans should be done in the background
2013-01-26 16:11:35 -05:00
Henrik Kjölhede
b1b2eafa50
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/files_external/lib/config.php
2013-01-26 21:51:18 +01:00
Robin Appelman
f25db779d9
Filesystem: move mount management to it's own class
2013-01-26 21:44:33 +01:00
Michael Gapczynski
7237ebf08b
Fix OC_Helper and change deprecated methods
2013-01-26 15:16:53 -05:00
hkjolhede
2fa3efd697
Update lib/filestorage/common.php
...
Added function to clean a path
2013-01-26 19:44:09 +01:00
Robin Appelman
930b9b9cd0
merge master into filesystem
2013-01-26 18:49:45 +01:00
Lukas Reschke
c9e25d3fab
Merge pull request #1320 from owncloud/implements-1316-master
...
lookup for OCA classes in all apps folders
2013-01-26 05:20:15 -08:00
Lukas Reschke
7f0a3018b6
Fix undefined variable
2013-01-26 13:46:00 +01:00
Thomas Müller
276d98b9dd
Merge pull request #1059 from owncloud/fixing-998-master
...
Fixing 998 master
2013-01-26 04:15:40 -08:00
Thomas Mueller
2cc77759aa
lookup for OCA classes in all apps folders
2013-01-26 12:45:50 +01:00
j-ed
93834b78a1
Update lib/mail.php
...
added parameter mail_smtpauthtype to set SMTP authentication type.
2013-01-26 12:09:54 +01:00
Jenkins for ownCloud
af4411e33d
[tx-robot] updated from transifex
2013-01-26 00:10:07 +01:00
Lukas Reschke
a65410f23c
Remove the CSP header for Firefox
...
https://bugzilla.mozilla.org/show_bug.cgi?id=737064 *gnarf*
2013-01-25 21:57:51 +01:00
Lukas Reschke
dbc13cf6ee
Move update inline JS
2013-01-25 19:18:16 +01:00
Lukas Reschke
7f49d35930
Move checkMaintenance and checkUpgrade
...
This is needed to ensure that the routing and linkTo() function for CSP
are available.
2013-01-25 19:15:02 +01:00
Björn Schießle
a606e8d944
use display name to show share_width and owner information
2013-01-25 17:40:23 +01:00
TheSFReader
2aead5727e
Merge remote-tracking branch 'refs/remotes/upstream/master'
2013-01-25 17:15:02 +01:00
TheSFReader
9f5847b739
Simplify the code and remove a first unnecessary (and non conform) '&' character when there are pending arguments
2013-01-25 17:02:44 +01:00
Lukas Reschke
047f1988c3
Merge branch 'master' into no-inline-js
2013-01-25 16:11:07 +01:00
Lukas Reschke
0d2a58bc5d
Initialize router also if ownCloud isn't installed
2013-01-25 14:57:52 +01:00
Lukas Reschke
e5cc5a0a2d
Allow the loading of external images
2013-01-25 14:26:14 +01:00
Björn Schießle
b4291f1e8e
allow to get the display name from an abitrary user
2013-01-25 13:00:17 +01:00
Björn Schießle
4271430e60
get all display names from users in a given group
2013-01-25 11:48:03 +01:00
Björn Schießle
9bb8e05839
get all display names
2013-01-25 11:05:00 +01:00
Jenkins for ownCloud
6832dddf39
[tx-robot] updated from transifex
2013-01-25 00:05:56 +01:00
Björn Schießle
2fee1208ef
add display name to title instead if login-ID
2013-01-24 15:49:23 +01:00
Björn Schießle
d16574f070
new branch which introduces display names
...
first commit with some infrastructure code
2013-01-24 13:07:59 +01:00
Tom Needham
b26279546c
Simpler method for getting the first char
2013-01-24 10:49:48 +00:00
Tom Needham
d89be72972
Remove some whitespace
2013-01-24 10:40:47 +00:00
Tom Needham
02f8c941f4
API: If key begins with '@' treat it as an xml attribute
2013-01-24 10:39:33 +00:00
Thomas Müller
1dac2ba496
Merge pull request #1286 from owncloud/ocs_api
...
Check that external api methods return instances of OC_OCS_Result
2013-01-24 02:37:40 -08:00
Lukas Reschke
f9a9fc5670
Merge pull request #1265 from j-ed/master
...
add additional mail_smtp.. parameters to fix possible SMTP connection problems.
2013-01-24 00:11:03 -08:00
Tom Needham
8f9d3cd01d
Code style update
2013-01-23 23:39:29 +00:00
Jenkins for ownCloud
3ff32eba25
[tx-robot] updated from transifex
2013-01-24 00:07:38 +01:00
Sam Tuke
14d0903a28
Merge branch 'master' of github.com:owncloud/core
2013-01-23 12:52:53 +00:00
Lukas Reschke
293e7bdcf0
Notice about changing the standard policy
2013-01-23 13:44:43 +01:00
Lukas Reschke
0517465f4d
Allow admins to change the CSP policy in the config file
2013-01-23 13:42:52 +01:00
Thomas Mueller
b4c3dd84b4
update to jquery-ui 1.10.0
2013-01-23 11:37:52 +01:00
Lukas Reschke
c8bbbb48d3
Merge master...
2013-01-23 11:30:40 +01:00
Jenkins for ownCloud
c986dbe573
[tx-robot] updated from transifex
2013-01-23 00:06:18 +01:00
Michael Gapczynski
9eecb91338
Merge pull request #1113 from owncloud/fix-issue-1085
...
Fix rendering of database connection error page
2013-01-22 14:38:44 -08:00
Robin Appelman
f858381775
merge master into filesystem
2013-01-22 23:27:04 +01:00
Thomas Müller
ec8609fa21
Merge pull request #1259 from TheSFReader/master
...
Add two specific mimetype extensions (ebooks): for epub and mobi files
2013-01-22 14:06:50 -08:00
Robin Appelman
9a1f65aab1
Some style fixes
2013-01-22 20:58:09 +01:00
Robin Appelman
7330fcf5e8
Cache: make mounts overwrite existing folders, prevents duplicate entries
2013-01-22 20:57:15 +01:00
Sam Tuke
aa648fca75
Merge branch 'master' into files_encryption
...
Conflicts:
apps/files_encryption/templates/settings.php
2013-01-22 17:31:05 +00:00
Sam Tuke
619780a67d
Merge branch 'master' into files_encryption
2013-01-22 16:50:20 +00:00
j-ed
df6ba6955d
Update lib/mail.php
...
Added three additional mail_smtp.. parameters.
- mail_smtpdebug - enable debug messages to analyse SMTP problems.
- mail_smtptimeout - set SMTP timeout which is set to 10s by
default and this is sometimes to short especially if a malware/
spam scanner is used.
- mail_smtpsecure - force secure SMTP connections.
2013-01-22 14:13:24 +01:00
Lukas Reschke
bd5ff29716
Merge branch 'master' into no-inline-js
2013-01-22 11:50:33 +01:00
Lukas Reschke
351d206dd3
Allow eval() and send headers for legacy browsers
...
The blocking of eval() seems to have problems with JQuery 1.7.2 - let's allow it for now and disable it in the future.
2013-01-22 08:09:01 +01:00
Michael Gapczynski
5136f6d818
Make database connection error messages less verbose
2013-01-21 22:53:32 -05:00
Lukas Reschke
3ffbaf4795
Allow iframes to external domains
2013-01-22 00:30:09 +01:00
Robin Appelman
f2d0eeae83
Merge branch 'master' into filesystem
2013-01-22 00:19:44 +01:00
Robin Appelman
8ede3290ae
Cache: add database indexes for mimetype and mimepart
2013-01-21 22:31:44 +01:00
Lukas Reschke
30274ee33e
Move to OC_App
2013-01-21 22:18:11 +01:00
Lukas Reschke
a29f9f90ab
Indentation
2013-01-21 22:17:48 +01:00
Robin Appelman
42a1a17a30
Cache: return non numberic storage id
2013-01-21 22:01:22 +01:00
Lukas Reschke
0c59074eeb
Correct copy paste fail
2013-01-21 20:46:42 +01:00
Frank Karlitschek
a27f92a17a
we are getting closer. updating is not working yet.
2013-01-21 20:40:23 +01:00
Lukas Reschke
8ca78fcf3f
Move requesttoken to oc-requesttoken.js
2013-01-21 20:24:18 +01:00
Thomas Mueller
d58cee2f76
returning http status code 503 in case connecting to the database failed
2013-01-21 14:57:33 +01:00
Jenkins for ownCloud
aede26d996
[tx-robot] updated from transifex
2013-01-21 00:05:34 +01:00
Lukas Reschke
af8c193605
Disallow inline JS
2013-01-20 23:30:16 +01:00
Thomas Mueller
dea77b7610
cached queries need to be reset on schema change because they become invalid
...
fixes: https://github.com/owncloud/apps/issues/468
2013-01-20 22:46:26 +01:00
Lukas Reschke
967b7947a1
Add the default-src
2013-01-20 12:19:09 +01:00
Lukas Reschke
c82d6e5153
Add CSP header
2013-01-20 12:06:33 +01:00
Robin Appelman
4c05661875
Merge branch 'filesystem' of github.com:owncloud/core into filesystem
2013-01-20 03:11:50 +01:00
Robin Appelman
83d6221322
merge master into filesytem
2013-01-20 03:11:04 +01:00