414b5f150e
Merge pull request #2914 from Kondou-ger/label_overlapping_value
...
Fix textfield label overlapping value.
2013-06-29 04:09:50 -07:00
bd3e266408
Merge pull request #3688 from roha4000/fix_upload_max_filesize
...
upload_max_filesize = 0 not possible if post_max_size is not 0
2013-06-29 04:07:34 -07:00
d699ee9845
Merge pull request #3635 from owncloud/storage-wrapper
...
Give apps the option to wrap storage backends
2013-06-29 04:00:03 -07:00
68c0d54568
Merge pull request #3268 from owncloud/convert-oc_log
...
Convert OC_Log to object so it can be used for DI
2013-06-29 03:38:56 -07:00
30a403e327
Merge pull request #3892 from owncloud/static-streamwrapper
...
Improvements for the static:// streamwrapper
2013-06-28 12:24:33 -07:00
57370353ad
Check if the app is enabled and the app path is found before trying to load the script file
2013-06-28 20:34:28 +02:00
66e1eaac93
isError should detect a PEAR_Error even if the backend is PDO.
...
This can happen on errors during schema migration - which is always done with MDB2
2013-06-28 20:16:01 +02:00
e62eb2e8d1
correctly handle error results of PDO and MDB2 backends
2013-06-28 20:16:01 +02:00
dc0ebe9007
fix is_file and is_dir for the static streamwrapper
2013-06-28 19:54:16 +02:00
156e72a0c4
add option to clear the files in the static streamwrapper
2013-06-28 19:41:28 +02:00
f3c4a37a78
Merge pull request #3832 from owncloud/oracle_sql_fixes
...
for oracle use BITAND() instead of & in sharing permissions sql
2013-06-28 10:22:59 -07:00
a7c70915d5
fix storage wrapper namespaces
2013-06-28 18:18:12 +02:00
8ca0a957ad
Allow setting defaults and requirements for the api route
2013-06-28 17:25:10 +02:00
7d3490036c
Merge pull request #3838 from rgeber/master
...
Public Upload Feature
2013-06-28 07:30:41 -07:00
b1a2ddd149
Merge pull request #3799 from owncloud/fix_pdo_statement_wrapper_numrows_on_modification
...
Fix pdo statement wrapper numrows on modification
2013-06-28 07:15:38 -07:00
3bedb09753
Merge pull request #3843 from owncloud/sabre-exceptions
...
Sabre: throw exceptions when delete/create/write operations are not permitted
2013-06-28 07:05:09 -07:00
6ad7a0336f
Oracle doesn't know & as bitwise AND
...
Conflicts:
lib/public/share.php
2013-06-28 15:48:49 +02:00
125f9f4221
move storage wrappers to their own namespace
2013-06-28 15:34:25 +02:00
6ddfe2029c
Merge pull request #3865 from owncloud/fix_test_for_oracle
...
Fix sharing test for oracle
2013-06-28 06:18:56 -07:00
3b91ce695f
session_life_time -> session_lifetime
...
default session_lifetime is 24hrs
recreation of session is triggered at 50% of the session life time
2013-06-28 15:17:54 +02:00
df9e56efd0
Merge pull request #3839 from owncloud/unix_timestamp_replacement_for_oracle
...
manually calculate unix_timestamp for oracle
2013-06-28 06:11:28 -07:00
b04e09a901
Move DoctrineStatementWrapper to its own file
2013-06-28 11:48:38 +02:00
6145e61718
Remove deadcode
2013-06-28 11:42:23 +02:00
1edf01d09f
Fix usage of non existent consts
2013-06-28 11:15:25 +02:00
10951f9bd5
adding PHPDoc
2013-06-27 23:34:36 +02:00
de93b21505
missing $
2013-06-27 23:14:32 +02:00
12976fb2e1
Set debugMode after reading the config file
2013-06-27 22:50:28 +02:00
194b61b4c5
Revert "Can't determine if debug mode is defined until we read the config"
...
This reverts commit 969e43c87b
2013-06-27 22:24:17 +02:00
ae2b3732de
Use file_exists to fix the unittests
2013-06-27 22:23:53 +02:00
fb80cbd499
Fix review points
2013-06-27 22:01:52 +02:00
64f16f1db1
Fix stupid namespace separator
2013-06-27 21:57:59 +02:00
2eaad58922
Make the object drive the logging backend
...
This is the other way around then it was.
2013-06-27 20:10:54 +02:00
c6bbccc776
Merge branch 'master' into convert-oc_config
...
Conflicts:
lib/config.php
lib/setup.php
2013-06-27 17:54:17 +02:00
77dc3964f8
check item id is set
2013-06-27 17:39:44 +02:00
c4aef89278
introduce pre-disable-app hook and use it for the encryption app to reset migration status if the app was disabled
2013-06-27 14:09:22 +02:00
45c897acf3
one if less
2013-06-27 13:13:49 +02:00
29caae3491
[tx-robot] updated from transifex
2013-06-27 02:12:00 +02:00
3b31afb2a7
Oracle doesn't know & as bitwise AND
2013-06-26 21:40:31 +02:00
a9ee15cf40
Use Doctrine platform to add limit and offset to query
2013-06-26 20:48:01 +02:00
5d51118cb2
fix type of numeric columns
2013-06-26 20:03:24 +02:00
bf49edde6b
check item id is set
2013-06-26 19:57:28 +02:00
806f3bddec
increase size of preview to size of row
2013-06-26 18:19:13 +02:00
39c387eed4
implement server side use of previews
2013-06-26 18:04:22 +02:00
9b7efef39d
improve Image Provider
2013-06-26 14:28:40 +02:00
a98391b976
some minor improvements to preview lib
2013-06-26 11:18:53 +02:00
794c189650
session life time is now configurable and set to the same value
2013-06-26 09:21:38 +02:00
6208780332
Sabre: throw exceptions when delete/create/write operations are not permitted
2013-06-25 17:04:25 +02:00
39cca72964
Merge pull request #3750 from owncloud/dummy_session_for_errors
...
Init dummy session to render error pages
2013-06-25 03:34:49 -07:00
ddb0ff346d
Public upload feature
2013-06-25 12:24:14 +02:00
7273b43cd5
manuall calculate unix_timestamp for oracle
2013-06-25 09:52:04 +02:00
c3b8f2bf64
[tx-robot] updated from transifex
2013-06-25 02:13:40 +02:00
b32d6d8487
for oracle use BITAND() instead of & in sharing permissions sql
2013-06-24 22:52:01 +02:00
fae3cf1a87
Always quote db identifiers in OC_DB_MDB2SchemaReader
2013-06-24 22:38:19 +02:00
144a8eb01f
Quote tablenames
2013-06-24 22:38:19 +02:00
9fa4b78ba4
Use Doctrines Oracle sequence suffix
2013-06-24 22:38:19 +02:00
159efa8bd4
OCI doesn't have a queryString
2013-06-24 22:38:19 +02:00
6300b95896
UNIX_TIMESTAMP replace for Oracle
2013-06-24 22:38:19 +02:00
dca8c1cbc1
Fixes connecting to Oracle without port set
2013-06-24 22:38:19 +02:00
d1b76f1b88
Fix not null with empty default
2013-06-24 22:37:07 +02:00
c223bee6df
fix numRows usage in core lib
2013-06-24 16:29:59 +02:00
643c8d3088
make PDOStatementWrapper return number of updated rows on INSERT, UPDATE or DELETE queries, introduces isManipulation() to guess type of query
2013-06-24 16:29:58 +02:00
3e3b66bd0d
use to_char when comparing clob to string on oracle, use execute audited
2013-06-24 16:12:21 +02:00
377e9a8677
Merge branch 'master' into doctrine
2013-06-24 08:27:25 +02:00
a06d901e37
Fix: The check if upload_max_filesize or post_max_size is 0 fails if only one of them is 0.
...
$upload_max_filesize and $post_max_size need to be casted to (int) to match "=== 0"
2013-06-21 09:33:06 +02:00
59fa3055e1
Reviewed code for X-Sendfile2
...
Made some small changes which might have caused a segfault on ci.tmit.eu earlier.
2013-06-20 17:46:36 +03:00
4232ccbc6d
Merge pull request #3792 from owncloud/scanfolder-remove
...
remove deleted files when re-scanning a folder
2013-06-20 04:02:10 -07:00
c41f11a821
Merge pull request #3779 from shkdee/patch-1
...
Update user.php
2013-06-20 02:37:12 -07:00
3f20a080fe
Revert most changes for testing
2013-06-20 12:23:25 +03:00
372f261fe3
remove unnecessary exception handling
2013-06-20 10:50:53 +02:00
91c0b81130
add missing backticks
...
guys, please ...
2013-06-20 10:18:29 +02:00
01ab79d460
[tx-robot] updated from transifex
2013-06-20 02:43:39 +02:00
ff7e903f82
remove deleted files when re-scanning a folder
2013-06-20 00:42:34 +02:00
a25bfa9291
Update files.php
2013-06-19 23:44:45 +02:00
46f97f4c38
Implement X-Sendfile2 for resume support in LigHTTPd
...
LigHTTPd does not support HTTP Range headers with the X-Sendfile header in the way Apache does. Instead, it needs to be handled in the backend. This commit does exactly that, using the X-Sendfile2 header to send ranges of files.
To accomplish this without breaking web servers that don't support X-Sendfile2, a new variable MOD_X_SENDFILE2_ENABLED was introduced to separate this method from X-Sendfile and X-Accel-Redirect.
2013-06-19 15:36:48 +02:00
fb67b45841
comment out old code
2013-06-19 13:41:01 +02:00
cb41b88520
Merge pull request #3764 from owncloud/scanfolder-existing
...
Improve re-using existing data in the filescanner
2013-06-19 04:30:55 -07:00
8406d3f7b1
also use the default theme if the theme is set to an empty string in the config.php
2013-06-19 11:58:29 +02:00
904227a0e4
Merge pull request #3661 from owncloud/fixing-windows-server-master
...
Fixing windows server master
2013-06-19 02:42:18 -07:00
1fcbf8dd7a
implemenet getNoCoverThumbnail
2013-06-19 10:21:55 +02:00
4a480e4f53
Update user.php
...
Fixes $_setupedBackends[] into self::$_setupedBackends[] so that setuped backends are REALLY remembered and not instanciated many times.
2013-06-18 21:47:47 +03:00
78678be2b6
remove dangling AND in SQL statement
2013-06-18 16:18:19 +02:00
cc478d2f48
use ppt icon instead of preview
2013-06-18 13:53:02 +02:00
bea4376fd4
remove opendocument.php
2013-06-18 11:04:08 +02:00
fbbb6ef8ef
Init dummy session first
2013-06-17 23:41:07 +03:00
2ed0e6e915
add tests for reusing existing data in scanner
2013-06-17 18:03:57 +02:00
63c898c064
Make rmdir recursive for local storage
2013-06-17 17:34:09 +02:00
1a933a9173
Merge branch 'master' into oc_preview
2013-06-17 12:31:02 +02:00
6082a0649c
stream first mb of movie to create preview
2013-06-17 12:27:26 +02:00
383e4c62b5
in case $_SERVER['HTTP_HOST']) is not set let's return localhost - better than nothing
2013-06-17 00:02:42 +02:00
e013e7adea
Merge pull request #3621 from owncloud/path-mimetype
...
seperate mimetype guessing from filename
2013-06-16 13:14:16 -07:00
0ac7c5712a
Merge pull request #3721 from owncloud/oracle_setup_fixes
...
Oracle setup fixes
2013-06-14 11:21:02 -07:00
f10a4db889
scanner: give more percision about what data is reused during scanning
2013-06-14 16:58:14 +02:00
9498cf959f
remove default tablespace in parameter
2013-06-14 15:54:45 +02:00
1ef66941a7
adding default to $hint within ctor of DatabaseSetupException
2013-06-14 15:38:09 +02:00
30c09d0c8b
split of scanning the childs of a folder
2013-06-14 15:35:06 +02:00
5c7d7549ea
coding style
2013-06-14 13:54:41 +02:00
471b9c055a
use executeAudited in sabredav lock
2013-06-14 12:23:44 +02:00
961a001af3
add missing backticks, use executeAudited in post_deleteGroup and post_removeFromGroup
2013-06-14 12:18:20 +02:00
e5d3cd59ac
use USERS tablespace whn none is given, only needed when we need to create a user, does not need to be stored in config
2013-06-14 12:09:49 +02:00
dcdabac04d
oracle does not need sequence suffix, manually set database name to allow fetching db schema, don't shutdown db - we are using utf8 to connect
2013-06-14 12:06:29 +02:00
87521f6c6e
dirname('/test.txt') returns '\' on windows whereas on linux we get back '.'
2013-06-14 11:59:30 +02:00
8d62bb3aab
Merge pull request #3684 from owncloud/pg_install_db_master
...
Try connection with specified db when postgres does not work
2013-06-14 02:50:01 -07:00
7093b0829f
improve comment
2013-06-14 11:28:33 +03:00
c8564c0795
Merge branch 'master' into move-maint-start
...
Conflicts:
lib/util.php
2013-06-14 10:06:13 +02:00
6c534c8165
[tx-robot] updated from transifex
2013-06-14 02:52:34 +02:00
8edb56de05
Merge pull request #3690 from owncloud/use_execute_audited_in_filecache
...
use executeAudited in files cache
2013-06-13 13:55:55 -07:00
2a58cf8117
Merge pull request #3686 from owncloud/minor_exception_cleanup
...
minor cleanup for exception handling
2013-06-13 13:50:31 -07:00
7889f2ef5c
Merge pull request #3687 from owncloud/template_updates
...
Make templates aware of different owncloud editions
2013-06-13 07:32:41 -07:00
31f7afe56a
PDOException has no previous(), oh the consistency ...
2013-06-13 13:14:00 +02:00
54f3174665
Merge pull request #3640 from infoneo/master
...
Folders with multiple periods problem fix
2013-06-13 03:34:36 -07:00
25981a079a
some whitespace fixes
2013-06-13 09:52:39 +02:00
84a8aea410
restore Updater functionality on non-Windows platforms
2013-06-13 00:09:52 +02:00
54f9477f34
fix another double wrapped array
2013-06-12 23:01:52 +02:00
6d55a062be
remove additional array wrapping
2013-06-12 21:23:34 +02:00
d3eadcde56
use executeAudited in files cache
2013-06-12 20:11:53 +02:00
7a575cc2d7
short explanation about OC_Defaults
2013-06-12 16:33:09 +02:00
839bce80c6
make main menu aware of the different owncloud editions
2013-06-12 16:20:23 +02:00
5c6a854489
add default doc url
2013-06-12 16:19:28 +02:00
f89a23b463
implement unknown preview backend
2013-06-12 16:18:16 +02:00
f7dc07602b
minor cleanup for exception handling
2013-06-12 15:48:22 +02:00
e1e798c623
make footer and urls aware of ownCloud editions
2013-06-12 15:44:11 +02:00
b29e01d5cf
keep all strings in one place to make it easier to change them
2013-06-12 15:15:08 +02:00
e33f68ecb6
Correct escaping
2013-06-12 14:36:28 +02:00
edc255421c
Try connection with specified db when postgres does not work
...
Conflicts:
lib/setup.php
2013-06-12 14:36:07 +02:00
1f52ad0363
work on powerpoint fallback
2013-06-12 13:20:59 +02:00
1abce78cb8
Merge pull request #3654 from owncloud/clean_up_exceptions
...
Introduce more robust SQL execution and exception handling
2013-06-12 04:13:12 -07:00
228e084e65
finish implementation of Excel preview fallback
2013-06-12 11:40:01 +02:00
0eed1c980d
Merge pull request #3652 from owncloud/fix_fetchrow_usage_for_mdb2
...
fix fetchRow checks to also work with MDB2
2013-06-11 06:20:27 -07:00
e238eeef6f
Merge pull request #3650 from owncloud/use_to_char_for_oracle_clob_comparisons
...
use to_char to allow comparing string to CLOB cloumns in oracle
2013-06-11 05:34:55 -07:00
118f2b3283
createUser() needs to return something; the user object or false
2013-06-11 13:48:17 +02:00
67816da0bf
save current work state of office fallback
2013-06-11 13:15:24 +02:00
28cf63d37d
check if imagick is loaded in office.php, not in libreoffice-cl.php
2013-06-11 11:00:44 +02:00
2ff97917e9
code optimization
2013-06-11 10:56:16 +02:00
0e4f5001d5
don't crop Y axis
2013-06-11 10:45:50 +02:00
74a170f2a5
[Fixing unit tests in Windows]
...
on windows open resources will be locked while the stream is open.
closing the resource allows deletion below
2013-06-10 19:28:55 +02:00
c0b25a4375
[Fixing Updater Unit Tests on Windows]
...
using $internalPath within call to self::correctFolder() because $path inside of it is not processed properly due to directory separator on Windows.
2013-06-10 18:47:36 +02:00
073306eaa2
[Fixing Updater Unit Tests on Windows]
...
using $internalPath within call to self::correctFolder() because $path inside of it is not processed properly due to directory separator on Windows.
error logging has been added in case the given 4path is not found within self::correctFolder
2013-06-10 18:35:47 +02:00
969e43c87b
Can't determine if debug mode is defined until we read the config
2013-06-10 12:07:25 -04:00
875c18b115
fix fetchRow checks to also work with MDB2
2013-06-10 17:43:09 +02:00
b7b6075d55
Fix potential glob error
2013-06-10 11:42:20 -04:00
988b539dd7
Let's just use '/' as we do almost everywhere - this change fixes two failing unit tests
2013-06-10 17:27:21 +02:00
1da112750e
Merge pull request #3647 from owncloud/missing_backticks
...
add missing backticks all over the place
2013-06-10 05:15:07 -07:00
86c5243be5
remove duplicate logging from db.php, now happens in entrypoints
2013-06-10 14:03:12 +02:00
8dc6bdd96b
clean up usage of DatabaseSetupException and catch Exceptions in entrypoints
2013-06-10 13:45:19 +02:00
c0bdbd9d81
introduce and use executeAudited in db.php
2013-06-10 12:56:45 +02:00
d264d0a79d
Merge pull request #3648 from owncloud/sql_limit_as_param
...
convert LIMIT to parameter
2013-06-10 02:48:15 -07:00
db06b906e5
Merge pull request #3610 from owncloud/encryption_recovery_for_ldap
...
recover encryption keys if ownCloud can't change the log-in password
2013-06-10 02:03:56 -07:00
25e8ac1c2f
implement previews for single shared files
2013-06-10 11:01:12 +02:00
5ec13742b3
use to_char to allow comparing string to CLOB cloumns in oracle
2013-06-10 10:33:02 +02:00
a2bb0faec6
Merge branch 'master' into oc_preview
2013-06-10 10:15:53 +02:00
307f1626e8
convert LIMIT to parameter
2013-06-10 10:04:52 +02:00
124f34422c
add missing backticks all over the place
2013-06-10 09:53:29 +02:00
b39113ae3e
Update mapper.php
...
Now slugify is performed on whole filename (including extension). Changed method of adding index number (using regular expressions pathinfo() method removed).
2013-06-08 18:39:25 +03:00
3c79d89492
[tx-robot] updated from transifex
2013-06-08 02:13:41 +02:00
94ca576c9a
use a getter for the storage loader to ensure the instance is created
2013-06-07 17:50:10 +02:00
2708ab09ab
storage loader needs to be accessible by apps
2013-06-07 17:40:19 +02:00
85a9b7f094
Storage wrapper: provide access to the wrapped storage
2013-06-07 17:12:45 +02:00
f35578ec54
merge master into storage-wrapper
2013-06-07 17:12:16 +02:00
bd67512409
manage creating and wrapping storages in it's own class
2013-06-07 17:07:13 +02:00
9ef989f917
Merge pull request #2919 from owncloud/hook-improvements
...
Hook improvements
2013-06-07 06:35:50 -07:00
8114537310
Merge branch 'master' into oc_preview
2013-06-07 09:46:13 +02:00
67c085417c
[tx-robot] updated from transifex
2013-06-07 02:17:50 +02:00
85abede9bf
actually return result
2013-06-07 00:22:05 +02:00
0470a5ba94
fix variable name
2013-06-07 00:17:51 +02:00
cf7321915d
seperate mimetype guessing from filename
2013-06-06 23:51:44 +02:00
fdaab7372e
always emit the preSetPassword hook, this should only indicate the intention. Finally the post-hooks indicate if it was successful or not
2013-06-06 13:30:18 +02:00
85ecec8b01
Merge branch 'master' into oc_preview
2013-06-06 11:13:55 +02:00
81b6cab94f
[tx-robot] updated from transifex
2013-06-06 02:21:31 +02:00
f80aba4893
use tmpdir var instead of hardcoded /tmp
2013-06-05 12:58:39 +02:00
21cc4f6960
make libreoffice preview backend work :D
2013-06-05 12:45:20 +02:00
8c5fceba29
fix syntax error
2013-06-05 11:13:13 +02:00
bab8b20cbd
use ->cmd instead of hardcoded libreoffice
2013-06-05 11:06:36 +02:00
f437673f1a
update require_once block in preview.php
2013-06-05 10:55:57 +02:00
749c33f39d
escape tmppath shell arg
2013-06-05 10:53:16 +02:00
bcc4fca257
save current work state of libreoffice preview backend
2013-06-05 10:50:20 +02:00
666a5c1cc7
[tx-robot] updated from transifex
2013-06-05 02:01:42 +02:00
9cd6645037
Move comment and set requesttoken.
2013-06-05 00:38:08 +02:00
cb9fe475c4
Merge branch 'master' into hook-improvements
...
Conflicts:
lib/files/view.php
2013-06-04 18:19:08 -04:00
e0359b0b24
One more style fix
2013-06-03 18:17:32 -04:00
1c61732193
Merge branch 'master' into convert-oc_config
2013-06-03 18:06:13 -04:00
d50d663928
Style and comment fixes
2013-06-03 18:05:38 -04:00
c8a2beccb0
Cache: mount user mountpoints to make sure that // exists before accessing it. Fixes #2553 and #2374
2013-06-03 22:36:36 +02:00
96b1e54d4a
Merge pull request #3444 from owncloud/share-fix
...
Fix undefined index for share mount point retrieval
2013-06-03 11:35:06 -07:00
8c991d97aa
Merge pull request #3561 from owncloud/user
...
Refactor of user management
2013-06-03 08:13:40 -07:00
2572c9a6b7
Merge pull request #3578 from owncloud/ocdialog
...
Replacement for jquery.dialog to fit better with ownCloud design.
2013-06-03 06:37:27 -07:00
0ce2b2708c
also clear cached users when removing a single backend
2013-06-03 14:19:17 +02:00
2a82964830
use caching for userExists
2013-06-03 13:46:05 +02:00
83fbdc903f
cast result to bool
2013-06-03 13:39:34 +02:00
eb2a1e0f8a
move phpdoc comments
2013-06-03 13:33:56 +02:00
1a4021a0fe
User: return backend result
2013-06-03 13:19:01 +02:00
fbe3213fec
User: consisten variable naming
2013-06-03 13:17:03 +02:00
00b4bfcbf5
User: remove determineDisplayName
2013-06-03 13:15:42 +02:00
b76725c1fa
Merge pull request #3560 from owncloud/init-order-session
...
initialize the session earlier
2013-06-03 03:21:05 -07:00
34decf3576
save current work state
2013-06-03 11:24:37 +02:00
38bd234686
make sure the filesystem is setup before doing mount operations
2013-06-02 22:09:44 +02:00
901b1150ff
Replacement for jquery.dialog to fit better with ownCloud design.
2013-06-02 21:52:59 +02:00
b5e817d638
fix clearing mounts when filesystem isn't initialized yet
2013-06-02 21:44:24 +02:00
251527c6e6
merge master into backgroundjob
2013-06-02 20:12:44 +02:00
1b3c9fe5ae
Merge pull request #3454 from owncloud/fix_hasInternetConnection
...
isinternetconnectionworking should return false if OC_Config::getValue("has_internet_connection") is false
2013-05-31 17:05:45 -07:00
3e00a3603c
adding PHPDoc comment to getManager()
...
adding PHPDoc comment for $user within the hooks callbacks
fixing PHPDoc comment on isLoggedIn()
2013-06-01 00:49:06 +02:00
2c69403fd6
fix namespacing error
2013-06-01 00:39:59 +02:00
82fd15706e
fix undefined variables
2013-06-01 00:39:59 +02:00
e430f442b5
use single quotes
2013-06-01 00:39:59 +02:00
dd4a07321a
fix method naming
2013-05-31 23:24:09 +02:00
94a6622bcd
Merge pull request #3459 from owncloud/fix_for_2377
...
fix problems with german "Umlaut" in folder name
2013-05-31 14:00:02 -07:00
b840de4e01
user should set into session before postLogin hook otherwise it will break not only the files_encryption app
2013-05-31 21:30:13 +02:00
cdb2f559a8
Fix postLogin hook
2013-05-31 19:58:31 +02:00
473f3c6916
fix typo
2013-05-31 18:18:13 +02:00
f00844a003
fix caching of user objects
2013-05-31 17:42:51 +02:00
b8b0b7606a
initialize the session earlier
2013-05-31 17:31:52 +02:00
a8fb803319
cache instances of \OC\User\User
2013-05-31 17:31:27 +02:00
542bcf9156
Merge branch 'master' into user
2013-05-31 16:35:51 +02:00
a11a40d9a9
add backend for microsoft office 2007 documents
2013-05-31 12:23:51 +02:00
d636e168a6
Merge pull request #3527 from owncloud/file_encryption_external_storage_fixes
...
File encryption external storage fixes
2013-05-31 03:21:46 -07:00
ad5c4bf771
Cleanup hacke v.2
2013-05-31 00:53:57 +02:00
e21649ccff
Revert "Clean up hack."
...
This reverts commit 138c7f615b
2013-05-31 00:53:15 +02:00
138c7f615b
Clean up hack.
2013-05-31 00:28:03 +02:00
bd0d189f6f
Merge branch 'master' into googledrive
2013-05-30 11:20:22 -04:00
f7c80a391d
load getID3 only if needed
2013-05-30 15:29:38 +02:00
476747ee89
Merge pull request #3509 from owncloud/update_jquery_to_1_10
...
Update jquery to 1.10.0 and add jquery-migrate 1.2.1
2013-05-30 06:00:52 -07:00
aa1c5a5d63
Merge pull request #3529 from owncloud/folder-permissions
...
Cache: provide a function to get the permissions of all files in a folder with one query
2013-05-30 05:54:29 -07:00
b944b1c5d2
add javascript preview backend
2013-05-30 11:12:12 +02:00
a014662c52
improve imagick error handling
2013-05-30 11:06:52 +02:00
5433a50461
validate size of file
2013-05-30 10:44:27 +02:00
8e1d9261aa
[tx-robot] updated from transifex
2013-05-30 02:34:14 +02:00
313631edf6
Merge branch 'master' into file_encryption_external_storage_fixes
...
Conflicts:
apps/files_encryption/hooks/hooks.php
2013-05-30 00:45:29 +02:00
dbbf195727
Only retrieve the current user's permissions
2013-05-29 18:08:18 -04:00
1337f48d64
fixes for pgsql
2013-05-29 20:41:07 +02:00
5c04b3a63a
fix wrong signature delimiter - fix #3523
2013-05-29 20:21:48 +02:00
f1b884aa5d
changed deprecated class
2013-05-29 20:15:04 +02:00
353d19d183
fixes if cache returns false
2013-05-29 20:11:13 +02:00
c8d1cd224d
fix $parent/$source typo
2013-05-29 19:58:05 +02:00
5bbc583b56
Merge pull request #3532 from owncloud/scan-update
...
Only update metadata that has changed
2013-05-29 10:23:41 -07:00
1202ab9995
Merge branch 'master' into file_encryption_external_storage_fixes
2013-05-29 19:19:40 +02:00
59655e9afd
Style fixes
2013-05-29 10:56:28 -04:00
ea55367678
Organize conditionals in a better order
2013-05-29 10:40:05 -04:00
04805d0be9
Only update metadata that has changed
2013-05-29 10:19:03 -04:00
24a401a548
Cache mimetype icons
2013-05-29 15:43:41 +02:00
ae0f37e9e2
fix indention
2013-05-29 15:37:27 +02:00
44d217c425
Cache: provide a function to get the permissions of all files in a folder with one query
2013-05-29 15:25:42 +02:00
8587f565d2
remove unnecessary variable
2013-05-29 15:14:15 +02:00
63a2bec6e5
use public API for error handling; improved while condition
2013-05-29 14:40:47 +02:00
893a1ed6f5
for external storages we never reach the path 'files', instead we need to leave the loop if no further parent exists
2013-05-29 14:19:18 +02:00
d8008ae421
Merge branch 'master' into oc_preview
2013-05-29 13:24:14 +02:00
a76360347c
fix c&p fail
2013-05-29 13:13:47 +02:00
672811c103
if one public link share was found, we don't have to check it for the other folders
2013-05-29 13:12:30 +02:00
1e252b6763
more style fixes
2013-05-29 13:11:43 +02:00
b44192f366
check list of users with access to the file from the bottom to the top. This way we avoid calling getFileInfo() on every dir, which creates a lot of overhead, especially for external storages
2013-05-29 13:10:26 +02:00
6b90416891
add php preview backend
2013-05-29 13:09:38 +02:00
7408ab660a
respect coding style guidelines
2013-05-29 13:03:33 +02:00
268246fac8
namespace fix
2013-05-29 12:48:21 +02:00
fa6b96090a
move to OC namespace
2013-05-29 12:46:54 +02:00
eebc15dce0
connect preview lib to filesystem hooks
2013-05-29 12:01:43 +02:00
7c0c6bd779
[tx-robot] updated from transifex
2013-05-29 02:10:54 +02:00
8320f41dbe
Emit leacgy OC_User hooks
2013-05-29 01:05:49 +02:00
3e7e2c8a5c
fix setting getting active userid
2013-05-29 00:47:55 +02:00
198655f109
fix User->setHome when the backend action fails
2013-05-29 00:47:44 +02:00
4b688db612
implement old user api on top of the new one
2013-05-29 00:32:10 +02:00
955bda1842
New user management classes
2013-05-29 00:31:55 +02:00
1d799f22c1
Default to localhost, if nothing is entered.
2013-05-28 17:34:57 +02:00
57f712f8a9
implement ArrayInterface with Session
2013-05-28 16:52:40 +02:00
a03787bc42
make preview cache work with encryption and improve error handling
2013-05-28 16:04:39 +02:00
cc0cf93136
merge master into sessionclass
2013-05-28 14:55:42 +02:00
08a022aaa4
don't give ffmpeg wanted size, cause it doesn't care about aspect ratio
2013-05-28 12:09:46 +02:00
55b00fe819
make pdf backend work with encryption
2013-05-28 11:59:20 +02:00
738cc48a85
make mp3 backend work with encryption
2013-05-28 11:49:18 +02:00
4d52dfb0a0
make movie backend work with encryption
2013-05-28 11:48:02 +02:00
7555332d58
remove whitespace
2013-05-28 11:31:48 +02:00
5ae1333c76
add preview backend for text based files
2013-05-28 11:29:01 +02:00
707f52f1db
check if the imagick extension is loaded
2013-05-28 10:23:40 +02:00
005d8e9870
update images.php
2013-05-28 10:21:02 +02:00
3420d853ab
[tx-robot] updated from transifex
2013-05-28 02:07:51 +02:00
040045cc2e
provide a dummy session for CLI
2013-05-28 01:15:38 +02:00
f547b66d6b
check fix if session start is successfull
2013-05-28 01:13:36 +02:00
e73c04501e
Fix session not working error
2013-05-28 01:10:18 +02:00
44f9af5a7f
Use the new session wrapper
2013-05-28 01:04:09 +02:00
76d13120ea
Abstract the session away in a class
2013-05-28 00:50:00 +02:00
9e65f40d1b
Add PublicEmitter class
2013-05-27 20:20:06 +02:00
3001db6b50
Update jquery to 1.10.0 & add jquery-migrate 1.2.1
2013-05-27 20:13:13 +02:00
557cc4c1ab
make method names camelCase
2013-05-27 19:24:31 +02:00
d69b7e24d2
update comment
2013-05-27 19:20:29 +02:00
58c9175a56
move check if internet connection is disabled on purpose to a dedicated method
2013-05-27 19:19:17 +02:00
16925672e8
Merge branch 'master' into googledrive
2013-05-27 11:35:57 -04:00
0953b68556
Return null if file size is negative for WebDAV, fix #2013
2013-05-27 11:35:31 -04:00
6151c0d310
Merge pull request #3412 from owncloud/fix_2013
...
Don't set Content-Length header if size is unknown
2013-05-27 07:44:35 -07:00
62411965f9
make svg preview backend work with encryption
2013-05-27 11:09:55 +02:00
f78e002096
make image preview backend work with encryption
2013-05-27 10:45:21 +02:00
73e0b4c10a
[tx-robot] updated from transifex
2013-05-27 02:07:24 +02:00
0c621ff6a9
[tx-robot] updated from transifex
2013-05-26 02:03:54 +02:00
adcafbde34
Merge branch 'master' into fix_for_2377
2013-05-25 20:37:28 +02:00
505a300776
we should also normalize on update and search because the database layer will not do this for us
2013-05-25 20:35:12 +02:00
0fdf3a7e63
Merge pull request #3388 from roha4000/master
...
Duplicate DB entries in filecache table when renaming folder in WebUI #2
2013-05-25 11:18:20 -07:00
c870aed1b6
Merge pull request #3493 from owncloud/bumpversion
...
Bump version for files_encryption changes
2013-05-25 10:20:42 -07:00
2893bb9543
Bump version for files_encryption changes
2013-05-25 11:42:28 -04:00
0a29d2029a
Clear opcode caches after writing to the config file, fixes #3372
2013-05-25 11:25:43 -04:00
c245f5a99f
added more places where normalization is needed
2013-05-25 14:56:00 +02:00
f6bf9de6de
prevent for returning while false normalize string
2013-05-25 14:54:36 +02:00
af57996d1e
Merge branch 'master' into oc_preview
2013-05-25 12:16:25 +02:00
e66f609a64
Hack base.php to make Basic Auth work
2013-05-25 05:51:51 +03:00
6a6c18dfab
[tx-robot] updated from transifex
2013-05-25 02:11:52 +02:00
d12e44f96a
Merge branch 'master' into doctrine
...
Conflicts:
lib/MDB2/Driver/sqlite3.php
lib/base.php
lib/db.php
2013-05-24 21:46:42 +02:00
946e9ccc0a
Merge branch 'master' into fix_for_2377
2013-05-24 20:54:13 +02:00
736f10039d
changed builtin normalizer to \OC_Util::normalizeUnicode
2013-05-24 20:36:20 +02:00
661b5501b0
added normalizeUnicode() method to OC_Util
2013-05-24 20:35:01 +02:00
4911305887
Merge pull request #3416 from owncloud/files_encryption
...
New files encryption app
2013-05-24 02:21:19 -07:00
3fbfe3c06a
small typo in the comments
2013-05-23 20:59:02 -04:00
a98d6c4be6
Merge pull request #3425 from owncloud/move-storages
...
Support for moving/copying folders between storages
2013-05-23 17:35:11 -07:00
b47729c5fc
[tx-robot] updated from transifex
2013-05-24 02:02:43 +02:00
d4b700ef4e
revert previous fix and added normalizer to cache class
2013-05-23 20:29:46 +02:00
30330b4343
Merge branch 'master' into move-storages
...
Conflicts:
tests/lib/files/view.php
2013-05-23 10:25:12 -04:00
3b6d850e59
Switch to calling deleteAll via storage to avoid emitting delete hook
2013-05-23 10:23:16 -04:00
85e0c78166
fix problems with german "Umlaut" in folder name
2013-05-23 01:21:36 +02:00
ee53bd1aa3
Merge branch 'master' into files_encryption
...
Conflicts:
lib/files/cache/cache.php
2013-05-22 15:29:22 +02:00
00985068ca
add previews for public files
2013-05-22 15:13:02 +02:00
1f1abe595d
cleanup codestyle
2013-05-22 13:59:08 +02:00
cbd5eb9a1a
use to_char only for oracle, whitespace
2013-05-22 13:59:07 +02:00
eceb3c8ed5
add debug output
2013-05-22 13:59:07 +02:00
1b68c0c0cd
allow install when only oracle is available
2013-05-22 13:56:57 +02:00
efb2e69230
fix return value of OC_Util::isinternetconnectionworking()
2013-05-22 12:21:11 +02:00
9fd2be0757
Merge pull request #3406 from owncloud/oc_dialogs_oc_template
...
Use js templates in OC.dialogs etc.
2013-05-22 03:00:04 -07:00
2ea2abf11e
Fixing UPDATE error in filecache table when renaming files by calling move(). Add storage id to the where clause to avoid updating entries of other users.
2013-05-22 08:18:57 +02:00
7a0c592f93
Fix undefined index for share mount point retrieval
2013-05-21 20:21:19 -04:00
28d72b822d
Merge branch 'master' into files_encryption
...
Conflicts:
lib/files/cache/cache.php
2013-05-22 01:26:35 +02:00
e2444ec9c5
Merge pull request #3266 from owncloud/hooks
...
New hook system
2013-05-21 15:21:25 -07:00
81fd1badc3
merge master into filecache_mtime
2013-05-21 23:35:19 +02:00
fb4d8ddf0a
Merge pull request #3335 from owncloud/prevent-scan-loop
...
Prevent backgroundScan() from looping
2013-05-21 09:15:22 -07:00
c62f230ddb
Merge branch 'master' into move-maint-start
2013-05-21 11:26:56 -04:00
5cd14425f9
Merge branch 'master' into files_encryption
...
Conflicts:
apps/files_trashbin/l10n/nn_NO.php
2013-05-21 15:30:19 +02:00
13c6ef1ba9
add svg backend
2013-05-21 12:23:31 +02:00
09ff46eda2
Remove user name addition to paths in deleteAll
2013-05-20 10:21:55 -04:00
c38dc36665
Remove debug output
2013-05-20 13:56:57 +02:00
b1bb899867
Add rename() method to OC_VCategories.
2013-05-20 10:16:07 +02:00
31037241e1
Merge branch 'master' into files_encryption
2013-05-20 02:25:56 +02:00
6609de28d8
[tx-robot] updated from transifex
2013-05-20 02:10:11 +02:00
58a8d67a9b
fix for webdav because initMounts() is triggered twice so we lost the root path
2013-05-20 01:57:16 +02:00
b3b6738d59
Revert "fix for webdav and wrong reference for findByStorageId"
...
This reverts commit 079f918d5c
2013-05-20 01:47:35 +02:00
079f918d5c
fix for webdav and wrong reference for findByStorageId
2013-05-19 22:30:03 +02:00
fc5bce1f76
Fix undefined variable for copying empty folders
2013-05-19 15:04:41 -04:00
41e2d64c86
Add support for copying/moving folders between storages, move isIgnoredDir() to Filesystem
2013-05-19 14:15:49 -04:00
67729f5f9f
Merge pull request #3421 from owncloud/pre_login_password
...
Add password to pre_login
2013-05-19 10:09:24 -07:00
7ec36c5bbb
Add password to pre_login
...
I need this to intercept passwords for my WIP multi-factor
authentication app.
2013-05-19 13:33:33 +02:00
9bebf9b4c8
Don't set Content-Length header if size is unknown
2013-05-17 14:14:12 -04:00
dd06387a9c
remove whitespace
2013-05-17 19:08:16 +02:00
854da1d9ca
Add classes replaced by the public api to the code checker
2013-05-17 15:48:51 +02:00
d42aa65532
implement movie previews
2013-05-17 15:06:37 +02:00
8b39a08512
fix typo
2013-05-17 12:00:32 +02:00
0305ee50c5
Merge branch 'master' into oc_preview
2013-05-17 11:41:30 +02:00
04a4234b9e
implement mp3 preview backend
2013-05-17 11:32:42 +02:00
f29b8cf685
set default value of scalingup to true
2013-05-17 11:30:44 +02:00
8dba46912d
Disable transparent backgrounds for now
2013-05-17 11:28:53 +02:00
0f314c1404
Merge pull request #3375 from owncloud/fix_for_SQLite3Result_object_in_post_addToGroup
...
fix for SQLite3Result::fetchArray() on setup
2013-05-17 01:55:28 -07:00
837c6ed597
implement pdf preview backend
2013-05-17 09:43:25 +02:00
40597ac944
implement OC_Preview
2013-05-17 09:42:20 +02:00
6a6079176b
[tx-robot] updated from transifex
2013-05-17 02:07:36 +02:00
d7dc710c8b
revert changes
2013-05-17 01:22:30 +02:00
a92dead754
only connect share hooks if installation OC is installed
2013-05-17 01:20:02 +02:00
469d6028ad
revert changes
2013-05-17 01:17:55 +02:00
95297c2469
add pre-shared hooks
2013-05-16 17:44:28 +02:00
9d1e60325c
allow admin to recover users files in case of password lost
2013-05-16 14:53:04 +02:00
c8bbf90feb
Port OC.dialogs to use octemplate except for prompt() and form().
...
Also load octemplate per default.
2013-05-16 13:41:04 +02:00
966c2231e3
[tx-robot] updated from transifex
2013-05-16 02:01:37 +02:00
195f6143a3
Merge branch 'master' into convert-oc_config
2013-05-15 23:51:13 +02:00
3c779b0632
Merge branch 'master' into hooks
2013-05-15 23:49:41 +02:00
5dcec346e5
Merge branch 'master' into fix-3353
2013-05-15 23:43:46 +02:00
dfddaf8fbf
Merge pull request #3374 from owncloud/vobject_compound_property
...
Add Compound property to avoid double escaping values.
2013-05-15 14:34:16 -07:00
c50bf3e3c5
fix for losing mount point "/"
2013-05-15 20:09:02 +02:00
68059b1ec3
fix for SQLite3Result::fetchArray(): The SQLite3Result object has not been correctly initialised in post_addToGroup
2013-05-15 19:49:40 +02:00
cb41a30b00
Add Compound property to avoid double escaping values.
2013-05-15 18:56:54 +02:00
0916769f67
fix for SQLite3Result::fetchArray(): The SQLite3Result object has not been correctly initialised in post_addToGroup
2013-05-15 17:00:01 +02:00
d91161186b
Fix finding mount in background watcher, fixes #3353
2013-05-15 09:33:38 -04:00
751487ded7
merge changes for files_encryption
2013-05-15 10:20:19 +02:00
807740a07a
fix for losing mount point "/"
2013-05-15 10:19:38 +02:00
226aec8d56
Merge branch 'master' into files_encryption
2013-05-15 03:22:06 +02:00
f8336c1e2c
Turn off theme before update
2013-05-14 09:34:01 -04:00
71eed76dbe
Prevent backgroundScan() from looping if opendir() is failing for the same path
2013-05-13 11:17:08 -04:00
009e9559f3
Remove default return hint
2013-05-13 08:28:10 +02:00
061fb79e5c
Use the constants from OC_Log
2013-05-13 08:28:10 +02:00
31ad43f922
Code style
2013-05-13 08:28:10 +02:00
0b4018e7ff
Remove include for loading legacy class
2013-05-13 08:28:10 +02:00
7e5bb96027
Fix OC\Log with OC_Log in wrong namespace
2013-05-13 08:28:10 +02:00
b41999a2c0
Implement OC\Log as proxy to OC_Log
...
OC\Log implements the Psr\Log\LoggerInterface interface. See
https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md
for the full interface specification.
2013-05-13 08:28:10 +02:00
0e55accee2
Set the SQLite database lock timeout to 60 seconds which is the default in PHP anyways. I don't know why the MDB2 driver has this hardcoded to 0.1 seconds. This potentially fixes a lot of SQLite database lock problems and stuck in maintainance mode during upgrade issues.
2013-05-13 02:42:18 +02:00
be4eef682a
Fixed problems with a dots in a filenames
2013-05-12 15:22:57 +03:00
c5cb3f9577
Merge pull request #3311 from owncloud/disable_mbstring.func_overload
...
disable mbstring.func_overload in setup v.3
2013-05-12 03:28:18 -07:00
baf058316c
disable mbstring.func_overload in setup
2013-05-12 10:56:32 +02:00
63d51980e1
Get config from template
2013-05-12 10:51:21 +02:00
74f92d0c7f
[tx-robot] updated from transifex
2013-05-12 02:05:29 +02:00
8f19c5ecab
Dots in a filenames fix
2013-05-12 01:47:48 +02:00
9f3c156aca
Merge pull request #3283 from owncloud/move-legacy-fs
...
Move legacy filesystem classes
2013-05-10 07:53:04 -07:00
9134395b43
don't emit rename hooks on partial file renames
2013-05-10 12:01:50 +02:00
c3b0d3d38c
rename isIgnoredFile to isPartialFile, remove check of blacklisted files in isPartialFile, correct usage of isPartialFile and isFileBlacklisted
2013-05-10 12:00:13 +02:00
990f23c024
fix typo
2013-05-09 22:52:44 +02:00
2e81efc37e
don't call correctFolder() in touchHook, it will be called later in the writeUpdate()
2013-05-08 23:00:24 +02:00
0e30e68b22
update etag for for the touched file
2013-05-08 23:00:03 +02:00
d97ef0805b
Add mechanism to allow apps to wraper storage classes
2013-05-08 22:35:10 +02:00
83444d9c64
camelCase class properties
2013-05-08 18:20:44 +02:00
9f5b7657fb
Remove include for loading legacy class
2013-05-08 18:17:26 +02:00
ba9db19640
Add wrapper storage backend
2013-05-08 16:53:05 +02:00
d9c19fa8d7
Move legacy filesystem classes
2013-05-08 16:48:47 +02:00
e8a80c6c2f
Merge pull request #3271 from owncloud/fix_for_util_tearDownFS
...
fix for tearDownFS, after filesystem::tearDown() in Util
2013-05-08 05:43:54 -07:00
71fc4a2cf4
Autoloader: fix loading app clases located in lib/
2013-05-08 00:50:33 +02:00
2a01d39940
Autoloader: load the 3rdparty libraries using prefixes
2013-05-07 23:07:47 +02:00
0d25c0001c
check for setlocale after setting up the paths to prevent autoloader confusion
2013-05-07 22:53:07 +02:00
6d903cf7ae
Autoloader: add support for custom namespace paths
2013-05-07 22:39:35 +02:00
72ed74f28a
Autoloader: split getting the class paths and loading the class
2013-05-07 22:26:55 +02:00
03d8907df8
fix for tearDownFS, after filesystem::tearDown() the root is not mounted
2013-05-07 22:26:16 +02:00
cac86bb4db
Allow disabling the global classpath in an autoloader
2013-05-07 22:24:47 +02:00
d1fcb7eb52
Allow the autoloader to try mutliple possible paths for each path
2013-05-07 22:21:59 +02:00
19cfe74bf5
Add per-autoloader classPath
2013-05-07 22:19:00 +02:00
0b5f6b9c13
Move autoloader to it's own class
2013-05-07 22:16:17 +02:00
e620286b25
Fix returns of values in OCP\Config
2013-05-07 20:07:28 +02:00
07df94def6
Convert OC_Config to object interface
2013-05-07 19:59:46 +02:00
5b61c5d478
Merge pull request #3044 from owncloud/backgroundwatcher
...
Add a background job to watch for external filesystem changes
2013-05-07 10:00:00 -07:00
349a533f66
Merge pull request #3025 from owncloud/move-file
...
Cache: only look for child entires when doing a move operation when moving a folder
2013-05-07 07:52:57 -07:00
b8a421a86d
New hook system
2013-05-07 16:34:09 +02:00
398fbb61f8
Merge pull request #2813 from owncloud/improve-lib-check
...
added correct check for gd and check for php-intl
2013-05-07 06:12:40 -07:00
2b9da8a6c9
remove hard php-intl requirement
2013-05-07 13:51:30 +02:00
51a1f829b8
Merge pull request #3120 from owncloud/ocs_properties
...
Allow subclassing of OC_OCS_Result class by changing properties from 'private' to 'protected'
2013-05-05 23:20:25 -07:00
a876240b32
[tx-robot] updated from transifex
2013-05-04 02:00:54 +02:00
460f827f7e
Also check for needed upgrade in the Sabre Maintenance connector
2013-05-04 00:07:30 +02:00
41f7eb948a
Move start of the maintenance mode to the ajax call
...
Make sure the update page is shown in a browser. And not an ajax request
2013-05-04 00:05:29 +02:00
b7585050b5
Move legacy backgroundjob classes to a place where they can be autoloaded
2013-05-03 16:42:48 +02:00
d89e748926
Use supplied tablename
2013-05-03 16:02:53 +02:00
a541b80592
Merge pull request #3222 from owncloud/fix-3218
...
Fix retrieving of mount points for shared storage, fix #3218
2013-05-03 06:02:33 -07:00
dcbbca1f89
Merge pull request #2972 from AndreasErgenzinger/master
...
Translations for themes
2013-05-03 05:41:28 -07:00
05a0b4533b
Merge pull request #2491 from riso/xsendfile_fix_zip
...
improved handling of xsendfile zip generation race condition
2013-05-03 05:37:01 -07:00
cb5a69dd22
Merge pull request #3216 from owncloud/fix-api-3rdparty
...
fix bug that would only return error responses for 3rdparty apps
2013-05-02 15:40:10 -07:00
444a209a2a
Merge pull request #3183 from miicha/patch-1
...
fixing mimetype for "new" ms office formats
2013-05-02 15:39:10 -07:00
73d7cae6df
One more mount point fix
2013-05-02 18:22:43 -04:00
7039421efc
Fix retrieving of mount points for shared storage, fix #3218
2013-05-02 17:47:11 -04:00
11afb2e5a8
respect format output
2013-05-02 14:51:53 +02:00
0f38e6ec9c
logout before output to not run into header already sent problems
2013-05-02 14:49:05 +02:00
ed0c23a9cc
fix bug that would only return error responses for 3rdparty apps
2013-05-02 14:36:16 +02:00
7f58b0ef7c
typo fix in a comment.
2013-05-01 12:29:15 +03:00
b464970142
Merge pull request #3169 from owncloud/fix_infinite_loop_for_file_cache
...
fix for infinite loop causing on files_encryption branch when testing
2013-04-29 17:05:41 -07:00
5764bf088e
[tx-robot] updated from transifex
2013-04-30 01:59:18 +02:00
fbf9233648
fixing mimetype for "new" ms office formats
...
right mime types for docx, pptx and xlsx
with the old mimetype I got a warning message from office everytime I opend such a file (it was downloaded as "filename.docx.doc")
2013-04-30 02:38:05 +03:00
f55aaad858
fix for infinite loop causing on files_encryption branch when testing "apps/files_encryption/test/crypt.php" on Method testSymmetricStreamEncryptShortFileContent
2013-04-29 15:43:48 +02:00
1f194b7bdc
Merge pull request #3154 from owncloud/fix_3153
...
Change app identifier for core api routes
2013-04-28 03:51:21 -07:00
901e0c598d
[tx-robot] updated from transifex
2013-04-28 02:01:38 +02:00
51a1f41225
Merge pull request #3121 from owncloud/ocs_fix_api_response
...
Fix the api response when a shipped and third party app both fail.
2013-04-27 10:05:06 -07:00
d33f6b9af6
Use correct variable when checking auth
2013-04-27 17:45:23 +01:00
0e5eccbdbc
Merge pull request #3146 from owncloud/restart-hint
...
web_server_restart needs to be true to display the hint
2013-04-27 08:19:08 -07:00
86455d6ac3
Merge pull request #3145 from owncloud/magic_quotes_gpc-check
...
Add check for Magic Quotes
2013-04-27 08:14:40 -07:00
2bcb64e781
Merge pull request #3114 from owncloud/update-notification
...
Add an update notification
2013-04-26 21:12:38 -07:00
7b2c64236c
[tx-robot] updated from transifex
2013-04-27 02:24:29 +02:00
8a838e0e03
Code style
2013-04-26 17:30:55 +02:00
7db5ec30c3
Add check for Magic Quotes
2013-04-26 16:32:58 +02:00
f5b0d904fb
web_server_restart needs to be true to display the hint
2013-04-26 16:21:56 +02:00
5474fea1f6
Merge pull request #3136 from owncloud/mount-cleanup
...
Separation of mount management
2013-04-26 06:55:21 -07:00
686f836736
Merge pull request #3026 from owncloud/cli-no-session
...
Don't start the session when in cli mode
2013-04-26 06:20:39 -07:00
948e3d5b7c
Merge pull request #3028 from owncloud/simplyfy-resource-locating
...
Simplify resource locating in templatelayout
2013-04-26 05:56:09 -07:00
172499d5f3
Don't start the session when in cli mode
2013-04-26 14:53:59 +02:00
7e89a017bf
Merge pull request #2955 from owncloud/displaynames-numeric
...
Fix OC_User::getDisplaynames when using numeric user id's
2013-04-26 05:51:07 -07:00
b46f6e4f97
Simplify app js locating for layout pages
2013-04-26 14:21:51 +02:00
ea4ae857a1
Simplify app css locating for layout pages
2013-04-26 14:21:50 +02:00
710acde9a1
Merge pull request #1872 from herbrechtsmeier/forcessl-with-ssl-proxy
...
Overwrite host and webroot when forcessl is enabled
2013-04-26 05:10:49 -07:00
809b5f81f6
Further seperation of mount management logic
2013-04-26 00:01:36 +02:00
bcd9a69033
Cache: seperate handing of numeric storage id's to it's own class
2013-04-26 00:00:18 +02:00
672d177f10
added post rename proxy
2013-04-25 22:43:15 +02:00
bc9792910a
Merge branch 'master' into doctrine
...
Conflicts:
3rdparty
lib/MDB2/Driver/sqlite3.php
lib/db.php
2013-04-25 18:16:09 +02:00
80e91e1ac6
Merge pull request #3132 from owncloud/mount-setupfs
...
Make sure the filesystem is initialized when searching for mounts
2013-04-25 08:07:07 -07:00
cea56df59e
Have the filecache updater testcase clean the filesystem properly
2013-04-25 16:56:48 +02:00
31d7f4df2a
Make sure the filesystem is initialized when searching for mounts
2013-04-25 16:11:48 +02:00
fac288a4ad
added unencrypted file size to file cache
...
improved file size calculation and speeds
2013-04-25 15:20:06 +02:00
632221bed0
Correct the parameter description
...
Thanks @kabum
2013-04-25 14:27:08 +03:00
2d4af5dfca
Correct function description
...
$password is not supported
2013-04-25 14:20:32 +03:00
8c1925425b
save current work state
2013-04-25 12:51:44 +02:00
9ef449842a
save current work state of Preview Lib
2013-04-25 11:41:54 +02:00
c9c1e483c5
use utf-8 encoding for json
2013-04-25 11:36:41 +02:00
b3e7485612
Correct the api response when both a shipped app and/or a third party app fail
2013-04-25 01:08:11 +01:00
c84281990c
Merge pull request #2993 from owncloud/resolve_apps_lib_path
...
Let autoloader resolve paths under apps lib directory.
2013-04-24 13:33:05 -07:00
d41b600725
Add an update notification on every page for admin users
2013-04-24 18:47:38 +02:00
dd1c876009
Merge pull request #3112 from owncloud/markdown-mimetype
...
Add markdown to mimetype list
2013-04-24 08:18:10 -07:00
3b576c5f77
Merge pull request #3111 from owncloud/csp-audio
...
Allow loading of external media ressources
2013-04-24 08:17:42 -07:00
a34350c803
Merge pull request #3106 from IMM0rtalis/xframe_restriction_config
...
- xframe restriction configurable now
2013-04-24 08:02:12 -07:00
3d42d49d14
Add markdown to mimetype list
2013-04-24 16:54:34 +02:00
4f96d7fb85
Allow loading of external media ressources
2013-04-24 16:45:51 +02:00
ff6fb0906b
Merge pull request #3100 from owncloud/ensure_index_php
...
Fix for #3049
2013-04-24 07:14:33 -07:00
6ac2fdf44b
sync parameters in setup.php with the ones in the actual .htaccess
2013-04-24 15:11:58 +02:00
03aa86d8a6
- xframe restriction configurable now
2013-04-24 14:45:40 +02:00
b31dc10c3c
Add support for the old public backgroundjob api
2013-04-24 14:40:49 +02:00
117412272e
Update documentation for \OCP\BackgroundJob
2013-04-24 14:24:28 +02:00
a8075943c3
use variable instead of relative path to file
2013-04-24 14:17:52 +02:00
b98b56e4a8
check if there is a default/ folder in the theme directory if no theme exists
2013-04-24 13:45:40 +02:00
b1c9b296e8
Merge pull request #3089 from guruz/fix_ugly_config_writeability_error
...
Fix ugly error style on install
2013-04-24 02:24:23 -07:00
7eb6cc62f8
Make class properties protected instead of private to allow subclassing
2013-04-23 23:03:39 +01:00
d209cac2a1
lastRun is not a method
2013-04-23 23:46:56 +02:00
25ff32db6b
Added post proxy for getFileInfo.
...
This is needed for WebDAV and FileSize
@samtuke and @schiesbn you guys know a better solution?
2013-04-23 22:20:31 +02:00
9dde43db57
Merge pull request #3080 from owncloud/validate_redirect_mast
...
Disallow URLs containing a @
2013-04-23 12:21:39 -07:00
495868497c
Merge pull request #3077 from owncloud/rename-checksourcepath
...
Files: also check if the source path is valid when doing a rename or copy operation
2013-04-23 07:17:36 -07:00
4aa80d02be
Merge branch 'master' into files_encryption
2013-04-23 14:13:40 +02:00
f1a63254fb
Fix ugly error style on install
...
By initializing the template engine first we can show the
'Can't write into config directory 'config'' error in a nice way instead
of plain unstyled HTML.
2013-04-23 11:06:28 +02:00
05ab9d2de7
[tx-robot] updated from transifex
2013-04-23 02:00:31 +02:00
edd37c779d
Merge pull request #3074 from owncloud/sqlite3-raiseerror
...
Fix raiseError call in the MDB2 sqlite3 driver
2013-04-22 14:34:09 -07:00
6e78c4fcc0
Disallow URLs containing a @
2013-04-23 00:26:40 +03:00
4af4a5bd98
Merge pull request #3073 from owncloud/setup-error-message
...
Improve error message if user creation fails during setup
2013-04-22 13:28:18 -07:00
3c90625ef1
Files: also check if the source path is valid when doing a rename or copy operation
2013-04-22 21:23:12 +02:00
2314067e75
Merge pull request #3019 from owncloud/fix-3004
...
Test if we want a 3rdparty style/script before checking the 3rdparty root
2013-04-22 20:46:13 +02:00
7c1a4d2f57
Fix raiseError call in the MDB2 sqlite3 driver
2013-04-22 20:34:00 +02:00
Bart Visscher
icewind1991
Thomas Mueller
Jörn Friedrich Dreyer
Robin Appelman
Björn Schießle
Georg Ehrke
Roman Geber
Roland Hager
mvn23
blizzz
shkdee
Victor Dubiniuk
Morris Jobke
Björn Schießle
eMerzh
Michael Gapczynski
infoneo
Thomas Tanghus
Florin Peter
kondou
Alessandro Cosentino
Georg Ehrke
Lukas Reschke
Frank Karlitschek
Tom Needham
Bernhard Posselt
joel hansson
miicha
Florin Peter
Tom Needham
Raghu Nayyar
Daniel Molkentin
Florian Scholz
Sam Tuke
Markus Goetz