Jörn Friedrich Dreyer
8dc6bdd96b
clean up usage of DatabaseSetupException and catch Exceptions in entrypoints
2013-06-10 13:45:19 +02:00
Jörn Friedrich Dreyer
c0bdbd9d81
introduce and use executeAudited in db.php
2013-06-10 12:56:45 +02:00
Jörn Friedrich Dreyer
d264d0a79d
Merge pull request #3648 from owncloud/sql_limit_as_param
...
convert LIMIT to parameter
2013-06-10 02:48:15 -07:00
Björn Schießle
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
Georg Ehrke
25e8ac1c2f
implement previews for single shared files
2013-06-10 11:01:12 +02:00
Jörn Friedrich Dreyer
5ec13742b3
use to_char to allow comparing string to CLOB cloumns in oracle
2013-06-10 10:33:02 +02:00
Georg Ehrke
a2bb0faec6
Merge branch 'master' into oc_preview
2013-06-10 10:15:53 +02:00
Jörn Friedrich Dreyer
307f1626e8
convert LIMIT to parameter
2013-06-10 10:04:52 +02:00
Jörn Friedrich Dreyer
124f34422c
add missing backticks all over the place
2013-06-10 09:53:29 +02:00
infoneo
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
Jenkins for ownCloud
3c79d89492
[tx-robot] updated from transifex
2013-06-08 02:13:41 +02:00
Robin Appelman
94ca576c9a
use a getter for the storage loader to ensure the instance is created
2013-06-07 17:50:10 +02:00
Robin Appelman
2708ab09ab
storage loader needs to be accessible by apps
2013-06-07 17:40:19 +02:00
Robin Appelman
85a9b7f094
Storage wrapper: provide access to the wrapped storage
2013-06-07 17:12:45 +02:00
Robin Appelman
f35578ec54
merge master into storage-wrapper
2013-06-07 17:12:16 +02:00
Robin Appelman
bd67512409
manage creating and wrapping storages in it's own class
2013-06-07 17:07:13 +02:00
Michael Gapczynski
9ef989f917
Merge pull request #2919 from owncloud/hook-improvements
...
Hook improvements
2013-06-07 06:35:50 -07:00
Georg Ehrke
8114537310
Merge branch 'master' into oc_preview
2013-06-07 09:46:13 +02:00
Jenkins for ownCloud
67c085417c
[tx-robot] updated from transifex
2013-06-07 02:17:50 +02:00
Robin Appelman
85abede9bf
actually return result
2013-06-07 00:22:05 +02:00
Robin Appelman
0470a5ba94
fix variable name
2013-06-07 00:17:51 +02:00
Robin Appelman
cf7321915d
seperate mimetype guessing from filename
2013-06-06 23:51:44 +02:00
Björn Schießle
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
Georg Ehrke
85ecec8b01
Merge branch 'master' into oc_preview
2013-06-06 11:13:55 +02:00
Jenkins for ownCloud
81b6cab94f
[tx-robot] updated from transifex
2013-06-06 02:21:31 +02:00
Georg Ehrke
f80aba4893
use tmpdir var instead of hardcoded /tmp
2013-06-05 12:58:39 +02:00
Georg Ehrke
21cc4f6960
make libreoffice preview backend work :D
2013-06-05 12:45:20 +02:00
Georg Ehrke
8c5fceba29
fix syntax error
2013-06-05 11:13:13 +02:00
Georg Ehrke
bab8b20cbd
use ->cmd instead of hardcoded libreoffice
2013-06-05 11:06:36 +02:00
Georg Ehrke
f437673f1a
update require_once block in preview.php
2013-06-05 10:55:57 +02:00
Georg Ehrke
749c33f39d
escape tmppath shell arg
2013-06-05 10:53:16 +02:00
Georg Ehrke
bcc4fca257
save current work state of libreoffice preview backend
2013-06-05 10:50:20 +02:00
Jenkins for ownCloud
666a5c1cc7
[tx-robot] updated from transifex
2013-06-05 02:01:42 +02:00
Michael Gapczynski
cb9fe475c4
Merge branch 'master' into hook-improvements
...
Conflicts:
lib/files/view.php
2013-06-04 18:19:08 -04:00
Arthur Schiwon
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
Jörn Friedrich Dreyer
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
icewind1991
8c991d97aa
Merge pull request #3561 from owncloud/user
...
Refactor of user management
2013-06-03 08:13:40 -07:00
Thomas Tanghus
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
Robin Appelman
0ce2b2708c
also clear cached users when removing a single backend
2013-06-03 14:19:17 +02:00
Robin Appelman
2a82964830
use caching for userExists
2013-06-03 13:46:05 +02:00
Robin Appelman
83fbdc903f
cast result to bool
2013-06-03 13:39:34 +02:00
Robin Appelman
eb2a1e0f8a
move phpdoc comments
2013-06-03 13:33:56 +02:00
Robin Appelman
1a4021a0fe
User: return backend result
2013-06-03 13:19:01 +02:00
Robin Appelman
fbe3213fec
User: consisten variable naming
2013-06-03 13:17:03 +02:00
Robin Appelman
00b4bfcbf5
User: remove determineDisplayName
2013-06-03 13:15:42 +02:00
Jörn Friedrich Dreyer
b76725c1fa
Merge pull request #3560 from owncloud/init-order-session
...
initialize the session earlier
2013-06-03 03:21:05 -07:00
Georg Ehrke
34decf3576
save current work state
2013-06-03 11:24:37 +02:00
Robin Appelman
38bd234686
make sure the filesystem is setup before doing mount operations
2013-06-02 22:09:44 +02:00
Thomas Tanghus
901b1150ff
Replacement for jquery.dialog to fit better with ownCloud design.
2013-06-02 21:52:59 +02:00
Robin Appelman
b5e817d638
fix clearing mounts when filesystem isn't initialized yet
2013-06-02 21:44:24 +02:00
Robin Appelman
251527c6e6
merge master into backgroundjob
2013-06-02 20:12:44 +02:00
Thomas Müller
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
Thomas Mueller
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
Robin Appelman
2c69403fd6
fix namespacing error
2013-06-01 00:39:59 +02:00
Robin Appelman
82fd15706e
fix undefined variables
2013-06-01 00:39:59 +02:00
Robin Appelman
e430f442b5
use single quotes
2013-06-01 00:39:59 +02:00
Thomas Mueller
dd4a07321a
fix method naming
2013-05-31 23:24:09 +02:00
icewind1991
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
Florin Peter
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
Robin Appelman
cdb2f559a8
Fix postLogin hook
2013-05-31 19:58:31 +02:00
Robin Appelman
473f3c6916
fix typo
2013-05-31 18:18:13 +02:00
Robin Appelman
f00844a003
fix caching of user objects
2013-05-31 17:42:51 +02:00
Robin Appelman
b8b0b7606a
initialize the session earlier
2013-05-31 17:31:52 +02:00
Robin Appelman
a8fb803319
cache instances of \OC\User\User
2013-05-31 17:31:27 +02:00
Robin Appelman
542bcf9156
Merge branch 'master' into user
2013-05-31 16:35:51 +02:00
Georg Ehrke
a11a40d9a9
add backend for microsoft office 2007 documents
2013-05-31 12:23:51 +02:00
FlorinPeter
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
Georg Ehrke
f7c80a391d
load getID3 only if needed
2013-05-30 15:29:38 +02:00
Jörn Friedrich Dreyer
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
icewind1991
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
Georg Ehrke
b944b1c5d2
add javascript preview backend
2013-05-30 11:12:12 +02:00
Georg Ehrke
a014662c52
improve imagick error handling
2013-05-30 11:06:52 +02:00
Georg Ehrke
5433a50461
validate size of file
2013-05-30 10:44:27 +02:00
Jenkins for ownCloud
8e1d9261aa
[tx-robot] updated from transifex
2013-05-30 02:34:14 +02:00
Florin Peter
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
Michael Gapczynski
dbbf195727
Only retrieve the current user's permissions
2013-05-29 18:08:18 -04:00
Florin Peter
1337f48d64
fixes for pgsql
2013-05-29 20:41:07 +02:00
Morris Jobke
5c04b3a63a
fix wrong signature delimiter - fix #3523
2013-05-29 20:21:48 +02:00
Florin Peter
f1b884aa5d
changed deprecated class
2013-05-29 20:15:04 +02:00
Florin Peter
353d19d183
fixes if cache returns false
2013-05-29 20:11:13 +02:00
Florin Peter
c8d1cd224d
fix $parent/$source typo
2013-05-29 19:58:05 +02:00
Michael Gapczynski
5bbc583b56
Merge pull request #3532 from owncloud/scan-update
...
Only update metadata that has changed
2013-05-29 10:23:41 -07:00
Florin Peter
1202ab9995
Merge branch 'master' into file_encryption_external_storage_fixes
2013-05-29 19:19:40 +02:00
Michael Gapczynski
59655e9afd
Style fixes
2013-05-29 10:56:28 -04:00
Michael Gapczynski
ea55367678
Organize conditionals in a better order
2013-05-29 10:40:05 -04:00
Michael Gapczynski
04805d0be9
Only update metadata that has changed
2013-05-29 10:19:03 -04:00
Robin Appelman
24a401a548
Cache mimetype icons
2013-05-29 15:43:41 +02:00
Björn Schießle
ae0f37e9e2
fix indention
2013-05-29 15:37:27 +02:00
Robin Appelman
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
Björn Schießle
8587f565d2
remove unnecessary variable
2013-05-29 15:14:15 +02:00
Björn Schießle
63a2bec6e5
use public API for error handling; improved while condition
2013-05-29 14:40:47 +02:00
Björn Schießle
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
Georg Ehrke
d8008ae421
Merge branch 'master' into oc_preview
2013-05-29 13:24:14 +02:00
Georg Ehrke
a76360347c
fix c&p fail
2013-05-29 13:13:47 +02:00
Björn Schießle
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
Georg Ehrke
1e252b6763
more style fixes
2013-05-29 13:11:43 +02:00
Björn Schießle
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
Georg Ehrke
6b90416891
add php preview backend
2013-05-29 13:09:38 +02:00
Georg Ehrke
7408ab660a
respect coding style guidelines
2013-05-29 13:03:33 +02:00
Georg Ehrke
268246fac8
namespace fix
2013-05-29 12:48:21 +02:00
Georg Ehrke
fa6b96090a
move to OC namespace
2013-05-29 12:46:54 +02:00
Georg Ehrke
eebc15dce0
connect preview lib to filesystem hooks
2013-05-29 12:01:43 +02:00
Jenkins for ownCloud
7c0c6bd779
[tx-robot] updated from transifex
2013-05-29 02:10:54 +02:00
Robin Appelman
8320f41dbe
Emit leacgy OC_User hooks
2013-05-29 01:05:49 +02:00
Robin Appelman
3e7e2c8a5c
fix setting getting active userid
2013-05-29 00:47:55 +02:00
Robin Appelman
198655f109
fix User->setHome when the backend action fails
2013-05-29 00:47:44 +02:00
Robin Appelman
4b688db612
implement old user api on top of the new one
2013-05-29 00:32:10 +02:00
Robin Appelman
955bda1842
New user management classes
2013-05-29 00:31:55 +02:00
kondou
1d799f22c1
Default to localhost, if nothing is entered.
2013-05-28 17:34:57 +02:00
Robin Appelman
57f712f8a9
implement ArrayInterface with Session
2013-05-28 16:52:40 +02:00
Georg Ehrke
a03787bc42
make preview cache work with encryption and improve error handling
2013-05-28 16:04:39 +02:00
Robin Appelman
cc0cf93136
merge master into sessionclass
2013-05-28 14:55:42 +02:00
Georg Ehrke
08a022aaa4
don't give ffmpeg wanted size, cause it doesn't care about aspect ratio
2013-05-28 12:09:46 +02:00
Georg Ehrke
55b00fe819
make pdf backend work with encryption
2013-05-28 11:59:20 +02:00
Georg Ehrke
738cc48a85
make mp3 backend work with encryption
2013-05-28 11:49:18 +02:00
Georg Ehrke
4d52dfb0a0
make movie backend work with encryption
2013-05-28 11:48:02 +02:00
Georg Ehrke
7555332d58
remove whitespace
2013-05-28 11:31:48 +02:00
Georg Ehrke
5ae1333c76
add preview backend for text based files
2013-05-28 11:29:01 +02:00
Georg Ehrke
707f52f1db
check if the imagick extension is loaded
2013-05-28 10:23:40 +02:00
Georg Ehrke
005d8e9870
update images.php
2013-05-28 10:21:02 +02:00
Jenkins for ownCloud
3420d853ab
[tx-robot] updated from transifex
2013-05-28 02:07:51 +02:00
Robin Appelman
040045cc2e
provide a dummy session for CLI
2013-05-28 01:15:38 +02:00
Robin Appelman
f547b66d6b
check fix if session start is successfull
2013-05-28 01:13:36 +02:00
Robin Appelman
e73c04501e
Fix session not working error
2013-05-28 01:10:18 +02:00
Robin Appelman
44f9af5a7f
Use the new session wrapper
2013-05-28 01:04:09 +02:00
Robin Appelman
76d13120ea
Abstract the session away in a class
2013-05-28 00:50:00 +02:00
Robin Appelman
9e65f40d1b
Add PublicEmitter class
2013-05-27 20:20:06 +02:00
kondou
3001db6b50
Update jquery to 1.10.0 & add jquery-migrate 1.2.1
2013-05-27 20:13:13 +02:00
Georg Ehrke
557cc4c1ab
make method names camelCase
2013-05-27 19:24:31 +02:00
Georg Ehrke
d69b7e24d2
update comment
2013-05-27 19:20:29 +02:00
Georg Ehrke
58c9175a56
move check if internet connection is disabled on purpose to a dedicated method
2013-05-27 19:19:17 +02:00
Michael Gapczynski
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
Georg Ehrke
62411965f9
make svg preview backend work with encryption
2013-05-27 11:09:55 +02:00
Georg Ehrke
f78e002096
make image preview backend work with encryption
2013-05-27 10:45:21 +02:00
Jenkins for ownCloud
73e0b4c10a
[tx-robot] updated from transifex
2013-05-27 02:07:24 +02:00
Jenkins for ownCloud
0c621ff6a9
[tx-robot] updated from transifex
2013-05-26 02:03:54 +02:00
Florin Peter
adcafbde34
Merge branch 'master' into fix_for_2377
2013-05-25 20:37:28 +02:00
Florin Peter
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
Michael Gapczynski
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
Michael Gapczynski
c870aed1b6
Merge pull request #3493 from owncloud/bumpversion
...
Bump version for files_encryption changes
2013-05-25 10:20:42 -07:00
Michael Gapczynski
2893bb9543
Bump version for files_encryption changes
2013-05-25 11:42:28 -04:00
Michael Gapczynski
0a29d2029a
Clear opcode caches after writing to the config file, fixes #3372
2013-05-25 11:25:43 -04:00
Florin Peter
c245f5a99f
added more places where normalization is needed
2013-05-25 14:56:00 +02:00
Florin Peter
f6bf9de6de
prevent for returning while false normalize string
2013-05-25 14:54:36 +02:00
Georg Ehrke
af57996d1e
Merge branch 'master' into oc_preview
2013-05-25 12:16:25 +02:00
Jenkins for ownCloud
6a6c18dfab
[tx-robot] updated from transifex
2013-05-25 02:11:52 +02:00
Florin Peter
946e9ccc0a
Merge branch 'master' into fix_for_2377
2013-05-24 20:54:13 +02:00
Florin Peter
736f10039d
changed builtin normalizer to \OC_Util::normalizeUnicode
2013-05-24 20:36:20 +02:00
Florin Peter
661b5501b0
added normalizeUnicode() method to OC_Util
2013-05-24 20:35:01 +02:00
Thomas Müller
4911305887
Merge pull request #3416 from owncloud/files_encryption
...
New files encryption app
2013-05-24 02:21:19 -07:00
Alessandro Cosentino
3fbfe3c06a
small typo in the comments
2013-05-23 20:59:02 -04:00
Michael Gapczynski
a98d6c4be6
Merge pull request #3425 from owncloud/move-storages
...
Support for moving/copying folders between storages
2013-05-23 17:35:11 -07:00
Jenkins for ownCloud
b47729c5fc
[tx-robot] updated from transifex
2013-05-24 02:02:43 +02:00
Florin Peter
d4b700ef4e
revert previous fix and added normalizer to cache class
2013-05-23 20:29:46 +02:00
Michael Gapczynski
30330b4343
Merge branch 'master' into move-storages
...
Conflicts:
tests/lib/files/view.php
2013-05-23 10:25:12 -04:00
Michael Gapczynski
3b6d850e59
Switch to calling deleteAll via storage to avoid emitting delete hook
2013-05-23 10:23:16 -04:00
Florin Peter
85e0c78166
fix problems with german "Umlaut" in folder name
2013-05-23 01:21:36 +02:00
Björn Schießle
ee53bd1aa3
Merge branch 'master' into files_encryption
...
Conflicts:
lib/files/cache/cache.php
2013-05-22 15:29:22 +02:00
Georg Ehrke
00985068ca
add previews for public files
2013-05-22 15:13:02 +02:00
Jörn Friedrich Dreyer
1f1abe595d
cleanup codestyle
2013-05-22 13:59:08 +02:00
Jörn Friedrich Dreyer
cbd5eb9a1a
use to_char only for oracle, whitespace
2013-05-22 13:59:07 +02:00
Jörn Friedrich Dreyer
eceb3c8ed5
add debug output
2013-05-22 13:59:07 +02:00
Jörn Friedrich Dreyer
1b68c0c0cd
allow install when only oracle is available
2013-05-22 13:56:57 +02:00
Georg Ehrke
efb2e69230
fix return value of OC_Util::isinternetconnectionworking()
2013-05-22 12:21:11 +02:00
Morris Jobke
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
Roland Hager
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
Michael Gapczynski
7a0c592f93
Fix undefined index for share mount point retrieval
2013-05-21 20:21:19 -04:00
Florin Peter
28d72b822d
Merge branch 'master' into files_encryption
...
Conflicts:
lib/files/cache/cache.php
2013-05-22 01:26:35 +02:00
Thomas Müller
e2444ec9c5
Merge pull request #3266 from owncloud/hooks
...
New hook system
2013-05-21 15:21:25 -07:00
Robin Appelman
81fd1badc3
merge master into filecache_mtime
2013-05-21 23:35:19 +02:00
Jörn Friedrich Dreyer
fb4d8ddf0a
Merge pull request #3335 from owncloud/prevent-scan-loop
...
Prevent backgroundScan() from looping
2013-05-21 09:15:22 -07:00
Michael Gapczynski
c62f230ddb
Merge branch 'master' into move-maint-start
2013-05-21 11:26:56 -04:00
Björn Schießle
5cd14425f9
Merge branch 'master' into files_encryption
...
Conflicts:
apps/files_trashbin/l10n/nn_NO.php
2013-05-21 15:30:19 +02:00
Georg Ehrke
13c6ef1ba9
add svg backend
2013-05-21 12:23:31 +02:00
Michael Gapczynski
09ff46eda2
Remove user name addition to paths in deleteAll
2013-05-20 10:21:55 -04:00
Thomas Tanghus
c38dc36665
Remove debug output
2013-05-20 13:56:57 +02:00
Thomas Tanghus
b1bb899867
Add rename() method to OC_VCategories.
2013-05-20 10:16:07 +02:00
Florin Peter
31037241e1
Merge branch 'master' into files_encryption
2013-05-20 02:25:56 +02:00
Jenkins for ownCloud
6609de28d8
[tx-robot] updated from transifex
2013-05-20 02:10:11 +02:00
Florin Peter
58a8d67a9b
fix for webdav because initMounts() is triggered twice so we lost the root path
2013-05-20 01:57:16 +02:00
Florin Peter
b3b6738d59
Revert "fix for webdav and wrong reference for findByStorageId"
...
This reverts commit 079f918d5c
.
2013-05-20 01:47:35 +02:00
Florin Peter
079f918d5c
fix for webdav and wrong reference for findByStorageId
2013-05-19 22:30:03 +02:00
Michael Gapczynski
fc5bce1f76
Fix undefined variable for copying empty folders
2013-05-19 15:04:41 -04:00
Michael Gapczynski
41e2d64c86
Add support for copying/moving folders between storages, move isIgnoredDir() to Filesystem
2013-05-19 14:15:49 -04:00
Michael Gapczynski
67729f5f9f
Merge pull request #3421 from owncloud/pre_login_password
...
Add password to pre_login
2013-05-19 10:09:24 -07:00
Lukas Reschke
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
Michael Gapczynski
9bebf9b4c8
Don't set Content-Length header if size is unknown
2013-05-17 14:14:12 -04:00
Georg Ehrke
dd06387a9c
remove whitespace
2013-05-17 19:08:16 +02:00
Georg Ehrke
d42aa65532
implement movie previews
2013-05-17 15:06:37 +02:00
Georg Ehrke
8b39a08512
fix typo
2013-05-17 12:00:32 +02:00
Georg Ehrke
0305ee50c5
Merge branch 'master' into oc_preview
2013-05-17 11:41:30 +02:00
Georg Ehrke
04a4234b9e
implement mp3 preview backend
2013-05-17 11:32:42 +02:00
Georg Ehrke
f29b8cf685
set default value of scalingup to true
2013-05-17 11:30:44 +02:00
Georg Ehrke
8dba46912d
Disable transparent backgrounds for now
2013-05-17 11:28:53 +02:00
FlorinPeter
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
Georg Ehrke
837c6ed597
implement pdf preview backend
2013-05-17 09:43:25 +02:00
Georg Ehrke
40597ac944
implement OC_Preview
2013-05-17 09:42:20 +02:00
Jenkins for ownCloud
6a6079176b
[tx-robot] updated from transifex
2013-05-17 02:07:36 +02:00
Florin Peter
d7dc710c8b
revert changes
2013-05-17 01:22:30 +02:00
Florin Peter
a92dead754
only connect share hooks if installation OC is installed
2013-05-17 01:20:02 +02:00
Florin Peter
469d6028ad
revert changes
2013-05-17 01:17:55 +02:00
Björn Schießle
95297c2469
add pre-shared hooks
2013-05-16 17:44:28 +02:00
Björn Schießle
9d1e60325c
allow admin to recover users files in case of password lost
2013-05-16 14:53:04 +02:00
Thomas Tanghus
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
Jenkins for ownCloud
966c2231e3
[tx-robot] updated from transifex
2013-05-16 02:01:37 +02:00
Thomas Mueller
3c779b0632
Merge branch 'master' into hooks
2013-05-15 23:49:41 +02:00
Thomas Mueller
5dcec346e5
Merge branch 'master' into fix-3353
2013-05-15 23:43:46 +02:00
Thomas Müller
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
Florin Peter
c50bf3e3c5
fix for losing mount point "/"
2013-05-15 20:09:02 +02:00
Florin Peter
68059b1ec3
fix for SQLite3Result::fetchArray(): The SQLite3Result object has not been correctly initialised in post_addToGroup
2013-05-15 19:49:40 +02:00
Thomas Tanghus
cb41a30b00
Add Compound property to avoid double escaping values.
2013-05-15 18:56:54 +02:00
Florin Peter
0916769f67
fix for SQLite3Result::fetchArray(): The SQLite3Result object has not been correctly initialised in post_addToGroup
2013-05-15 17:00:01 +02:00
Michael Gapczynski
d91161186b
Fix finding mount in background watcher, fixes #3353
2013-05-15 09:33:38 -04:00
Florin Peter
751487ded7
merge changes for files_encryption
2013-05-15 10:20:19 +02:00
Florin Peter
807740a07a
fix for losing mount point "/"
2013-05-15 10:19:38 +02:00
Florin Peter
226aec8d56
Merge branch 'master' into files_encryption
2013-05-15 03:22:06 +02:00
Michael Gapczynski
f8336c1e2c
Turn off theme before update
2013-05-14 09:34:01 -04:00
Michael Gapczynski
71eed76dbe
Prevent backgroundScan() from looping if opendir() is failing for the same path
2013-05-13 11:17:08 -04:00
Bart Visscher
009e9559f3
Remove default return hint
2013-05-13 08:28:10 +02:00
Bart Visscher
061fb79e5c
Use the constants from OC_Log
2013-05-13 08:28:10 +02:00
Bart Visscher
31ad43f922
Code style
2013-05-13 08:28:10 +02:00
Bart Visscher
0b4018e7ff
Remove include for loading legacy class
2013-05-13 08:28:10 +02:00
Bart Visscher
7e5bb96027
Fix OC\Log with OC_Log in wrong namespace
2013-05-13 08:28:10 +02:00
Bart Visscher
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
Frank Karlitschek
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
infoneo
be4eef682a
Fixed problems with a dots in a filenames
2013-05-12 15:22:57 +03:00
Morris Jobke
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
Thomas Tanghus
baf058316c
disable mbstring.func_overload in setup
2013-05-12 10:56:32 +02:00
Lukas Reschke
63d51980e1
Get config from template
2013-05-12 10:51:21 +02:00
Jenkins for ownCloud
74f92d0c7f
[tx-robot] updated from transifex
2013-05-12 02:05:29 +02:00
infoneo
8f19c5ecab
Dots in a filenames fix
2013-05-12 01:47:48 +02:00
Morris Jobke
9f3c156aca
Merge pull request #3283 from owncloud/move-legacy-fs
...
Move legacy filesystem classes
2013-05-10 07:53:04 -07:00
Jörn Friedrich Dreyer
9134395b43
don't emit rename hooks on partial file renames
2013-05-10 12:01:50 +02:00
Jörn Friedrich Dreyer
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
Robin Appelman
990f23c024
fix typo
2013-05-09 22:52:44 +02:00
Björn Schießle
2e81efc37e
don't call correctFolder() in touchHook, it will be called later in the writeUpdate()
2013-05-08 23:00:24 +02:00
Björn Schießle
0e30e68b22
update etag for for the touched file
2013-05-08 23:00:03 +02:00
Robin Appelman
d97ef0805b
Add mechanism to allow apps to wraper storage classes
2013-05-08 22:35:10 +02:00
Robin Appelman
ba9db19640
Add wrapper storage backend
2013-05-08 16:53:05 +02:00
Robin Appelman
d9c19fa8d7
Move legacy filesystem classes
2013-05-08 16:48:47 +02:00
FlorinPeter
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
Robin Appelman
71fc4a2cf4
Autoloader: fix loading app clases located in lib/
2013-05-08 00:50:33 +02:00
Robin Appelman
2a01d39940
Autoloader: load the 3rdparty libraries using prefixes
2013-05-07 23:07:47 +02:00
Robin Appelman
0d25c0001c
check for setlocale after setting up the paths to prevent autoloader confusion
2013-05-07 22:53:07 +02:00
Robin Appelman
6d903cf7ae
Autoloader: add support for custom namespace paths
2013-05-07 22:39:35 +02:00
Robin Appelman
72ed74f28a
Autoloader: split getting the class paths and loading the class
2013-05-07 22:26:55 +02:00
Florin Peter
03d8907df8
fix for tearDownFS, after filesystem::tearDown() the root is not mounted
2013-05-07 22:26:16 +02:00
Robin Appelman
cac86bb4db
Allow disabling the global classpath in an autoloader
2013-05-07 22:24:47 +02:00
Robin Appelman
d1fcb7eb52
Allow the autoloader to try mutliple possible paths for each path
2013-05-07 22:21:59 +02:00
Robin Appelman
19cfe74bf5
Add per-autoloader classPath
2013-05-07 22:19:00 +02:00