Thomas Müller
884c6b5a82
Merge pull request #4512 from owncloud/readdir-strict-equals
...
use strict equals in readdir loops to prevent issues with '0' files
2013-08-20 01:17:25 -07:00
Jenkins for ownCloud
e9644c2f52
[tx-robot] updated from transifex
2013-08-19 15:14:38 -04:00
Georg Ehrke
cbeccb2fcd
Merge branch 'master' into readdir-strict-equals
2013-08-19 17:30:56 +02:00
Arthur Schiwon
64c0e5d807
no assoc index here, makes tests pass again
2013-08-19 15:53:20 +02:00
icewind1991
d7dde3cfbc
Merge pull request #4467 from owncloud/storage-wrapper-quota
...
Move quota logic from filesystem proxy to storage wrapper
2013-08-19 03:38:55 -07:00
Georg Ehrke
48f0c54261
style fixes for preview lib
2013-08-19 12:16:55 +02:00
Robin Appelman
c5402f4575
use strict equals in readdir loops to prevent issues with '0' files
2013-08-19 12:04:53 +02:00
Arthur Schiwon
0f7fad7166
return only existing users in group
2013-08-19 11:48:21 +02:00
Georg Ehrke
f2702ff1ca
Merge master into oc_preview
2013-08-19 11:24:17 +02:00
Björn Schießle
9be836814c
Merge pull request #4239 from owncloud/decrypt_files_again
...
Enable user to decrypt files again after encryption app was disabled
2013-08-18 09:51:48 -07:00
Kondou
c7af26ec84
Merge pull request #4497 from owncloud/newlines_at_eof_kondou
...
Add newlines at the end of files
2013-08-18 07:16:15 -07:00
Thomas Tanghus
3366bbeb8a
Port DAV groupMemberSet fix to master #4458
2013-08-18 15:54:56 +02:00
kondou
9f4bd7cb47
Don't use an alert for displaying app-mgmt-errors
...
Rather display a dominant div and mark the problematic app in the applist.
Fix #305
2013-08-18 13:49:34 +02:00
Markus Goetz
ba430a7dfa
Merge pull request #4485 from guruz/class_autoloader_optimization
...
Class Auto Loader: Cache paths in APC
2013-08-18 03:32:13 -07:00
Markus Goetz
aba64a0b81
Class Auto Loader: Cache paths in APC
...
Using benchmark_single.php (from administration repo) I can
measure a speed improvement of 5% to 20% loading the /index.php
when logged in. (when using APC and php-fpm).
2013-08-18 12:29:43 +02:00
kondou
c741a25eaa
Merge branch 'master' into improve_app-management
2013-08-18 12:15:22 +02:00
Robin Appelman
d8c71ba734
merge master in storage-wrapper-quota
2013-08-18 11:34:56 +02:00
kondou
9e8a6b704d
Add _many_ newlines at the end of files
2013-08-18 11:06:59 +02:00
kondou
65d802329f
Fix some naming and spacing in lib/util.php
2013-08-18 10:33:09 +02:00
Thomas Müller
12f4494de0
Merge pull request #4339 from owncloud/mimetype-defaults
...
Add the option to provide templates for newly created files
2013-08-17 08:42:49 -07:00
Bjoern Schiessle
cabe92ef12
Merge branch 'master' into decrypt_files_again
...
Conflicts:
apps/files_encryption/tests/keymanager.php
2013-08-17 13:15:22 +02:00
Thomas Müller
de52157e76
remove ru_RU - fixes #3135
2013-08-17 11:43:37 +02:00
Thomas Müller
fde9cabe97
initial import of appframework
2013-08-17 11:16:48 +02:00
Robin Appelman
d43b4c52ae
also emit hooks for views that are a subfolder of the user folder
2013-08-17 10:57:31 +02:00
Bart Visscher
a0b7bf78a6
Remove disconnect function from OC_DB
2013-08-16 19:05:07 +02:00
Robin Appelman
5c9aedac1b
remove outdated quota proxy
2013-08-16 15:50:50 +02:00
Robin Appelman
8f10c9571f
fix quota wrapper reporting negative free_space, breaking user interface
...
return 0 instead
2013-08-16 15:48:45 +02:00
Jan-Christoph Borchardt
1e8849b04e
Merge pull request #4314 from owncloud/css-fixes
...
Design fixes
2013-08-16 01:05:29 -07:00
Jenkins for ownCloud
6bd0ba79df
[tx-robot] updated from transifex
2013-08-16 01:32:30 -04:00
Jan-Christoph Borchardt
399adf67b0
merge master into css-fixes
2013-08-16 00:29:43 +02:00
Thomas Müller
7279a07ca2
Merge branch 'master' into mimetype-defaults
...
Conflicts:
apps/files/ajax/newfile.php
2013-08-16 00:13:10 +02:00
Georg Ehrke
4574c5cf5c
check if ->resource is a resource
2013-08-15 16:13:01 +02:00
kondou
9c5416fe4a
Clean up \OC\Util
...
- Use camelCase
- Add some phpdoc
- Fix some indents
- Use some more spacing
2013-08-15 15:57:32 +02:00
Thomas Müller
ada13a4d40
fixing all broken translation files
2013-08-15 15:41:45 +02:00
Georg Ehrke
7a11911aea
add comment to make @jancborchardt happy
2013-08-15 13:25:45 +02:00
Georg Ehrke
825d8610d0
fix svg and cache transparency issue
2013-08-15 13:22:05 +02:00
Georg Ehrke
7fe9320ffe
improve unknown backend
2013-08-15 13:22:04 +02:00
Markus Goetz
3972198b61
Cache OC_Util::checkServer() result in session
...
The return value almost never changes but this function
is called for every request.
2013-08-15 11:58:09 +02:00
Jenkins for ownCloud
680ac48856
[tx-robot] updated from transifex
2013-08-15 04:53:54 -04:00
Thomas Tanghus
ca495758bd
Fix octemplate string escaping.
2013-08-14 23:06:43 +02:00
Georg Ehrke
623f9ec817
don't generate previews of empty txt files
2013-08-14 21:20:31 +02:00
Georg Ehrke
4b5fb08c2c
Merge master into oc_preview
2013-08-14 20:56:44 +02:00
Georg Ehrke
e5761d90ef
fix deleting old previews after file changed
2013-08-14 20:49:47 +02:00
Jörn Friedrich Dreyer
8f3f47e868
Merge pull request #4376 from owncloud/use_plurals
...
Use plural translations
2013-08-14 10:23:19 -07:00
Georg Ehrke
f9b2815767
remove \OC\Preview::showErrorPreview
2013-08-14 12:21:27 +02:00
Bjoern Schiessle
6c3efaf26c
throw exception if encryption was disabled but files are still encrypted to prevent the client from syncing unreadable files
2013-08-14 09:44:29 +02:00
Bjoern Schiessle
53bb89824d
check if some encrypted files are left after the app was disabled and warn the user
2013-08-12 17:25:27 +02:00
Robin Appelman
f22719b1ee
Scanner: correctly pass trough reuse options when doing a recursive scan
2013-08-12 15:37:39 +02:00
Jenkins for ownCloud
5ebff8cfc4
[tx-robot] updated from transifex
2013-08-11 08:11:03 -04:00
Andreas Fischer
43be3eb4d0
Changing elseif statement to what the PEAR coding guidelines say.
2013-08-09 22:32:38 +02:00
Andreas Fischer
9c22046bff
Do not pass numeric strings to strtotime() when formatting dates.
...
strtotime() will return false and the date will be formatted as the 0-timestamp
(e.g. January 1, 1970 00:00) otherwise.
2013-08-09 22:32:38 +02:00
kondou
b24b208dce
Throw exceptions instead of only logging in \OC_Installer::installApp()
2013-08-09 21:57:01 +02:00
kondou
9549bd3e68
Use plural translations
2013-08-09 20:37:18 +02:00
kondou
80e9744da0
Merge branch 'master' into improve_app-management
2013-08-09 18:02:40 +02:00
kondou
605050df9b
Log exception at the catching code
2013-08-09 18:01:49 +02:00
Jan-Christoph Borchardt
4c0ec974b9
Merge pull request #4344 from owncloud/appmgmt-in-navigation
...
show 'More apps' link to app administration directly in app navigation
2013-08-09 08:49:41 -07:00
Jenkins for ownCloud
98f836363a
[tx-robot] updated from transifex
2013-08-09 08:06:31 -04:00
Georg Ehrke
1c9d52774e
update indexes of oc_permissions
2013-08-09 09:31:53 +02:00
Valerio Ponte
881e362f93
final fix for xsendfile zip generation race condition
2013-08-08 23:34:04 +02:00
Owen Winkler
a2ac5e0163
Merge pull request #4271 from owncloud/plural_translations
...
Plural translations
2013-08-08 10:34:28 -07:00
Jörn Friedrich Dreyer
e38025ba67
Merge pull request #4151 from owncloud/doctrine-object
...
Move dbtype depending logic into object per type
2013-08-08 08:46:30 -07:00
Björn Schießle
c24bf47db8
Merge pull request #4349 from owncloud/oc_cache_fix
...
oc_cache needs to disable file proxys for read/write operation.
2013-08-08 08:19:14 -07:00
Morris Jobke
062769ab61
Remove noisy Log/Debug message
2013-08-08 16:39:33 +02:00
Bjoern Schiessle
df358dfef5
fix function call for searUsers()
2013-08-08 13:41:04 +02:00
Thomas Müller
fed1792510
adding unit tests for quota checks
2013-08-08 13:33:00 +02:00
Thomas Müller
d3a69bf4c6
adding unit tests to determine length
2013-08-08 11:04:40 +02:00
Bjoern Schiessle
ab6e47b44a
oc_cache needs to disable file proxys for read/write operation. Otherwise the operation will go through the encryption app which will not work.
2013-08-08 09:44:19 +02:00
Thomas Müller
fb890eee67
fixes #4343
2013-08-08 00:42:28 +02:00
Bart Visscher
d563367b0f
More style fixes
2013-08-07 22:22:33 +02:00
Bart Visscher
83988a5906
Fix stupid bug
2013-08-07 21:01:31 +02:00
Bart Visscher
0783267e2c
Move query processing after the check for prepared statement cache
2013-08-07 18:21:49 +02:00
Jan-Christoph Borchardt
367b248bc0
show 'More apps' link to app administration directly in app navigation
2013-08-07 18:18:09 +02:00
Bart Visscher
2cc94cbc73
Style fixes
2013-08-07 18:17:37 +02:00
Robin Appelman
a0243e03ef
use ===
2013-08-07 17:17:30 +02:00
Robin Appelman
9321eceed6
add the option to have templates for newly created files
2013-08-07 16:53:09 +02:00
Robin Appelman
fc332acf8a
split of mimetype detection code from OC_Helper, adding the option for apps to register additional mimetype mappings
2013-08-07 16:38:57 +02:00
Jenkins for ownCloud
0deae7b86f
[tx-robot] updated from transifex
2013-08-07 09:04:32 -04:00
Georg Ehrke
dcc92445a0
allow permissions.user to be null as suggested by @butonic
2013-08-07 11:51:08 +02:00
kondou
1a4465f41d
Improve app-management
...
- Better error messages
- Translate untranslated strings
Basically picks non-app-dependency related stuff from #4017
2013-08-06 17:19:18 +02:00
Robin Appelman
95a959b10b
merge master into doctrine-object
2013-08-06 15:43:58 +02:00
Bart Visscher
9b6357e6aa
Merge pull request #4291 from owncloud/schema
...
update DB Schema class
2013-08-05 11:29:52 -07: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
464afb5eca
use isset to prevent undefined index
2013-08-05 13:51:45 +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
Jan-Christoph Borchardt
5a77b67147
change long couldn't be determined string to question mark again
2013-08-04 16:27:17 +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
Thomas Müller
b229381dda
initialize $plural_form_string with English default
2013-08-03 23:29:31 +02:00
Robin Appelman
3534c3b373
add reveal mimetype
2013-08-03 21:59:44 +02:00
Thomas Müller
e04bf0aaeb
unit tests for plural translations added
2013-08-02 23:08:41 +02:00
Thomas Müller
35a42da3ca
PHPDoc comments adjusted *partially* - fixing call to createPluralFormFunction
2013-08-02 21:46:25 +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
Robin Appelman
2af27434a4
merge master into doctrine-object
2013-08-02 19:53:04 +02:00
Bart Visscher
fd317f599b
Simplify OC_DB transaction functions
2013-08-02 16:12:34 +02:00
Bart Visscher
5ffb8fac24
Use function to create schema manager
2013-08-02 16:02:33 +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
Robin Appelman
258e54182a
remove invalid type hinting and cleanup namespaces a bit
2013-08-02 15:09:50 +02:00
Bernhard Posselt
f5c3a346b0
make log date configurable, default to iso 8601
2013-08-02 13:34:20 +02:00
Bart Visscher
59c5529a2b
Rename \OC\DB\Schema to \OC\DB\MDB2SchemaManager
2013-08-02 13:19:27 +02:00
Bart Visscher
9432885428
Change OC_DB_Schema to use DI for db connection object
2013-08-02 13:14:18 +02:00
Lennart Rosam
79351d064f
Make default language configurable via config.php
2013-08-02 09:41:31 +02:00
Jakob Sack
2f17dcdba8
Fix syntax error.
2013-08-01 21:46:52 +02:00
Jakob Sack
eee2c369d9
Fix copy and paste errors in l10n.php
2013-08-01 21:36:33 +02:00
Jakob Sack
9673a563b5
Create plural functions on the fly
2013-08-01 21:25:14 +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
Jakob Sack
495e44e76c
Update l10n.php to read plural_forms string
2013-08-01 19:54:51 +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
Bjoern Schiessle
99354f9a28
fix searchUsers() call in group.php
2013-07-31 11:34:22 +02: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
Jenkins for ownCloud
48621115c1
[tx-robot] updated from transifex
2013-07-28 01:58:28 -04:00
Robin Appelman
e1e7b6a940
Cache: don't check if the parent exists in the cache if we are already sure it does
2013-07-27 11:36:27 +02:00
Jenkins for ownCloud
fa35650e0a
[tx-robot] updated from transifex
2013-07-27 02:03:03 -04:00
Bart Visscher
d7916363e1
Make DB connection available to use for dependency injection
2013-07-26 20:36:48 +02:00
Robin Appelman
59bdba9bac
fix scanner hooks, cant use inside closures in php 5.3
2013-07-26 15:43:10 +02:00
Robin Appelman
88cc2ccb3b
use renamed constants
2013-07-25 16:14:46 +02:00
Robin Appelman
e2f04b3b42
use storage wrapper for quota instead of a filesystem proxy
2013-07-25 16:01:37 +02:00
Robin Appelman
5209cff371
add conveince function to wrap all storages
2013-07-25 16:01:05 +02:00
Robin Appelman
d042c8f166
use renamed constants
2013-07-25 16:00:48 +02:00
Robin Appelman
f4b6a8aa08
add option to wrap existing mounts
2013-07-25 16:00:24 +02:00
Robin Appelman
4e490b0688
fix getPermissionsCache for storage wrapper
2013-07-25 15:59:57 +02:00
Robin Appelman
1b50154c95
functions in OCP should be static
2013-07-25 15:25:17 +02:00
Andreas Fischer
75e93d041d
Merge pull request #3887 from owncloud/apc_user_cache
...
The APC User Cache doesn't return the cache_list anymore
* owncloud/apc_user_cache:
Add ACPu memory cache
2013-07-25 03:48:26 +02:00
Robin Appelman
cd8f0c21ce
add quota storage wrapper
2013-07-25 00:31:51 +02:00
Robin Appelman
10d3e63ce5
add quota streamwrapper that limits the amount of data that can be written to a stream
2013-07-25 00:31:51 +02:00
Robin Appelman
94560c68ba
rename constants
2013-07-25 00:29:27 +02:00
Bart Visscher
25003fb213
Add ACPu memory cache
2013-07-24 21:50:15 +02:00
icewind1991
ff86b6f134
Merge pull request #4183 from owncloud/fix-group-id
...
Fix group id naming fid->gid
2013-07-24 11:09:47 -07:00
icewind1991
1986416248
Merge pull request #3898 from owncloud/sabre-objecttree
...
WebDAV performance improvements
2013-07-24 10:46:27 -07:00
Bart Visscher
4e3bfd8ddd
Fix group id naming fid->gid
2013-07-24 17:54:31 +02:00
Jan-Christoph Borchardt
9b1866f1ac
merge master
2013-07-24 16:31:01 +02:00
Robin Appelman
ad266a4253
Merge branch 'master' into sabre-objecttree
2013-07-24 15:53:48 +02:00
Björn Schießle
651479322b
Merge pull request #4177 from owncloud/move_defaults_to_template_constructor
...
Move defaults to template constructor
2013-07-24 06:42:52 -07:00
icewind1991
98858e6f00
Merge pull request #3995 from owncloud/groups
...
Refactoring of group management code
2013-07-24 06:13:05 -07:00
Björn Schießle
75fd6d4fde
initialize OC_Defaults in template constructorX
2013-07-24 11:51:21 +02:00
Morris Jobke
2622839fcf
Merge pull request #4171 from owncloud/fix-config
...
Fix config
2013-07-24 00:48:43 -07:00
Thomas Müller
1a73e607bd
Merge branch 'master' into more-themable-strings
...
Conflicts:
lib/template.php
2013-07-24 09:35:33 +02:00
Thomas Müller
60ce492fac
Merge branch 'master' into groups
2013-07-24 01:11:12 +02:00
Thomas Müller
5fc0535f1b
Merge pull request #4090 from owncloud/cleanup-some-template-functions
...
Cleanup some template functions
2013-07-23 15:53:43 -07:00
Bart Visscher
793ff0fec9
Fix lastInsertId for OCI8 adapter
2013-07-23 22:16:04 +02:00
Robin Appelman
fb40d9e1e6
Merge branch 'master' into groups
2013-07-23 22:06:03 +02:00
Bart Visscher
7ad38535e5
Merge pull request #3392 from owncloud/googledrive
...
Switch to using Google Drive SDK, closes #2047
2013-07-23 12:23:08 -07:00
Jan-Christoph Borchardt
93b227d803
shorten wording on config directory errors
2013-07-23 18:41:00 +02:00
Bart Visscher
3eb5fff02a
Add documentation to OC\DB\adapter class
2013-07-23 18:09:42 +02:00
Bart Visscher
485e8ab0a5
ignore config read failures
2013-07-23 17:38:37 +02:00
Bart Visscher
5caa7576d4
Revert "fix failing master branch - Test_Config::testWriteData"
...
This reverts commit 8f93490ac4
.
2013-07-23 17:36:08 +02:00
Jörn Friedrich Dreyer
f7422ad132
Merge pull request #4150 from owncloud/better-error-handling
...
Better error handling
2013-07-23 08:30:02 -07:00
Jenkins for ownCloud
a94c55be98
[tx-robot] updated from transifex
2013-07-23 02:03:19 -04:00
Bart Visscher
179b42c56d
Fixed review issues
2013-07-22 23:04:14 +02:00
Robin Appelman
499a01f179
use ===
2013-07-22 17:41:33 +02:00
Jörn Friedrich Dreyer
cb4cf3e2f7
need to use \OC_Image to escape OCP namespace
2013-07-22 17:25:55 +02:00
Kondou
bc86ce00cf
Merge pull request #4154 from owncloud/return-ocl10n
...
return result from getL10N
2013-07-22 08:05:32 -07:00
Robin Appelman
b073a34e77
add support for the <primary/> element within field definitions
2013-07-22 16:25:07 +02:00
Robin Appelman
dc272e6e20
db: cast default values for boolean fields to booleans
2013-07-22 16:24:46 +02:00
Robin Appelman
d509a0c403
return result from getL10N
2013-07-22 15:52:02 +02:00
Georg Ehrke
f1e939e1a3
Merge branch 'master' into fix_return_value_search_principals
2013-07-22 15:30:57 +02:00
Bart Visscher
be7c613993
Fix errors from unit tests
2013-07-21 23:17:37 +02:00
Bart Visscher
b66c9098bd
Correct namespace of OC_ classes
2013-07-21 23:17:37 +02:00
Bart Visscher
000b5a801f
Move building error string to connection
2013-07-21 23:17:37 +02:00
Bart Visscher
de83bf98c7
Group database connection and schema function
2013-07-21 23:17:37 +02:00
Bart Visscher
013333fe6a
Cleanup: remove code for multiple database backends
2013-07-21 23:17:37 +02:00
Bart Visscher
3e0e2cfa19
Use $connection for schema changes
2013-07-21 23:17:37 +02:00
Bart Visscher
8a332cdc94
Simplify OC_DB transaction functions
2013-07-21 23:17:37 +02:00
Bart Visscher
19b9c89634
Move insertIfNotExist to Connection wrapper
...
Real implementation is in DB\Adapter* classes
2013-07-21 23:17:37 +02:00
Bart Visscher
58991150ab
Move query statement fixup handling to Connection wrapper
2013-07-21 23:17:37 +02:00
Bart Visscher
1d5d23a1de
Move limit/offset handling to Connection wrapper
2013-07-21 23:17:37 +02:00
Bart Visscher
a48e9c488b
Move prepared query cache handling to Connection wrapper
2013-07-21 23:17:36 +02:00
Bart Visscher
e3c5fea989
Move lastInsertId to adapter classes
2013-07-21 23:17:36 +02:00
Bart Visscher
cd98ff1eaf
Move db prefix handling to Connection wrapper
2013-07-21 23:17:36 +02:00
Bart Visscher
66a215651b
Create DB Connection wrapper and DB\Adapter* classes
2013-07-21 23:17:36 +02:00
Bart Visscher
62ce3a5613
Only close db connection when disconnecting, keep the connection object
2013-07-21 23:17:36 +02:00
Bart Visscher
25e3c9cbeb
Only display call trace in debug mode
2013-07-21 22:56:21 +02:00
Bart Visscher
aa22194a09
In debug mode uncaught exceptions should display a nice page
2013-07-21 22:40:35 +02:00
Bart Visscher
8c5df31c49
DRY use OC_Template::printErrorPage
2013-07-21 22:30:32 +02:00
Bart Visscher
df8ad46dae
Change exit calls to throwing an exception
...
This way the error won't be fatal in a unit test
2013-07-21 22:29:50 +02:00
Bart Visscher
6d39e0ad6f
Change to use !== and ===
2013-07-21 21:42:42 +02:00
Thomas Müller
01c39cf2be
fixing typos, PHPDoc and missing namespace \
2013-07-21 21:42:42 +02:00
Bart Visscher
3de8570e35
Move basic template functions to their own class
2013-07-21 21:42:42 +02:00
Bart Visscher
2593395561
Move template functions to there own file
2013-07-21 21:37:25 +02:00
Bart Visscher
5965f3ecea
Split locating JS and CSS files to their own class
2013-07-21 21:36:15 +02:00
Bart Visscher
37a731bcad
Merge pull request #4131 from owncloud/scanner-split
...
Remove scanner logic from ajax file and place it in it's own class
2013-07-21 11:32:11 -07:00
Bart Visscher
639097db59
Merge pull request #4092 from owncloud/base-better-errors
...
Generate better errors in base.php
2013-07-21 11:20:30 -07:00
Bart Visscher
9bf12da750
Merge pull request #3880 from owncloud/code-checker
...
Add classes replaced by the public api to the code checker
2013-07-21 11:19:20 -07:00
Morris Jobke
8f93490ac4
fix failing master branch - Test_Config::testWriteData
2013-07-21 11:13:29 +02:00
Morris Jobke
05c83a163a
add proper deprecated tag
2013-07-21 10:30:00 +02:00
Morris Jobke
647e0a0cba
Merge pull request #4118 from owncloud/remove-size-experiment
...
finally remove the file size obfuscation as it had more disadvantages.
2013-07-21 01:25:39 -07:00
Jan-Christoph Borchardt
48267b6e6c
add back public API function, but mark as deprecated
2013-07-20 01:15:12 +02:00
Bart Visscher
11f28d7880
Result of && if not the part
2013-07-19 17:37:42 +02:00
Bart Visscher
cbe1c22b5f
Correct casing of OC_User and pass through the params to getUsers
2013-07-19 17:32:31 +02:00
Robin Appelman
2b89b7c880
Split scanning logic from ajax file
2013-07-19 16:44:47 +02:00
Robin Appelman
b397df2022
add option to get the mountmanager from the filesystem
2013-07-19 16:33:00 +02:00
Robin Appelman
02cdd52fb0
Make Cache\Scanner an emitter
2013-07-19 16:32:43 +02:00
Bart Visscher
a22940d3cd
Add OC_L10N to public api
2013-07-19 11:40:11 +02:00
Bart Visscher
9379cbf602
Add OC_Image to public api
2013-07-19 11:23:47 +02:00
Jenkins for ownCloud
ae82f7fd17
[tx-robot] updated from transifex
2013-07-19 02:03:14 -04:00
Robin Appelman
a945ce908b
style fix
2013-07-19 02:23:57 +02:00
Bart Visscher
084cf0c202
Merge pull request #2221 from owncloud/doctrine
...
OC6: Implement Doctrine as the backend for OC_DB
2013-07-18 14:24:27 -07:00
Jan-Christoph Borchardt
48948ccf5f
finally remove the file size obfuscation as it had more disadvantages. I was wrong, sorry.
2013-07-18 22:15:26 +02:00
Bart Visscher
e2b6781cf9
Tweaks to the MDB2SchemaReader
2013-07-18 21:07:56 +02:00
Robin Appelman
e3ea3ed3c5
group: only pass backends that hold that specific group to the group constructor
2013-07-18 12:15:34 +02:00
Thomas Müller
3c6b205e37
Merge pull request #4099 from owncloud/fixing-unix-timestamp-mssql-master
...
fixing UNIX_TIMESTAMP() for mssql
2013-07-17 13:57:43 -07:00
Markus Goetz
3fd4ff79ee
Merge pull request #4042 from guruz/webdav_auth_check_existing
...
WebDAV Auth Connector: Check if already logged in
2013-07-17 05:00:59 -07:00
Markus Goetz
bf7514f76a
WebDAV Auth Connector: Check if already logged in
2013-07-17 13:51:15 +02:00
Thomas Mueller
24283425a6
fixing UNIX_TIMESTAMP() for mssql
2013-07-17 13:18:46 +02:00
Bart Visscher
5b60fad467
Display the exception error backtrace preformatted
2013-07-16 22:42:09 +02:00
Bart Visscher
971a3fd124
Early errors (in base.php) don't have session available
2013-07-16 22:37:32 +02:00
Bart Visscher
49fca86f3c
Cleanup error generation in base.php
2013-07-16 22:36:39 +02:00
Bart Visscher
7d86e262e1
Use autoloader for Patchwork/PHP/Shim/Normalizer
2013-07-16 22:32:04 +02:00
Jakob Sack
fb97600091
Fix an error jenkins found
2013-07-16 22:27:55 +02:00
icewind1991
e09ffb6f57
Merge pull request #2395 from owncloud/cache
...
Seperate the memory based cache and file based cache in OC_Cache
2013-07-16 13:25:07 -07:00
Jakob Sack
bb0c5bff5f
Add multiple plural forms to the php part
2013-07-16 22:16:53 +02:00
Bart Visscher
285f288cf3
Merge pull request #3959 from owncloud/buildNotExistingFileNameForView
...
Fix renaming using parenthesis
2013-07-16 12:06:53 -07:00
Robin Appelman
dc1a17b6f4
memcache: also switch factory to prefix
2013-07-16 16:08:37 +02:00
Robin Appelman
504089940d
mamcache: implement the ArrayAccess interface
2013-07-16 16:06:00 +02:00
Robin Appelman
69048ab71f
memchache: use prefix string instead of global flag
2013-07-16 15:42:40 +02:00