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
875c18b115
fix fetchRow checks to also work with MDB2
2013-06-10 17:43:09 +02: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
cb9fe475c4
Merge branch 'master' into hook-improvements
...
Conflicts:
lib/files/view.php
2013-06-04 18:19:08 -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
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
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
6a6c18dfab
[tx-robot] updated from transifex
2013-05-25 02:11:52 +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
Jörn Friedrich Dreyer
Thomas Mueller
Robin Appelman
Morris Jobke
Björn Schießle
Georg Ehrke
Björn Schießle
eMerzh
infoneo
Michael Gapczynski
Arthur Schiwon
icewind1991
Thomas Tanghus
Florin Peter
kondou
Alessandro Cosentino