33ee2e2f10
[tx-robot] updated from transifex
2013-04-12 02:11:02 +02:00
2180a4c420
-L10N: cache the result of findLanguage
2013-04-12 00:58:14 +02:00
121c8bd303
Merge pull request #2747 from owncloud/cache-contructed-cache-objects
...
Remember the contructed OC\Files\Cache\* classes in OC\Files\Storage\Com...
2013-04-10 08:09:09 -07:00
526076f2e0
Merge pull request #2781 from owncloud/fix-2592
...
Correct undefined variable in post_shared hook, fixes #2592
2013-04-10 05:53:50 -07:00
258ad38fd3
Fix touch for creating new files
2013-04-10 13:48:24 +02:00
c06bc81c79
[tx-robot] updated from transifex
2013-04-10 02:09:39 +02:00
8db76ef7d2
Merge pull request #2147 from eMerzh/split_config
...
[OC6] Allow to load splited config files
2013-04-09 09:56:16 -07:00
352af6005f
Merge pull request #2801 from OpenLarry/patch-1
...
fixes #2679 - 5.0.3 Renaming -> Nothing happens
2013-04-09 03:40:40 -07:00
16b513e4dc
added correct check for gd and check for php-intl
2013-04-09 12:22:55 +02:00
6fc0319e1b
Merge pull request #2754 from owncloud/cookie-path
...
Just send the cookies in the ownCloud directory
2013-04-09 02:36:20 -07:00
8cd4cadb22
Merge pull request #2799 from owncloud/add-mimetype-filter-to-getdirectorycontent
...
Add mimetype filter to getDirectoryContent function
2013-04-09 02:25:40 -07:00
2d489a94c6
Merge pull request #2797 from owncloud/fixing-2792-master
...
fixes #2792 - only touch if writable
2013-04-09 01:50:05 -07:00
5bb248efd6
Merge pull request #2764 from owncloud/remove-limit-from-count-query
...
Remove wrong limit parameter from count query in compatibility function
2013-04-09 00:19:09 -07:00
74f90eabe4
Merge pull request #2798 from owncloud/fixing-2789-master
...
fixes #2789 - no internet connectivity check if there is non on purpose
2013-04-09 00:18:13 -07:00
5ef389610f
[tx-robot] updated from transifex
2013-04-09 02:14:02 +02:00
d51a94161e
Initialize collectionTypes variable as false
2013-04-08 17:46:52 -04:00
49313b334a
fixes #2679
2013-04-09 00:26:16 +03:00
89818e279b
Merge pull request #2785 from owncloud/vobject_stringproperty
...
Add OC\VObject\StringProperty. Partial fix for owncloud/apps#762
2013-04-08 14:23:38 -07:00
46722d8282
fixes #2789 - no internet connectivity check if there is non on purpose
2013-04-08 22:41:20 +02:00
a07a8794b8
Add mimetype filter to getDirectoryContent function
2013-04-08 22:40:03 +02:00
d069ee8a8b
fixes #2792 - only touch if writable
2013-04-08 22:22:49 +02:00
ae9548bc6e
Add OC\VObject\StringProperty. Partial fix for owncloud/apps#762
2013-04-08 14:57:43 +02:00
ccde0212b1
[tx-robot] updated from transifex
2013-04-08 02:18:28 +02:00
e704bcd96e
Correct undefined variable in post_shared hook, fixes #2592
2013-04-07 20:05:54 -04:00
a8b366e612
Merge pull request #2610 from owncloud/vcategories_purge_multi
...
Allow purging multiple objects from category index table.
2013-04-06 09:48:03 -07:00
142b020d38
Remove wrong limit parameter from count query in compatibility function
2013-04-06 17:58:47 +02:00
fa8214ecc9
Use the MDB2 function to get the count result
2013-04-06 15:38:30 +02:00
e91e8b1170
Merge pull request #2751 from Borkason/patch-1
...
Fix indentation in util.php.
2013-04-06 03:01:05 -07:00
fbffbe0170
Juse send the cookies in the ownCloud directory
2013-04-06 00:16:52 +02:00
6798b6dc34
[tx-robot] updated from transifex
2013-04-06 00:05:32 +02:00
d6253696cb
Fix indentation in util.php.
2013-04-05 21:49:57 +03:00
3213c47188
Use count SQL to check for user existance
2013-04-05 17:23:36 +02:00
50fb13c861
Remember the contructed OC\Files\Cache\* classes in OC\Files\Storage\Common
2013-04-05 17:20:08 +02:00
c745bfa821
[tx-robot] updated from transifex
2013-04-05 00:22:48 +02:00
f944ac9cba
Add a name to the version parameter
...
Without an additional name it's nearly impossible to write positive security model based rules since the parameter name isn't defined.
2013-04-05 00:33:05 +03:00
d048ff719d
Remove redundant line
2013-04-04 14:10:34 +02:00
52fba43297
Merge pull request #2708 from owncloud/dont_expose_installatio
...
Don't expose the server installation time
2013-04-04 00:48:55 -07:00
2f19629407
Merge pull request #2706 from owncloud/random_is_random_and_not_time
...
Use a more random source...
2013-04-04 00:48:21 -07:00
877ff9358f
Don't expose the server installation time
2013-04-04 01:33:18 +03:00
37cb79155e
*gnaaarf*
2013-04-04 01:27:13 +03:00
cbece8b12f
[tx-robot] updated from transifex
2013-04-04 00:06:51 +02:00
6645a54cac
Use random bytes instead of time
...
Thanks for the heads-up @VicDeo :-)
2013-04-04 01:05:44 +03:00
e75406e712
PostreSQL compatibility, fixes #2666
2013-04-03 23:56:59 +02:00
ba7c0cf548
Use a more random source...
2013-04-04 00:56:34 +03:00
7eef643600
Merge pull request #2594 from owncloud/fix_part_file_ignoring
...
Fix part file ignoring
2013-04-03 01:38:18 -07:00
10e37e1553
[tx-robot] updated from transifex
2013-04-03 00:04:02 +02:00
9e29d2845a
[tx-robot] updated from transifex
2013-04-01 00:04:02 +02:00
63804f4153
Change logQuery from define() to OC::Config
2013-03-30 22:36:55 +01:00
2b8cf4959a
Log Queries when we add a log query flag
2013-03-30 17:40:46 +01:00
73dd54c962
Don't try to call a an array :-P
2013-03-30 16:35:13 +01:00
3cbfacb439
Merge branch 'master' into files_encryption
2013-03-29 15:59:54 +01:00
66d7cc4c74
Merge pull request #2584 from mrtorrent/fix_instanceid_format
...
Fix instanceid format to prevent session loop
2013-03-29 07:26:07 -07:00
a56abd3f9b
Typehint and check $ids parameter.
2013-03-29 14:54:08 +01:00
ec980a8a25
Merge pull request #2585 from mrtorrent/fix_install_app_version_check
...
Fix install app version check
2013-03-29 05:38:58 -07:00
d838a3b33f
Allow purging multiple objects from category index table.
2013-03-29 05:51:41 +01:00
ff6f52d5ec
Merge branch 'master' into files_encryption
...
Conflicts:
apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/keymanager.php
2013-03-28 18:39:12 +01:00
aa103bd5b3
supress write hook for .part files
2013-03-28 12:15:27 +01:00
4a70315ad1
ignore files in scanFile instead of scan to catch all occurences.
2013-03-28 12:15:27 +01:00
78c694b6ee
Cache: on equal mtime also for equal size before keeping ETag, at least makes Unit Test happy
2013-03-27 19:20:08 +01:00
3d29a82150
Cache: Do not overwrite ETag when file did not change
2013-03-27 19:19:40 +01:00
2a2d409733
Only prepare an SQL statement once.
2013-03-27 19:19:16 +01:00
1d676fb0e6
Add PHPDoc
2013-03-27 19:18:58 +01:00
d9e07ca60a
Adjust to Icewind's fix
2013-03-27 19:18:34 +01:00
1a874b9106
Cache: fix property path for getting legacy etag
2013-03-27 19:18:13 +01:00
19c7d9c3dc
Port Icewind's fix I
2013-03-27 19:17:49 +01:00
5fc276602a
Change LIMIT in DB query respectively remove where not necessary
2013-03-27 19:13:14 +01:00
e2afd0cb42
Upgrade FileCache on ownCloud upgrade for all users with files
2013-03-27 19:12:28 +01:00
9d25058905
Performance: prepare queries only once
2013-03-27 19:12:04 +01:00
7839ec5093
Fix lost ETag on Cache Upgrade
2013-03-27 19:11:35 +01:00
8dd7fa8507
Use isAppVersionCompatible in app installer
2013-03-27 10:16:05 +00:00
0c666cb764
[tx-robot] updated from transifex
2013-03-27 00:11:05 +01:00
93a6ed3dab
Ensure instanceid contains a letter
...
instanceid is generated by uniqid() and then used as the
session_name. Because session_name requires at least one letter
and uniqid() does not guarantee to provide that, in the case that
uniqid() generates a string of only digits, the user will be stuck
in an infinite login loop because every request will generate a
new PHP session.
2013-03-26 21:49:32 +00:00
53fd122b89
Minor typo, coding style fixes for OC_Util::getInstanceId
2013-03-26 21:48:49 +00:00
74852243e2
Merge pull request #2567 from owncloud/fix_insertIfNotExist
...
Properly prepare insertIfNotExist queries.
2013-03-26 08:59:10 -07:00
d49e8ffb5e
Merge pull request #2568 from itheiss/master
...
Implement setting custom domainname for getDefaultEmailAddress
2013-03-26 02:50:11 -07:00
d16dd1ad2a
listen to touch hook to update the mtime after sync
2013-03-26 09:42:55 +01:00
5b66b317b1
And removing an irrelevant comment ;)
2013-03-26 01:01:38 +01:00
5f53145eb0
Double quotes to backticks
2013-03-26 01:00:15 +01:00
9d618005b6
Missing backticks. Thx @Raydiation :)
2013-03-26 00:24:08 +01:00
5e81016392
D'oh, why concatenate static strings.
2013-03-26 00:21:57 +01:00
07236800a7
Quote key for SQLite.
2013-03-26 00:19:23 +01:00
1c3f5ba6ef
Properly prepare insertIfNotExist queries.
2013-03-25 23:59:34 +01:00
0e55b61169
Improve phpdoc for the filecache
2013-03-24 02:06:50 +01:00
bbeb657c03
Merge pull request #2454 from owncloud/fixing-file-mapper-ext-master
...
Fixing file mapper ext master
2013-03-23 05:34:25 -07:00
3d2acb5389
Merge pull request #2446 from owncloud/fixing-safe-mode-check-master
...
more accurate safe_mode check - refs #2258
2013-03-23 05:33:32 -07:00
6326a3a9f7
Some improvements for the Storage phpdoc
2013-03-23 00:10:30 +01:00
568c256aff
Fix #2499
...
The mail domain can now be configured in config.php and get´s used in function getDefaultEmailAddress.
e.g. 'mail_domain' => 'example.com'
2013-03-22 10:07:06 +01:00
e5f8acf4c0
Add phpdoc documentation to the Storage interface
2013-03-21 13:11:52 +01:00
ad2d222466
Merge pull request #2447 from owncloud/fix_namespace_in_autoloader
...
Remove leading and trailing backslashes in classname. Ref #2310
2013-03-21 00:46:09 -07:00
033c94d076
fixed xsendfile zip generation race condition
2013-03-20 22:37:02 +01:00
3e9ea6d13b
Remove space before parethesis
2013-03-20 16:54:06 +04:00
28d2379c43
initial fix for MSSQL
2013-03-19 19:17:40 +01:00
6f13a35513
documentation added and trying to fix minor code issues
2013-03-19 18:52:54 +01:00
268d4a525d
some more test cases & fix on file name generation with index
2013-03-19 16:57:54 +01:00
0fff3c9698
adding extension to slugified physical path
2013-03-19 16:53:37 +01:00
8ca01451fd
Merge pull request #2244 from owncloud/fixing-windows-datadir-master
...
remove trailing slash from data dir on windows
2013-03-19 07:38:41 -07:00
8858960a19
Merge pull request #2451 from owncloud/fix_npe_master
...
fix npe when createStorage() returns null
2013-03-19 07:28:59 -07:00
39665cfa6b
fix npe when createStorage() returns null
2013-03-19 15:02:29 +01:00
9dd3dcc5cd
Merge branch 'master' into fixing-windows-datadir-master
2013-03-19 14:43:55 +01:00
c3a64012d8
Remove leading and trailing backslashes in classname. Ref #2310
2013-03-19 16:40:52 +03:00
86c819bbe8
more accurate safe_mode check - refs #2258
2013-03-19 14:36:52 +01:00
3cb016d478
add a searchbymime to the public api. Please all remember that access to internal oc classes will be disabled for all app for ownCloud 6. So please port yur stuff to the public api :-)
2013-03-19 14:27:02 +01:00
7a2396208f
using rtrim
2013-03-19 13:37:48 +01:00
57f2884efa
Add hashed version parameter to js and css. Ref #1520 and many more ;)
2013-03-19 12:35:31 +01:00
f052846914
Add indexes and primary keys.
2013-03-19 01:38:40 +01:00
935d2169c8
Revert "Add indexes and primary keys."
...
This reverts commit 3b33712dc9
2013-03-19 01:36:51 +01:00
3b33712dc9
Add indexes and primary keys.
2013-03-19 01:35:12 +01:00
63ca84e7bc
[tx-robot] updated from transifex
2013-03-19 00:05:52 +01:00
5b1f857907
Merge pull request #2363 from owncloud/uploadsize
...
Improve behaviour when max upload size is unknown
2013-03-18 08:18:27 -07:00
63336f2acb
remove deprecated call
2013-03-17 22:05:45 +01:00
d44f457d2d
integer length 1 is not only used for boolean values
2013-03-17 17:34:35 +01:00
82f0bcce30
Also fix sequences in schemachange
2013-03-17 17:28:36 +01:00
947e03aab5
Quote index columns that need it
2013-03-17 17:00:07 +01:00
5418c98a81
Add memcached backend
2013-03-17 16:01:10 +01:00
80a3f8d066
Seperate memory based cache from OC_Cache
2013-03-17 16:00:39 +01:00
2866376f34
Fix handling of empty defaults in schema
2013-03-17 15:25:41 +01:00
ee57ddd0b7
Rewrite query for numRows function for SELECT queries
2013-03-17 14:32:14 +01:00
427242cf32
Use the correct property for connection object
2013-03-17 14:32:01 +01:00
e9213a6711
Change var_dumps to exceptions
2013-03-17 14:15:36 +01:00
ed642d1038
Merge branch 'master' into doctrine
2013-03-17 13:25:28 +01:00
7f1ff3e9e1
Merge pull request #2204 from owncloud/chache_updater_rename
...
Cache: better rename hook for cache updater
2013-03-17 05:03:18 -07:00
1427af4a22
[tx-robot] updated from transifex
2013-03-16 22:18:26 +01:00
a3db54f9b0
Merge pull request #2383 from owncloud/error-handling-upgrade
...
Add error handling to the file cache upgrade
2013-03-16 12:17:31 -07:00
c69dc3483a
Add error handling to the file cache upgrade
2013-03-16 14:28:42 -04:00
8a97afac6f
Don't show storage space warning when the free space can't be determined
2013-03-15 16:46:20 +01:00
319e3f162c
Don't block uploads if the max upload size is unknown
2013-03-15 16:40:36 +01:00
32b8fd8fb7
Improve handeling of unlimited max upload size
2013-03-15 16:31:35 +01:00
387be37427
Filter display of blacklisted files
...
Blacklisted files like ".htaccess" and ".git" should not only be
blacklisted for upload and rename, but they should also not be displayed
in the directory listings.
I needed this personally to hide ".git" folders in shared folders. Its
also a simple implementation of feature requests like
http://forum.owncloud.org/viewtopic.php?f=4&t=3279 and
http://forum.owncloud.org/viewtopic.php?f=3&t=5708
2013-03-15 12:11:42 +01:00
0c123ebf9d
[tx-robot] updated from transifex
2013-03-15 00:06:36 +01:00
ed83597371
Return unknown freespace if the free_space call failed
...
Fixes #2312
2013-03-14 17:00:30 +01:00
abe408e934
replace \MDB with \OC_DB, approved in #2278
2013-03-14 14:59:12 +01:00
9a0cb2ccaa
[tx-robot] updated from transifex
2013-03-14 00:06:29 +01:00
17fd6482d8
Fix file sharing via public link for one particular file.
...
Fix OC_Files::get() to not return the first character of the filename
if only one file is requested.
2013-03-12 20:03:54 +01:00
2e9d641337
Merge pull request #2254 from owncloud/fixing-mssql-utf8-and-insert-empty-string-master
...
Fixing mssql utf8 and insert empty string master
2013-03-12 11:52:40 -07:00
84d895dc87
Merge pull request #2253 from owncloud/fixing-windows-file-mapper-master
...
Fixing windows file mapper master
2013-03-12 11:48:29 -07:00
68a7b53e03
Merge pull request #2145 from eMerzh/preserve_debug
...
Preserve Debug flag accross config writes
2013-03-12 10:26:01 -07:00
ec16853112
enable UTF-8 charset on mssql
...
disable MDB2_PORTABILITY_EMPTY_TO_NULL for mssql to allow insert of empty string to no null fields
2013-03-12 15:39:44 +01:00
9d4d399aa3
write error message to log file in case insert to file cache failed - took hours to find that the insert failed :-(
2013-03-12 15:39:29 +01:00
a05820c659
fixing various filesystem/storage unit tests on windows
...
fixing copy operation on mapper
2013-03-12 15:30:10 +01:00
eedbebd40e
adding //IGNORE to iconv to prevent nasty php warnings
2013-03-12 09:26:21 +01:00
06992fec6d
slug generates uniqid in case the file/folder name contains not one single valid character
2013-03-12 09:24:58 +01:00
0900301668
indexed slug should be created based on logic path
2013-03-12 09:15:53 +01:00
2fe56b8969
fixes #2081
2013-03-12 09:14:05 +01:00
569c7ab138
[tx-robot] updated from transifex
2013-03-12 00:14:05 +01:00
34e4e490b8
Fix mssql connection parameters and correct driver for pgsql
2013-03-10 11:40:08 +01:00
7af774cc98
Merge branch 'master' into doctrine
...
Conflicts:
lib/db.php
2013-03-10 11:30:33 +01:00
3c06020e3e
Merge pull request #2217 from owncloud/mountconfig-location
...
Store the global mount configuration file in the datadir
2013-03-10 00:25:10 -08:00
be4806d031
Store the global mount configuration file in the datadir
2013-03-10 02:25:03 +01:00
dfbf57207d
Merge pull request #1584 from owncloud/ocs_multiple_methods
...
Allow registering of multiple methods on each api route. Add /cloud/capabilities route.
2013-03-09 16:59:13 -08:00
6bdb84ab28
[tx-robot] updated from transifex
2013-03-10 00:06:53 +01:00
d5da94acbc
Small perf improvement : filter before sort
2013-03-09 21:41:59 +01:00
e6c2a91781
this is now 6.0 pre alpha
2013-03-09 20:19:34 +01:00
256595e7b2
5.0.0
2013-03-09 18:51:02 +01:00
3ae70ab162
Check if username is valid and remove slashes from filename
2013-03-11 16:21:26 +01:00
1e20067c00
Merge pull request #2183 from owncloud/fix-shared-statuses-again
...
Fix #2080 and fix #2141
2013-03-11 02:43:16 -07:00
11251ec8a8
Merge pull request #2218 from owncloud/fix-mounting-all
...
Fix variable for mounting for all users, fix #357
2013-03-11 02:41:41 -07:00
049a4df259
Merge pull request #1786 from owncloud/shared-folder-etags
...
Include etags for the root of the shared folder
2013-03-11 02:38:50 -07:00
8a5946fadc
Fix variable for mounting for all users, fix #357
2013-03-09 21:09:31 -05:00
99c873ea29
fixed typo that broke xsendfile
2013-03-09 15:35:36 +01:00
988a67fc9a
remove remaining br-tags that do not belong here
2013-03-09 13:45:37 +01:00
ecb9d37b55
request.php: add type check to the not empty check of a string
...
The not equal comparison (<>) of a variable with an empty string
could lead to false positive results as the compare do not check
the type and thereby could not make sure that the checked variable
is a string. The usage of the not identical comparison operator
(!==) make sure that the variable is a string and not empty.
2013-03-09 11:53:15 +01:00
d4f98923b9
Overwrite host and webroot when forcessl is enabled
...
This patch enables the use of forcessl together with a multiple domains
reverse SSL proxy (owncloud/core#1099 ) which have different hostname
and webroot for http and https access. The code assumes that the ssl
proxy (https) hostname and webroot is configured via overwritehost and
overwritewebroot.
2013-03-09 11:00:53 +01:00
e58dbd46fc
Merge in master
2013-03-09 00:04:33 +00:00
0629ff4dd9
[tx-robot] updated from transifex
2013-03-09 00:06:34 +01:00
d7beac6d6f
Merge branch 'master' into filecache_mtime
...
Conflicts:
lib/files/view.php
lib/util.php
tests/lib/files/cache/cache.php
2013-03-08 15:28:45 -05:00
546fb72b25
Merge pull request #2165 from owncloud/fix_2155
...
Offer download of whole shared dir only if it does not exceed zip input ...
2013-03-08 10:31:48 -08:00
f4a326173e
fix foldersize check to validate zip input size
2013-03-08 19:21:06 +01:00
1d3beffacf
Cache: better rename hook for cache updater
2013-03-08 19:08:07 +01:00
2d00d13a5d
use pre_unshare hook, otherwise the share is already removed. Which means that we have no chance to determine which folder has to be updated
2013-03-08 15:13:00 +01:00
f9c24a0368
5.0.0 RC3
2013-03-08 10:01:22 +01:00
0525bbd73c
Merge pull request #2189 from owncloud/versioning_sync_client
...
fix versioning for the sync client - distinguish between touch and write operation
2013-03-08 03:05:28 -08:00
8d26400cb5
remove some debug output; move code to the right function
2013-03-08 11:27:25 +01:00
6e5e8c6b46
Fix #2080 and fix #2141
2013-03-07 22:30:12 -05:00
4826564344
Merge branch 'master' into shared-folder-etags
...
Conflicts:
apps/files_sharing/lib/sharedstorage.php
2013-03-07 17:14:34 -05:00
d6bb627a62
Merge pull request #2173 from owncloud/fix-shared-storage
...
Fix fetching source path of shared files
2013-03-07 09:37:36 -08:00
99914a44a5
Merge pull request #2174 from owncloud/fix_printed_brs
...
Remove <br> from error messages, because they will be escaped and the us...
2013-03-07 08:39:29 -08:00
47d176ae69
Remove <br> from error messages, because they will be escaped and the used template has it's own <br> already
2013-03-07 17:28:28 +01:00
a5cab28bea
Fix fetching source path of shared files
2013-03-07 11:12:59 -05:00
48bb53030c
distinguish between touch and write
2013-03-07 15:51:44 +01:00
ce9942331e
create a meanigful file name if files are from the root folder
2013-03-07 14:24:18 +01:00
4a4f705adc
json encode list of files
2013-03-07 14:15:02 +01:00
4994eaace1
Allow to load splited config files ref #946
2013-03-06 23:30:16 +01:00
a68cbb00e0
Preserve Debug flag accross config writes
2013-03-06 21:05:13 +01:00
6acbadf418
return 403 when mkdir failed on webDAV, fixes #2127
2013-03-06 15:21:12 +01:00
cfb10dc58c
Add warning about sanitization
2013-03-06 13:05:22 +01:00
145fb18042
Merge pull request #2120 from owncloud/clear-caches
...
Clear the CSS and JS cache earlier to make sure update goes smoothly
2013-03-06 02:53:16 -08:00
82990b82a6
Merge pull request #2118 from owncloud/fix_1689
...
properly implement displayNamesInGroup in Core and LDAP, fixes #1689
2013-03-06 00:38:06 -08:00
4dcbaa1d7b
Merge branch 'master' into shared-folder-etags
...
Conflicts:
apps/files_sharing/appinfo/app.php
2013-03-05 21:54:32 -05:00
5300d6ad55
Clear the CSS and JS cache earlier to make sure update goes smoothly
2013-03-05 21:13:07 -05:00
c1a32b5073
[tx-robot] updated from transifex
2013-03-06 00:08:33 +01:00
5da9223d1c
make getDisplayNames optional feature for Group Backends, fall back to internal names
2013-03-05 21:22:34 +01:00
ee0c38bb51
Fix group post_shared hook
2013-03-04 19:43:56 -05:00
370f202251
Rebase to current master
2013-03-05 00:25:56 +00:00
b738aaba2a
[tx-robot] updated from transifex
2013-03-04 00:07:35 +01:00
d800f35bf4
Disable loading of backgroundjobs js when upgrade is needed
2013-03-03 23:15:22 +01:00
a2d6b27170
Check maintenance mode before loading apps in route matcher
2013-03-03 23:15:18 +01:00
71bdccf347
Chunk size comment should say kB, not MB
2013-03-03 12:03:26 -05:00
844e18a8b1
[tx-robot] updated from transifex
2013-03-03 00:06:56 +01:00
927a374dbe
Merge pull request #2036 from owncloud/escape-only-in-template
...
Escape the data only in the template
2013-03-02 11:35:37 -08:00
3e3c039292
Escape the data only in the template
2013-03-02 20:21:51 +01:00
050de008b1
Avoid to display empty DisplayNames for menu and title
2013-03-02 16:09:36 +01:00
5a9e9e0b51
Merge pull request #2026 from j-ed/master
...
do not try to extract image infos from 0- or better less than 12-byte length files.
2013-03-02 02:59:00 -08:00
07b956c22d
Update image.php
...
don't try to extract image infos from 0- or better less than 12 byte length files. See description of `exif_imagetype` function at
`http://php.net/manual/de/function.exif-imagetype.php `.
2013-03-02 10:51:49 +01:00
2b7ff7273d
ownCloud 5 RC2
2013-03-02 04:06:27 +01:00
6c96b93fd4
[tx-robot] updated from transifex
2013-03-05 00:19:07 +01:00
db23c885d9
Merge pull request #2096 from owncloud/cache-upgrade-id
...
Cache: also check if the file id is already in the cache during upgrade
2013-03-04 14:55:20 -08:00
9d9acf24de
Cache: more efficient detection for existing entries during upgrade
2013-03-04 23:19:55 +01:00
56ae4bb6e9
Cache: also check if the file id is already in the cache during upgrade
...
Should solve upgrade issues if only some of the configured storages were migrated previously
2013-03-04 22:26:03 +01:00
62dde34887
Merge pull request #2088 from owncloud/fixing-1844-again-master
...
adding test case for getDefaultEmailAddress() + fixing #1844 again
2013-03-04 12:52:35 -08:00
6019cdd5bd
adding test case for getDefaultEmailAddress() + fixing #1844 again
2013-03-04 21:10:18 +01:00
5c061561c5
Merge pull request #2078 from owncloud/save_category_relations
...
VCategories: Don't forget to save category relations if category exists.
2013-03-04 12:04:16 -08:00
a97006144e
Only send the standard headers
...
Fixes https://github.com/owncloud/apps/issues/675
2013-03-04 20:35:58 +01:00
8b09402b77
Fix #2074 by initializing as an array
2013-03-04 12:08:41 -05:00
c08a04bc83
VCategories: Don't forget to save category relations if category exists.
2013-03-04 17:05:08 +01:00
c9d9c381ec
[tx-robot] updated from transifex
2013-03-02 00:05:42 +01:00
5e7970f761
Merge master
2013-03-01 23:11:03 +01:00
6c304fa5c0
validate the generated email address and fall back to localhost.localdomain in case it is not valid
...
fixes #1844
2013-03-01 22:24:19 +01:00
39b9ed50d7
for this self test we don't care if the ssl certificate is self signed and the peer cannot be verified.
2013-03-01 20:34:16 +01:00
f7cb53b103
Merge pull request #2008 from owncloud/1999-requesttoken
...
Check if requesttoken exists in session
2013-03-01 06:12:09 -08:00
93f15215c6
Check if requesttoken exists in session
...
Ref #1999
2013-03-01 14:59:51 +01:00
630becb95f
Style fixes
2013-03-01 14:59:24 +01:00
09dc15d2b1
5.0 RC 1
2013-03-01 07:53:14 +01:00
d20fd7e9a6
[tx-robot] updated from transifex
2013-03-01 00:07:02 +01:00
84aa2c66d6
Merge pull request #1937 from owncloud/check-resharing
...
Check resharing setting
2013-02-28 11:39:11 -08:00
dee16deacd
Merge master
2013-02-28 20:03:06 +01:00
a86761e1e7
Merge pull request #1988 from owncloud/permissionscache_clean
...
Clean permissions cache when deleting file
2013-02-28 10:24:20 -08:00
1cc7e6d31a
Merge pull request #1989 from owncloud/selectSanitize
...
Sanitize HTML in html_select_options
2013-02-28 08:51:07 -08:00
cef6131ea8
Sanitize HTML in html_select_options
2013-02-28 17:19:04 +01:00
ee1eb98d4a
Cache: cleanup permissions cache when removing a file from the cache
2013-02-28 17:04:50 +01:00
f7a43391a7
Cache: add option to delete file from permissions cache for all users
2013-02-28 17:04:34 +01:00
b5989c933f
Merge branch 'master' into shared-folder-etags
...
Conflicts:
apps/files_sharing/lib/sharedstorage.php
2013-02-28 10:39:23 -05:00
59835a9087
add checks for xml and dom when installing
2013-02-28 15:13:18 +01:00
a93b5b47a1
[tx-robot] updated from transifex
2013-02-28 00:05:40 +01:00
b93ebe1860
Merge master
2013-02-27 23:36:52 +01:00
229c907a57
[core] From echo to p
2013-02-27 22:55:39 +01:00
2f036bcc54
Merge pull request #1972 from owncloud/raw-pathinfo
...
Use the plain urlencoded path info for the routing matching
2013-02-27 13:43:47 -08:00
d7528f06df
Disable query cache for Sqlite
2013-02-27 22:32:39 +01:00
9508a58c79
Merge pull request #1944 from owncloud/query-caching-upgrade
...
Disable prepared query caching while doing an upgrade
2013-02-27 12:48:42 -08:00
56f3917f36
Use the plain urlencoded path info for the routing matching
2013-02-27 21:38:58 +01:00
470fc3817f
Remove the template autoescaping
...
Ref #1963
2013-02-27 20:53:52 +01:00
766a301a6b
Merge pull request #1031 from owncloud/external_storage_ui_feedback
...
External Storage UI Improvements
2013-02-27 10:00:22 -08:00
5fd8d155fd
Merge pull request #1962 from owncloud/big_upload_fix
...
timeout after a longer time
2013-02-27 07:05:19 -08:00
888e4f21d2
timeout after a longer time
2013-02-27 15:44:00 +01:00
fd654e9c2f
[tx-robot] updated from transifex
2013-02-27 14:37:12 +01:00
3a7322342e
Merge pull request #1956 from owncloud/session-error-format
...
add styles before session init
2013-02-27 05:21:17 -08:00
a708b63402
Merge pull request #1961 from owncloud/trans_fix
...
fixed bug that would cause a failure because of undefined variable inst...
2013-02-27 05:17:30 -08:00
49a0f42e3b
fixed bug that would cause a failure because of undefined variable instead of %s in a translation string
2013-02-27 14:13:07 +01:00
a54be4acc4
Merge pull request #1948 from owncloud/improve_user_sorting
...
Sort after display name + LDAP server side sorting
2013-02-27 02:39:22 -08:00
a1afc2e34f
only add style.css to initsession
2013-02-27 11:36:05 +01:00
18b7a2bf21
add css and scripts before session init
2013-02-27 11:17:14 +01:00
348812f2ce
[tx-robot] updated from transifex
2013-02-27 00:09:33 +01:00
60d4fdda57
sort users according to display name
2013-02-26 22:56:55 +01:00
47b899e0c8
Disable prepared query caching while doing an upgrade
2013-02-26 22:41:48 +01:00
4a26d63867
Fix using wrong quotes for breaking long lines
...
Fixes #1925
2013-02-26 20:48:01 +01:00
9a2ca0ae64
Check resharing setting
2013-02-26 13:31:15 -05:00
ea841e5e15
Catch exceptions on malformed categories.
2013-02-26 15:01:42 +01:00
b987c76d16
Merge pull request #1906 from owncloud/storage-stat-fail
...
Common storage: don't throw warning when a stat fails
2013-02-26 00:44:42 -08:00
5b250afafc
Merge pull request #1903 from owncloud/fix_version_check
...
return true once one owncloud version number is bigger at any position
2013-02-26 00:37:11 -08:00
8983465210
Correct parent folders' ETags for all users with access to a shared file
2013-02-26 01:21:48 -05:00
52dccd4aa1
Storage: don't throw warnings when a stat fails
2013-02-26 02:53:02 +01:00
6b33a23a51
Code style
2013-02-26 02:51:57 +01:00
63d9feb8c0
[tx-robot] updated from transifex
2013-02-26 00:06:26 +01:00
4a05e8820f
Merge branch 'master' into external_storage_ui_feedback
2013-02-25 17:56:40 -05:00
f415f3e03e
return true once one owncloud version number is bigger at any position
2013-02-25 23:06:26 +01:00
d713948d3f
Merge pull request #1898 from owncloud/session_start_fix
...
set http 500 when session could not be started to prevent serving of emp...
2013-02-25 14:00:12 -08:00
6735701c1e
Merge pull request #1837 from owncloud/fix-user-template
...
Remove unneeded code for user layout template
2013-02-25 13:41:32 -08:00
a2a1e8c2cb
Merge pull request #1839 from owncloud/no_recursive_object_walking
...
Don't walk objects with array_walk_recursive()
2013-02-25 12:53:23 -08:00
6dd1d479da
Merge pull request #1706 from owncloud/master-sqlserver
...
Microsoft SQL-Server support for ownCloud!
2013-02-25 12:50:32 -08:00
a533bb6dcd
5 beta 2
2013-02-25 20:00:40 +01:00
7f7b8bc07a
use error template
2013-02-25 19:17:29 +01:00
aba60dba28
added simple error message for the browser
2013-02-25 18:47:34 +01:00
bc2fefed59
write an error log when session could not be initialized
2013-02-25 18:42:09 +01:00
55c72617c6
set http 500 when session could not be started to prevent serving of empty files see #1049
2013-02-25 18:37:05 +01:00
946a064fc6
Merge pull request #1891 from owncloud/set_timeout
...
use a 5 sec timeout for the webdav check
2013-02-25 08:27:20 -08:00
3009b43e3d
use a 5 sec timeout for the webdav check
2013-02-25 16:30:11 +01:00
2954c7e97a
Merge pull request #1865 from owncloud/fix-displaying-db-errors
...
Don't use routes when displaying error page
2013-02-25 07:09:48 -08:00
9ceae51091
Merge pull request #1887 from owncloud/fixing-1843-master
...
remove the check for session data folder - causes trouble on some enviro...
2013-02-25 04:16:38 -08:00
5bf3d286f0
created unittests and factored out version test into seperate method
2013-02-25 12:38:00 +01:00
ecd40f0abc
spaces to tabs
2013-02-25 11:40:55 +01:00
736d5deaee
version checks for apps now use all three version numbers and fixed bug that would not do the version check correctly for the second version
2013-02-25 11:39:55 +01:00
9ee5069f2a
Merge pull request #1856 from owncloud/fix_error_handling_stream_copy
...
don't use the number of written bytes as indicator if streamCopy() was successful
2013-02-25 02:04:12 -08:00
ebcb778a99
remove the check for session data folder - causes trouble on some environments
...
let's try to find another solution for =C6
2013-02-25 10:12:47 +01:00
e1818675d2
Remove MDB2 sqlite3 driver
2013-02-25 08:27:23 +01:00
e97c7ae806
Change PDO Exceptions to Doctrine Exceptions
2013-02-25 08:27:23 +01:00
d0d9b63ab5
Codestyle cleanup
2013-02-25 08:27:23 +01:00
c8ec1bd2a6
Merge branch 'master' into doctrine
...
Conflicts:
lib/base.php
lib/db.php
2013-02-25 08:24:59 +01:00
21f3291eee
[tx-robot] updated from transifex
2013-02-25 00:06:17 +01:00
9898ba4daf
Merge branch 'master' into master-sqlserver
...
Conflicts:
core/templates/installation.php
2013-02-22 22:59:09 +01:00
15f5325078
Don't use routes when displaying error page
2013-02-22 21:39:44 +01:00
eabfd9b69b
put value assignment into brackets
2013-02-22 16:45:57 +01:00
608ebb59dd
Merge pull request #1859 from owncloud/blacklist-fix
...
Add OC\Files\Filesystem::isFileBlacklisted
2013-02-22 07:43:13 -08:00
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
62c65bc1c8
Add OC\Files\Filesystem::isFileBlacklisted
2013-02-22 16:13:08 +01:00
e8da90d0f4
Merge pull request #1711 from owncloud/style-cleanup
...
Codestyle cleanup
2013-02-22 07:02:51 -08:00
40efeb9187
isSharedFile() doesn't detect all shares, just use getUsersSharingFile() directly either you get a list of users or not
2013-02-22 16:02:27 +01:00
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
f51d8c1cd9
fix order of mount commands
2013-02-22 14:19:29 +01:00
16a5f15f85
keep transparency when resizing or cropping png/gif
2013-02-22 12:42:40 +01:00
efe33c508e
Don't walk objects with array_walk_recursive()
2013-02-22 00:51:54 +01:00
bf0b9bac8b
Remove unneeded code for user layout template
2013-02-22 00:22:43 +01:00
734a463297
[tx-robot] updated from transifex
2013-02-22 00:08:47 +01:00
19c5213b53
Join split translated strings
2013-02-21 23:47:56 +01:00
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
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
c5e0dda887
add a safe_mode check
2013-02-21 11:09:00 +01:00
d29c2b0169
Reuse $freeSpace variable
2013-02-23 16:00:50 -05:00
a2d3333a09
Don't throw insufficient storage exception if free space is unknown
2013-02-23 15:37:44 -05:00
bb75dfc021
Whitespace fixes
2013-02-22 19:05:36 +01:00
c8c0e72e73
Merge pull request #1768 from houqp/issue_1739
...
bug fix for issue 1739
2013-02-21 01:09:15 -08:00
dcd93a53e4
[tx-robot] updated from transifex
2013-02-21 00:15:58 +01:00
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
59fd9b2bd2
5.0.0 beta 1
2013-02-20 19:09:58 +01:00
5062ae250b
Merge branch 'master' into master-sqlserver
...
Conflicts:
lib/files/cache/cache.php
2013-02-20 10:55:20 +01:00
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
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
99758dce2b
[tx-robot] updated from transifex
2013-02-20 00:03:28 +01:00
76c4dc6296
[tx-robot] updated from transifex
2013-02-19 00:06:51 +01:00
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
d9035d4fdc
Merge pull request #1728 from owncloud/mountconfig
...
Use json for new mount configuration files
2013-02-18 14:56:25 -08:00
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
2bbb57e429
merge master into mountconfig
2013-02-18 15:12:15 +01:00
2675290325
Merge branch 'master' into master-sqlserver
2013-02-18 11:39:04 +01:00
3b9796bfcc
[tx-robot] updated from transifex
2013-02-18 00:06:45 +01:00
55d6b96348
Merge pull request #1719 from owncloud/fixing-1659-master
...
Fixing 1659 master
2013-02-17 11:47:35 -08:00
451daf3ab1
Keep user quota into account when the storage backend has unkown free space
2013-02-17 20:09:03 +01:00
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
6da2c6c83e
Create new mountconfig files in json
2013-02-16 01:50:40 +01:00
46626915ef
Use a parser to read custom mount configuration instead of including the php files
2013-02-16 01:30:44 +01:00
83f0c8ce61
[tx-robot] updated from transifex
2013-02-16 00:05:50 +01:00
0c1ec758e8
Cache: hash long storage ids to ensure they fit in the database
2013-02-15 22:11:39 +01:00
2ed850e05b
merge master into filecache_mtime
2013-02-15 21:04:48 +01:00
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
b488800bd5
fix error in recursive search
2013-02-15 17:41:22 +01:00
b8e2454f68
Fix strict standard warning in user template
2013-02-15 16:10:06 +01:00
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
297c50db18
changing the bit mask of OC_USER_BACKEND_SET_DISPLAYNAME
2013-02-15 12:24:49 +01:00
8b09fbc150
Merge pull request #1700 from owncloud/fixing-1680-master
...
Fixing 1680 master
2013-02-15 03:21:49 -08:00
102619ab87
we should never drop a database
2013-02-15 08:22:31 +01:00
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
ab70f9bd25
Fix quotes in OC_User::isEnabled
...
this broke login
2013-02-15 03:20:02 +01:00
0395715348
set DEBUG from xdebug session before we first use it
2013-02-15 03:15:09 +01:00
bcabdd7dd5
Don't cache errors/exceptions when debug is enabled
2013-02-15 03:14:41 +01:00
b169073169
[tx-robot] updated from transifex
2013-02-15 00:06:50 +01:00
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
78a3625ddf
final adoptions for mssql connectivity
2013-02-14 21:59:24 +01:00
9058d398a7
Merge pull request #1662 from owncloud/style-cleanup
...
Style cleanup
2013-02-14 12:54:36 -08:00
be194c5b5b
Invalidate existing HSTS headers
2013-02-14 19:23:29 +01:00
e96f6ffa52
filter l10n-* files
2013-02-14 17:24:06 +01:00
8877087b57
adding a compatibility.js as a single source to define all fallback function declarations
2013-02-14 12:20:04 +01:00
ffae6f4b84
Style-fix: Breakup long lines
2013-02-14 08:38:37 +01:00
2d6d0a4ad4
Whitespace indent fixes
2013-02-14 08:36:26 +01:00
2679123846
Add braces around single line if statements
2013-02-14 08:36:26 +01:00
cd35d257bb
Fix NoSpaceAfterComma and SpaceBeforeComma
2013-02-14 08:36:26 +01:00
d3ef967993
Fix indentation style
2013-02-14 08:36:26 +01:00
5c4a804ddb
Fix SpaceBeforeOpenBrace errors
2013-02-14 08:36:26 +01:00
bfe6334cd9
[tx-robot] updated from transifex
2013-02-14 00:06:51 +01:00
e1e77fe3be
Merge pull request #1598 from owncloud/fixing-1424-master
...
Fixing 1424 master
2013-02-13 12:59:30 -08:00
5005195db0
create keypair for ownCloud with empty passphrase, will be used for public link shares
2013-02-13 17:57:45 +01:00
9356f9a6bf
add post_unshareALll hook, update recursively all keyfiles if a folder was shared/unshared
2013-02-13 17:23:27 +01:00
4952dfe956
add post_unshare hook, also add public link shares to the list of user with access to a file
2013-02-13 14:56:39 +01:00
bc43dd704f
Merge branch 'master' into fixing-1424-master
...
Conflicts:
settings/js/users.js
2013-02-13 01:18:01 +01:00
68fa0b7dcc
[tx-robot] updated from transifex
2013-02-13 00:05:40 +01:00
a814361ca7
Merge branch 'master' into external_storage_ui_feedback
2013-02-12 23:01:54 +01:00
b31cc83a2d
$this->numericId should be determined based on table storages not filecache
2013-02-12 17:26:58 +01:00
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
a692264fa4
add option to keep duplicates in the list of users with access to a file, e.g. for the unshare operation we need to know if access was granted more than once, for example as group share and as individual share
2013-02-12 17:00:33 +01:00
b54dcd1999
Cache: fix scanner trying to use existing data when file isn't in cache
2013-02-12 16:48:21 +01:00
d1bbb30385
also find users with access to the file if a folder above the actual file was already shared
2013-02-12 16:48:04 +01:00
f2baf1ae0e
fixing syntax error
2013-02-12 16:18:48 +01:00
8d9352a40d
[tx-robot] updated from transifex
2013-02-12 15:12:46 +01:00
e1fe5279dd
Cache: also preserve etags for files
2013-02-12 14:56:57 +01:00
8eef919a75
take group shares into account if we retrieve the list a all recipients
2013-02-12 12:08:34 +01:00
a953786d79
Merge branch 'master' into external_storage_ui_feedback
2013-02-12 11:01:14 +01:00
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
bcbf2e667b
fixing sql server syntax for database creation
2013-02-12 01:17:01 +01:00
98d7e0f7cd
write any database messages / non critical errors to the log - don't pollute the browser
2013-02-12 01:14:53 +01:00
8136851010
fixing indent
2013-02-12 01:05:47 +01:00
b2dfdacaa1
fixing undefined variables
2013-02-12 01:04:35 +01:00
76b31f870c
Merge branch 'master' into master-sqlserver
2013-02-12 00:32:38 +01:00
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
fb23ac3ce2
[tx-robot] updated from transifex
2013-02-12 00:21:45 +01:00
04bf8c1b66
Merge pull request #1596 from owncloud/fix_470
...
webdav put improvements
2013-02-11 13:10:48 -08:00
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
037fcde133
Merge branch 'master' into fixing-1424-master
2013-02-11 21:42:27 +01:00
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
39d19a9274
[tx-robot] updated from transifex
2013-02-11 15:42:41 +01:00
766fbead96
Merge pull request #1578 from owncloud/mysql_admin_fix
...
added l10n for db error messages
2013-02-11 06:35:49 -08:00
eed48c8159
Merge pull request #1608 from owncloud/fix-shared-links
...
Fix shared links
2013-02-11 05:17:24 -08:00
c544a631d5
fixing indent
2013-02-11 14:14:37 +01:00
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
2921d2fb78
Cache: don't create a new etag when the mtime hasn't changed
2013-02-11 13:33:56 +01:00
d84c3cd014
Cache: actually use parameter
2013-02-11 13:33:48 +01:00
299649b40e
Cache: reuse known folder sizes when doing a shallow scan
2013-02-11 13:33:41 +01:00
56d10e9054
Cache: simplify scanner logic a bit when handeling with unknown folder sizes
2013-02-11 13:33:34 +01:00
36df2fbdfe
fixed argument for translation
2013-02-11 13:11:43 +01:00
92f06243be
Implementing sharing support
...
New file-specific methods in lib/public/share
Changes to how keyfiles are stored
2013-02-11 10:21:23 +00:00
ad360296b9
Update tests and apps to the new \OC\Files\Filesystem::init signature
2013-02-11 11:06:09 +01:00
99f41de7de
only check content lenght on PUT to make litmus happy
2013-02-11 10:31:01 +01:00
2cb2991c04
delete partial file when file upload is aborted
2013-02-11 09:53:07 +01:00
15ab2fd52a
check Content-Length to detect aborted uploads
2013-02-11 09:53:07 +01:00
806522d007
also rename file when it has not been present before
2013-02-11 09:53:07 +01:00
72a2075b1c
readd renaming and mtime handling to new directory nodes
2013-02-11 09:43:26 +01:00
2644003bf1
send back 'X-OC-MTime: accepted' when X-OC-MTime was applied
2013-02-11 09:34:03 +01:00
d2332f60f3
add a custom header clients can use to skip a n additional propset request
2013-02-11 09:32:28 +01:00
eeb409a6ec
Merge branch 'master' into fix-shared-links
2013-02-10 19:10:06 -05:00
8e3b8c7f47
Proper fix for shared links
2013-02-10 19:09:58 -05:00
04146f2059
[tx-robot] updated from transifex
2013-02-11 00:04:49 +01:00
3292dc3eea
Cache: allow file sizes >2GB
2013-02-10 16:44:00 +01:00
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
dc12dd523e
Merge pull request #1581 from owncloud/mapper_md5
...
Mapper: use md5 hashes for database indexes
2013-02-10 06:47:44 -08:00
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
d08a3bb46e
Merge pull request #1590 from owncloud/fix_470
...
append .part to put files
2013-02-10 06:38:31 -08:00
32b1c7ad5d
Merge pull request #1589 from owncloud/use-sanitizeHTML
...
Use sanitizeHTML instead of stripslashes + htmlspecialchars
2013-02-10 06:23:01 -08:00
d8fee28b3b
add switch to enable/disable the possibility to change the display name by the user
2013-02-10 14:43:31 +01:00
1263511a17
append .part to put files
2013-02-10 14:16:45 +01:00
46103e62d2
Coding style
2013-02-10 14:09:49 +01:00
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
6f785e211b
Merge pull request #1030 from hkjolhede/master
...
SFTP support in files_external app
2013-02-10 05:06:00 -08:00
1b10032556
Use sanitizeHTML instead of stripslashes + htmlspecialchars
2013-02-10 14:03:40 +01:00
121c1f2fc0
wrap etags in quotes when doing a propfind on a folder
2013-02-10 13:55:20 +01:00
41ec976fd7
Bugfixes and cleanup MS SQL Server installation
2013-02-10 13:07:59 +01:00
6d74aa0d00
more code style
2013-02-10 12:46:41 +01:00
28498e1af4
Code style and remove OAuth code
2013-02-10 12:44:59 +01:00
9738fae3cf
Emulate touch() for backends that don't support it
2013-02-10 12:44:27 +01:00
266ba2806d
Remove debug call, correct app identifier
2013-02-10 12:35:39 +01:00
3e70d563a6
Cache: bookkeeping of storage_mtime
2013-02-10 12:27:35 +01:00
9c1196d73e
Cache: add seccond mtime field
2013-02-10 12:05:41 +01:00
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
01fabd6c65
Merge pull request #1577 from owncloud/typo_catagory
...
Typo
2013-02-10 02:31:34 -08:00
f7d898d835
[tx-robot] updated from transifex
2013-02-10 00:10:29 +01:00
bd2f8980cd
Typo
2013-02-09 23:37:42 +01:00
b3e59ca1e3
Work on post_share hook for files_encryption
...
New method in OCP\Share{}:: getUsersSharingFile()
Development shapshot
2013-02-09 18:39:32 +00:00
b2261c31eb
added l10n for db error messages
2013-02-09 19:23:36 +01:00
b9089fe8d9
Merge branch 'master' into fixing-1424-master
2013-02-09 19:15:23 +01:00
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
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
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
0664b98b4f
added icons and mimetypes for .msi and .exe files
2013-02-09 18:09:03 +01:00
43981e62e2
Revert "added exe and msi filetypes and icon"
...
This reverts commit aa1adf42c7
2013-02-09 17:46:07 +01:00
aa1adf42c7
added exe and msi filetypes and icon
2013-02-09 17:41:17 +01:00
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
d67d9566ce
Merge branch 'master' into clean-app-id
2013-02-09 17:28:30 +01:00
5a309c11ca
Merge pull request #1572 from owncloud/fix_empty_path_handling
...
fix empty path handling
2013-02-09 08:25:25 -08:00
e0da721a7d
adding ctor to Local and revert call to it within Temporary
2013-02-09 17:16:13 +01:00
5a0a9564ce
alpha 1
2013-02-09 17:13:43 +01:00
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
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
f223ab796b
Merge branch 'master' into mapped-storage-unit-testing-linux-master
2013-02-11 12:59:23 +01:00
8174e5faf1
make MappedLocal available and testable within Linux as well
2013-02-09 19:03:03 +01:00
420b63cbe4
fix empty path handling
2013-02-09 16:58:55 +01:00
60411f7d3d
Remove unneeded __destruct call in OC\Files\Storage\Temporary
2013-02-09 16:18:30 +01:00
9dddcae9ca
Remove invalid characters from app id to prevent loading of invalid resources
2013-02-09 15:10:40 +01:00
d6b4d25d1d
Merge branch 'master' of https://github.com/hkjolhede/owncloud_core
2013-02-09 14:13:54 +01:00
279cbeb001
Merge pull request #1481 from owncloud/fixing-1354-master
...
basic WebDAV test in place now
2013-02-09 05:13:33 -08:00
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
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
5ad1b63f76
Fix api result merging.
2013-02-09 12:50:19 +00:00
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
5d14a2cc46
Merge in master
2013-02-09 12:05:48 +00:00
eefaefe87d
Use OC_User::isAdminUser() in lib/api.php
2013-02-09 12:00:44 +00:00
ab8777a623
Merge branch 'ocs_capabilities' into ocs_multiple_methods
2013-02-09 11:56:30 +00:00
742cafb03a
Change strucutre of cloud/capabilities response
2013-02-09 11:22:29 +00:00
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
764409117a
Merge pull request #1493 from owncloud/fix_ldap_stored_homedir
...
Fix ldap stored homedir
2013-02-11 02:20:03 -08:00
ed1dc3e064
Fix files router download links
2013-02-08 22:05:13 +01:00
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
fba9739448
Always load the apps before trying to match a route
2013-02-08 19:06:59 +01:00
340d6fce11
Better way of getting the navigation entries for an app
2013-02-08 18:53:43 +01:00
232a98524c
some systems use en_US.UTF8 instead of en_US.UTF-8
2013-02-08 17:49:54 +01:00
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
ea42014ba4
in case curl is not present we cannot test
2013-02-08 15:23:26 +01:00
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
1158447499
missing comma in sql statement
2013-02-08 13:49:26 +01:00
d577f790c8
Added MS SQL Server support
2013-02-08 00:00:51 +01:00
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
217328e0e3
Merge pull request #1514 from owncloud/fix-setup
...
Fix setup
2013-02-07 13:48:44 -08:00
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
1ef3e4c5c6
simplyfy mimetype parsing of 'file' output
2013-02-07 17:46:16 +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
5788d36c8d
Merge branch 'master' into fixing-1354-master
...
Conflicts:
settings/admin.php
settings/templates/admin.php
2013-02-07 10:44:28 +01:00
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
35bd7a400d
[tx-robot] updated from transifex
2013-02-07 00:11:04 +01:00
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
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
3582f7bd09
Execute the post setup check after finishing the setup
2013-02-06 17:56:45 +01: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
a721f7d59f
check whether user belongs to the backend before calling getHome()
2013-02-06 02:26:35 +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
1adcc5fd23
basic WebDAV test in place now
2013-02-05 23:33:44 +01: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
406922fc6a
Merge master
2013-02-04 18:36:39 +00:00
aec5ab3ad2
Remove app related values and change structure of /cloud/capabilties call
2013-02-04 18:34:28 +00: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
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
ed4130474a
Dav: update etag in filecache when doing a PROPSET
2013-02-02 18:26:27 +01:00
c61c98cbef
Dav: don't overwrite etag from filecache with old etag from properties table
2013-02-02 15:44:05 +01:00
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
b29b55a332
[tx-robot] updated from transifex
2013-02-02 00:08:15 +01:00
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
0c85250380
add function to remove a search provider
2013-02-01 19:21:54 +01:00
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
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
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
317261d6df
Merge pull request #1099 from herbrechtsmeier/ssl-proxy
...
add multiple domains reverse SSL proxy support
2013-01-31 14:01:32 -08:00
17f94de19b
Case insensitive Lang Detection fix #1328
2013-01-31 22:37:46 +01:00
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
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
b471177439
Merge pull request #1379 from owncloud/improved_appsmanagement
...
Improved appsmanagement
2013-01-31 08:30:55 -08:00
31e723a907
Merge github.com:owncloud/core
...
Conflicts:
lib/public/share.php
2013-01-31 16:30:37 +00:00
209d599ec5
[tx-robot] updated from transifex
2013-01-31 17:05:21 +01:00
f7d281af67
just return "true" for now
2013-01-31 12:24:10 +01:00
77765bd967
remove some left over comments
2013-01-31 12:17:23 +01:00
ab255e8bb6
add missing brackets
2013-01-31 12:12:39 +01:00
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
e8b423f666
style fixes
2013-01-31 10:30:13 +01:00
665bb41c1f
style fixes
2013-01-31 10:27:02 +01:00
5112dac102
remove spaces
2013-01-31 10:00:42 +01:00
057920b165
Still load js files in maintance mode
2013-01-30 23:05:44 +01:00
f452d2d0c4
Check for upgrade/maintance mode before trying to load an app
2013-01-30 22:55:33 +01:00
6043789394
Bumb version number for displayname db upgrade
2013-01-30 19:37:02 +01:00
207aa22d12
merge master into filesystem
2013-01-30 19:24:24 +01:00
af3b0e30ed
Cache: don't insert duplicated during upgrade
2013-01-30 19:19:19 +01:00
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
0bce22966c
Update lib/base.php
...
Correction of typo "locate" -> "locale".
2013-01-30 14:27:08 +01:00
389c4e8415
mark recommended apps. server part not yet fully implemented
2013-01-30 13:39:53 +01:00
3fa4b3abff
apps updater is now working
2013-01-30 12:08:14 +01:00
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
68266e70f2
[tx-robot] updated from transifex
2013-01-30 00:25:41 +01:00
250c565d2b
Merge pull request #1360 from owncloud/display_name
...
introduction of display names
2013-01-29 14:05:54 -08:00
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
007bddceba
version dump to trigger db update
2013-01-29 21:04:28 +01:00
ebc3d1b2d7
remove dubug value
2013-01-29 21:01:59 +01:00
79c309da83
Typo
2013-01-29 20:42:21 +01:00
59bb9931df
Adjust user interface to additions around displayName Handling
2013-01-29 20:09:41 +01:00
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
ca4c006d5a
Make zip downloads use actual folder names, fix spelling mistakes
2013-01-28 23:51:35 -05:00
8c4931a645
[tx-robot] updated from transifex
2013-01-29 00:06:20 +01:00
74f6f85628
merge master into filesystem
2013-01-28 19:37:58 +01:00
06c1c35ac9
Fix phpdoc
2013-01-28 19:08:30 +01:00
590c4aa710
search display name instead of uid; fix key/value order for array access
2013-01-28 15:58:40 +01:00
c00b66fe5b
implement DisplayNamesInGroup for database back-end
2013-01-28 15:47:57 +01:00
232cc3211b
add oc:// streamwrapper to provide access to ownCloud's virtual filesystem
2013-01-28 15:35:30 +01:00
c9c919da57
Move streamwrappers to seperate files and put them in a namespace
2013-01-28 15:34:15 +01:00
e6cc0cd08a
implement display names for the database back-end
2013-01-28 15:07:31 +01:00
99ec26578a
Merge pull request #1313 from owncloud/updater-CSP
...
Make update page with CSP compatible
2013-01-28 05:43:47 -08:00
70c3ab3c53
update the display name for the database back-end
2013-01-28 14:23:15 +01:00
e0f2ed2757
interface and API to change display names
2013-01-28 14:09:11 +01:00
022a7b13b8
prepare user table to show and edit display names
2013-01-28 13:12:44 +01:00
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
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
1d44a99ebb
Merge branch 'master' into updater-CSP
...
Conflicts:
core/templates/update.php
2013-01-28 09:57:24 +01:00
31d83fddc4
Merge pull request #1321 from owncloud/csp-fixes
...
Files: CSP fixes
2013-01-28 00:29:46 -08:00
bca5ce724e
Merge branch 'master' into filesystem
2013-01-28 02:35:51 +01:00
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
577e3b11d7
Filesystem: return all matching mounts in Mount::findById
2013-01-28 00:59:43 +01:00
77763fb856
Update lib/filestorage/common.php
...
Small cleanup
2013-01-27 16:07:21 +01:00
4cae141673
Filesystem: also add getPath to \OC\Filesystem
2013-01-27 00:18:15 +01:00
17bcea1585
Filesystem: add View->getPath to the cache api
2013-01-27 00:13:50 +01:00
9e2a066c7b
Cache: add function to get storage id and internal path of a file by id
2013-01-27 00:13:50 +01:00
69f11151e9
Filesystem: add Mount::findById
2013-01-27 00:13:49 +01:00
00a28062e1
[tx-robot] updated from transifex
2013-01-27 00:06:21 +01:00
9c7a18044d
Merge remote-tracking branch 'refs/remotes/upstream/master'
2013-01-26 23:19:40 +01:00
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
b1b2eafa50
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/files_external/lib/config.php
2013-01-26 21:51:18 +01:00
f25db779d9
Filesystem: move mount management to it's own class
2013-01-26 21:44:33 +01:00
7237ebf08b
Fix OC_Helper and change deprecated methods
2013-01-26 15:16:53 -05:00
2fa3efd697
Update lib/filestorage/common.php
...
Added function to clean a path
2013-01-26 19:44:09 +01:00
930b9b9cd0
merge master into filesystem
2013-01-26 18:49:45 +01:00
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
7f0a3018b6
Fix undefined variable
2013-01-26 13:46:00 +01:00
276d98b9dd
Merge pull request #1059 from owncloud/fixing-998-master
...
Fixing 998 master
2013-01-26 04:15:40 -08:00
2cc77759aa
lookup for OCA classes in all apps folders
2013-01-26 12:45:50 +01:00
93834b78a1
Update lib/mail.php
...
added parameter mail_smtpauthtype to set SMTP authentication type.
2013-01-26 12:09:54 +01:00
af4411e33d
[tx-robot] updated from transifex
2013-01-26 00:10:07 +01:00
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
dbc13cf6ee
Move update inline JS
2013-01-25 19:18:16 +01:00
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
a606e8d944
use display name to show share_width and owner information
2013-01-25 17:40:23 +01:00
2aead5727e
Merge remote-tracking branch 'refs/remotes/upstream/master'
2013-01-25 17:15:02 +01:00
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
047f1988c3
Merge branch 'master' into no-inline-js
2013-01-25 16:11:07 +01:00
0d2a58bc5d
Initialize router also if ownCloud isn't installed
2013-01-25 14:57:52 +01:00
e5cc5a0a2d
Allow the loading of external images
2013-01-25 14:26:14 +01:00
934735043b
API: Remove api response structure from OC_OCS_Result, handle multiple registered methods for api calls
2013-01-25 12:48:59 +00:00
b4291f1e8e
allow to get the display name from an abitrary user
2013-01-25 13:00:17 +01:00
4271430e60
get all display names from users in a given group
2013-01-25 11:48:03 +01:00
9bb8e05839
get all display names
2013-01-25 11:05:00 +01:00
6832dddf39
[tx-robot] updated from transifex
2013-01-25 00:05:56 +01:00
2fee1208ef
add display name to title instead if login-ID
2013-01-24 15:49:23 +01:00
d16574f070
new branch which introduces display names
...
first commit with some infrastructure code
2013-01-24 13:07:59 +01:00
b26279546c
Simpler method for getting the first char
2013-01-24 10:49:48 +00:00
d89be72972
Remove some whitespace
2013-01-24 10:40:47 +00:00
02f8c941f4
API: If key begins with '@' treat it as an xml attribute
2013-01-24 10:39:33 +00:00
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
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
8f9d3cd01d
Code style update
2013-01-23 23:39:29 +00:00
3ff32eba25
[tx-robot] updated from transifex
2013-01-24 00:07:38 +01:00
14d0903a28
Merge branch 'master' of github.com:owncloud/core
2013-01-23 12:52:53 +00:00
293e7bdcf0
Notice about changing the standard policy
2013-01-23 13:44:43 +01:00
0517465f4d
Allow admins to change the CSP policy in the config file
2013-01-23 13:42:52 +01:00
b4c3dd84b4
update to jquery-ui 1.10.0
2013-01-23 11:37:52 +01:00
c8bbbb48d3
Merge master...
2013-01-23 11:30:40 +01:00
c986dbe573
[tx-robot] updated from transifex
2013-01-23 00:06:18 +01:00
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
f858381775
merge master into filesystem
2013-01-22 23:27:04 +01:00
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
9a1f65aab1
Some style fixes
2013-01-22 20:58:09 +01:00
7330fcf5e8
Cache: make mounts overwrite existing folders, prevents duplicate entries
2013-01-22 20:57:15 +01:00
aa648fca75
Merge branch 'master' into files_encryption
...
Conflicts:
apps/files_encryption/templates/settings.php
2013-01-22 17:31:05 +00:00
619780a67d
Merge branch 'master' into files_encryption
2013-01-22 16:50:20 +00:00
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
bd5ff29716
Merge branch 'master' into no-inline-js
2013-01-22 11:50:33 +01:00
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
5136f6d818
Make database connection error messages less verbose
2013-01-21 22:53:32 -05:00
3ffbaf4795
Allow iframes to external domains
2013-01-22 00:30:09 +01:00
f2d0eeae83
Merge branch 'master' into filesystem
2013-01-22 00:19:44 +01:00
8ede3290ae
Cache: add database indexes for mimetype and mimepart
2013-01-21 22:31:44 +01:00
30274ee33e
Move to OC_App
2013-01-21 22:18:11 +01:00
a29f9f90ab
Indentation
2013-01-21 22:17:48 +01:00
42a1a17a30
Cache: return non numberic storage id
2013-01-21 22:01:22 +01:00
0c59074eeb
Correct copy paste fail
2013-01-21 20:46:42 +01:00
a27f92a17a
we are getting closer. updating is not working yet.
2013-01-21 20:40:23 +01:00
8ca78fcf3f
Move requesttoken to oc-requesttoken.js
2013-01-21 20:24:18 +01:00
d58cee2f76
returning http status code 503 in case connecting to the database failed
2013-01-21 14:57:33 +01:00
aede26d996
[tx-robot] updated from transifex
2013-01-21 00:05:34 +01:00
af8c193605
Disallow inline JS
2013-01-20 23:30:16 +01:00
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
967b7947a1
Add the default-src
2013-01-20 12:19:09 +01:00
c82d6e5153
Add CSP header
2013-01-20 12:06:33 +01:00
4c05661875
Merge branch 'filesystem' of github.com:owncloud/core into filesystem
2013-01-20 03:11:50 +01:00
83d6221322
merge master into filesytem
2013-01-20 03:11:04 +01:00
664f33a29c
Update mtimes of all parent folders after change inside
2013-01-19 21:04:25 -05:00
ebc0c4b85b
[tx-robot] updated from transifex
2013-01-20 00:06:40 +01:00
42b924da0e
Also replace the backslash with a minus
...
For Windows systems
2013-01-19 19:47:26 +01:00
f1939866f3
Merge pull request #1214 from Raydiation/master
...
Load Classpaths of apps before appinfo/routes.php
2013-01-19 09:44:48 -08:00
b8318e6df4
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-19 15:58:15 +01:00
316eef3ded
Fix sharing issue with collection and children mismatches
2013-01-19 01:50:02 -05:00
cd8d8360b0
Disable fancy folder sharing for now
2013-01-18 23:57:13 -05:00
5df6f9d14d
Fix merge
2013-01-18 23:56:47 -05:00
9e28f924c2
Merge branch 'master' into move-datadirectory-checks
2013-01-18 23:31:06 -05:00
da34e58589
Move permissions check to new function checkDataDirectoryPermissions()
2013-01-18 23:30:56 -05:00
a17ca3a69a
[tx-robot] updated from transifex
2013-01-19 00:05:38 +01:00
afb5de955e
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
2013-01-18 23:22:34 +01:00
31cc9aa80d
Merge pull request #986 from owncloud/fixing-784-master
...
the maximum upload size is now part of the response of the upload and de...
2013-01-18 14:06:00 -08:00
5ff29b4348
fixing indent
2013-01-18 20:09:03 +01:00
487e401361
Typo fix (comment) /lib/base.php
2013-01-18 10:52:29 -08:00
9ffd4197ae
Fix wrong word in comment
2013-01-18 16:38:40 +01:00
d2c5f9bec7
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
2013-01-18 15:14:42 +01:00
0ed635240a
Merge pull request #1205 from owncloud/ocs_api
...
Return 401 headers when trying to access a restricted api call
2013-01-18 05:52:51 -08:00
5df57e4ada
Merge pull request #1181 from owncloud/return-503-in-maintenance
...
in case of maintenance the error page returns http status 503.
2013-01-18 04:02:03 -08:00
824fcf6624
[tx-robot] updated from transifex
2013-01-18 00:04:36 +01:00
73522fe189
Add ebook specific mimetypes
2013-01-17 22:20:57 +01:00
eb9cd0858e
Add ebook specific mimetypes
2013-01-17 21:57:04 +01:00
2b95ae1e6d
spaces to tabs
2013-01-17 21:44:40 +01:00
a8094abac7
load classpaths of apps before routes
2013-01-17 21:42:46 +01:00
b4954c0c89
Correct spelling of 'Authorization'
2013-01-17 16:30:14 +00:00
d85e440aa1
Merge pull request #1148 from seancomeau/topic/setup
...
Fix issue #108
2013-01-16 22:38:57 -08:00
433fa19268
[tx-robot] updated from transifex
2013-01-17 00:27:40 +01:00
Jenkins for ownCloud
Robin Appelman
Jörn Friedrich Dreyer
Bernhard Posselt
eMerzh
Björn Schießle
Michael Gapczynski
OpenLarry
Bart Visscher
Thomas Tanghus
Frank Karlitschek
Lukas Reschke
Birk Borkason
Arthur Schiwon
Sam Tuke
Miquel Rodríguez Telep / Michael Rodríguez-Torrent
Björn Schießle
itheiss
Valerio Ponte
VicDeo
Andreas Schönebeck
Olivier Tétard
Jan-Christoph Borchardt
Tom Needham
herbrechtsmeier
Tom Needham
j-ed
icewind1991
Georg Ehrke
Qingping Hou
irgsmirx
Administrator
Henrik Kjölhede
Tobias Ramforth
Christian Koch
TheSFReader
root
davidgumberg