Georg Ehrke
|
dcc92445a0
|
allow permissions.user to be null as suggested by @butonic
|
2013-08-07 11:51:08 +02:00 |
Georg Ehrke
|
af983b843d
|
fix merge conflicts
|
2013-08-05 14:27:38 +02:00 |
Georg Ehrke
|
554b1990e2
|
suppress is_file error msg
|
2013-08-05 14:23:30 +02:00 |
Thomas Müller
|
d1a39ab01c
|
Merge pull request #4293 from owncloud/config-date
make log date configurable, default to iso 8601
|
2013-08-04 15:18:05 -07:00 |
Thomas Müller
|
b5f18111f4
|
Merge pull request #4308 from owncloud/fix-4194
Port log level filtering from OC_Log_Owncloud to OC_Log_Syslog.
|
2013-08-04 15:16:32 -07:00 |
Thomas Müller
|
0ae2bb77ba
|
Merge pull request #4228 from owncloud/fix-3836
app migrate: Use = instead of LIKE as described in the comment above.
|
2013-08-04 15:00:24 -07:00 |
Thomas Müller
|
33d78ab9c7
|
fixing PHPDoc
|
2013-08-04 23:13:34 +02:00 |
Thomas Müller
|
b716d035c3
|
fixing PHPDoc
|
2013-08-04 22:58:40 +02:00 |
Andreas Fischer
|
e03d9e3aa0
|
Port log level filtering from OC_Log_Owncloud to OC_Log_Syslog.
|
2013-08-04 02:48:00 +02:00 |
Robin Appelman
|
3534c3b373
|
add reveal mimetype
|
2013-08-03 21:59:44 +02:00 |
Thomas Müller
|
afc8ee721d
|
Merge pull request #4299 from owncloud/simplify-db-transaction
Simplify OC_DB transaction functions
|
2013-08-02 12:32:41 -07:00 |
Bart Visscher
|
fd317f599b
|
Simplify OC_DB transaction functions
|
2013-08-02 16:12:34 +02:00 |
Thomas Müller
|
821a99b937
|
Merge pull request #4287 from Takuto88/language-config
Make default language configurable via config.php
|
2013-08-02 06:49:54 -07:00 |
Bernhard Posselt
|
f5c3a346b0
|
make log date configurable, default to iso 8601
|
2013-08-02 13:34:20 +02:00 |
Lennart Rosam
|
79351d064f
|
Make default language configurable via config.php
|
2013-08-02 09:41:31 +02:00 |
kondou
|
1b567b2ad1
|
Don't throw a fatal, if is_file() parameter isn't
a 'valid path', but only a data/base64-string.
Related to #4283
|
2013-08-01 21:01:26 +02:00 |
Jörn Friedrich Dreyer
|
eed63ae512
|
Merge pull request #4221 from owncloud/fix-3698
Fix calculating size for empty folders
|
2013-08-01 08:05:19 -07:00 |
Bjoern Schiessle
|
9253627327
|
cancel sharing if some users doesn't have a working encryption set-up.
|
2013-08-01 13:04:55 +02:00 |
Morris Jobke
|
30963d60bc
|
Merge pull request #4155 from owncloud/mdb2schemareader-booleans
Fix boolean support for xml schema definitions
|
2013-08-01 02:09:01 -07:00 |
Morris Jobke
|
0d69feb12e
|
Merge pull request #4208 from owncloud/scanner-php53
Fix scanner hooks throwing errors
|
2013-08-01 00:05:56 -07:00 |
Jenkins for ownCloud
|
b037f2dc6e
|
[tx-robot] updated from transifex
|
2013-08-01 01:57:04 -04:00 |
Morris Jobke
|
50101a85a6
|
Merge pull request #3982 from owncloud/test_lastinsertid
test lastinsertid
|
2013-07-31 00:03:29 -07:00 |
Jenkins for ownCloud
|
761f40328c
|
[tx-robot] updated from transifex
|
2013-07-31 02:01:45 -04:00 |
Thomas Müller
|
f35aadb576
|
Merge pull request #4227 from owncloud/fixing-testGetById-master
implement a platform independent version of basename
|
2013-07-30 08:39:53 -07:00 |
Georg Ehrke
|
93cdfc3e8a
|
Merge branch 'master' into oc_preview
|
2013-07-30 13:52:53 +02:00 |
Georg Ehrke
|
640253fa31
|
fix code style of try catch blocks
|
2013-07-30 13:43:15 +02:00 |
Georg Ehrke
|
d84d8f7108
|
fix merge conflicts
|
2013-07-30 12:35:39 +02:00 |
Georg Ehrke
|
ac6a3133ec
|
style fixes
|
2013-07-30 12:33:54 +02:00 |
Thomas Müller
|
17c36b5074
|
fixes #4026
|
2013-07-30 10:26:42 +02:00 |
Jenkins for ownCloud
|
88e1ccbce3
|
[tx-robot] updated from transifex
|
2013-07-30 01:57:50 -04:00 |
Thomas Müller
|
f658852276
|
Merge branch 'master' into fixing-testGetById-master
|
2013-07-30 00:37:05 +02:00 |
Thomas Müller
|
7425efade7
|
Merge branch 'master' into oc_preview
Conflicts:
3rdparty
lib/template.php
|
2013-07-30 00:34:36 +02:00 |
Thomas Müller
|
085fdfec2f
|
adding unit tests for OC_Util::basename
|
2013-07-29 23:32:03 +02:00 |
icewind1991
|
7c6246fa45
|
Merge pull request #4213 from owncloud/scanning-performance
Cache: don't check if the parent exists in the cache if we are already sure it does
|
2013-07-29 13:08:23 -07:00 |
Andreas Fischer
|
89f8f8e42d
|
app migrate: Use = instead of LIKE as described in the comment above.
The LIKE operator is not defined on integers (probably any non-text) columns
on PostgreSQL.
|
2013-07-29 18:41:22 +02:00 |
Robin Appelman
|
74c54587ec
|
better variable naming
|
2013-07-29 18:27:19 +02:00 |
Thomas Mueller
|
e2d3225e5a
|
implement a platform independent version of basename
|
2013-07-29 18:24:05 +02:00 |
Robin Appelman
|
dea3472ad7
|
remove unneeded 'use'
|
2013-07-29 17:04:28 +02:00 |
Robin Appelman
|
64774f30ba
|
dont need to explicitly pass by reference
|
2013-07-29 17:03:57 +02:00 |
Robin Appelman
|
d6c56b584a
|
make MDB2Schema reader non static
|
2013-07-29 16:33:00 +02:00 |
Robin Appelman
|
fbbe0ebe77
|
add function to get config object from OC_Config
|
2013-07-29 16:32:37 +02:00 |
Michael Gapczynski
|
1faac6108c
|
Use query to calculate folder size
|
2013-07-29 10:22:44 -04:00 |
Georg Ehrke
|
1e4ec2ac27
|
add class='preview-icon' to rows in file app that make use of previews
|
2013-07-29 15:47:17 +02:00 |
Georg Ehrke
|
e01bc7de98
|
Revert "OC\Preview - outsource static methods"
This reverts commit 14a35267c1 .
|
2013-07-29 14:51:06 +02:00 |
Georg Ehrke
|
65affdc9b3
|
make previews in files app smaller
|
2013-07-29 14:40:26 +02:00 |
Thomas Müller
|
954b5d9019
|
Merge pull request #4216 from owncloud/clean_php55_opcache
Also clean PHP 5.5 opcache
|
2013-07-29 04:40:01 -07:00 |
Jörn Friedrich Dreyer
|
05fa55f2eb
|
always return int
|
2013-07-29 02:17:09 +02:00 |
Michael Gapczynski
|
dd4e33fe6b
|
Fix calculating size for empty folders
|
2013-07-28 16:14:49 -04:00 |
Michael Gapczynski
|
c8e60900fc
|
Move check so the variable will never be undefined
|
2013-07-28 15:32:48 -04:00 |
kondou
|
8cd671c207
|
Also clean PHP 5.5 opcache
|
2013-07-28 16:33:03 +02:00 |