7bc313a0cd
Merge pull request #10066 from marc0s/issues/10065-fix-null-check
...
Fix checking of NULL or empty OC::$THIRDPARTYROOT/OC::$THIRDPARTYWEBROOT
2014-08-11 10:44:47 -04:00
13d44f8f7f
Merge pull request #10251 from owncloud/fix-dav-attributes-master
...
shared files/folders are not mounted
2014-08-11 14:40:47 +02:00
79fa2bc391
Merge pull request #10301 from owncloud/fix-internal-mail-share-links
...
Don't use /Shared as a base for links in share email
2014-08-11 13:33:39 +02:00
b83d00f847
Merge pull request #10249 from mroi/patch-1
...
file size on non-(Linux/BSD/Windows)-installations
2014-08-11 13:02:01 +02:00
411f6c7704
[tx-robot] updated from transifex
2014-08-11 01:54:32 -04:00
578a57f0fb
Load authentication backends before tryBasicAuth
2014-08-10 13:29:32 +02:00
c920ca32e8
[tx-robot] updated from transifex
2014-08-10 01:55:15 -04:00
f12f835485
[tx-robot] updated from transifex
2014-08-09 01:55:08 -04:00
aeef10eb47
Add scrollto to the url if sharing a file for long file lists
2014-08-09 00:21:29 +01:00
16dafa9cac
Fix link to files and folders in internal share emails
2014-08-09 00:08:45 +01:00
6dda30b5a2
remove share permissions if user is excluded from sharing
2014-08-08 12:16:54 +02:00
d63b9e68c4
[tx-robot] updated from transifex
2014-08-08 01:55:11 -04:00
b6a2a85bb8
Merge pull request #9953 from owncloud/fix_text_preview_for_systems_without_ttf
...
implement a txt preview fallback for the case that ttf is not support
2014-08-07 22:55:06 +02:00
520f6422ac
Merge pull request #10079 from owncloud/Improve_scanner_message
...
Improved scanner error message
2014-08-07 16:09:52 +02:00
9d2cff50ed
shared files/folders are not mounted
2014-08-07 16:01:13 +02:00
cde1a9241d
file size on non-(Linux/BSD/Windows)-installations
...
Determining the file size using the exec() method is implemented for Linux, BSD, and Windows. However, on systems matching neither platform name (like SunOS), the fall-through path will return a file size result constituting a zero size instead of an invalid null return value.
2014-08-07 15:41:58 +02:00
e33fc2807c
Merge pull request #10142 from owncloud/fix-#9283-gzip_support
...
Removed broken tar cutter, added tar and fixed extension switch.
2014-08-07 14:53:31 +02:00
f1091280de
Merge pull request #10184 from owncloud/getbyid-node
...
Fix Folder::getById
2014-08-07 13:40:17 +02:00
d2365afad6
Merge pull request #8915 from owncloud/MorrisJobke-travis
...
Travis support for PRs and master, stable5 and stable6
2014-08-07 11:33:13 +02:00
2821f7241b
[tx-robot] updated from transifex
2014-08-07 01:55:10 -04:00
173538befb
typo fix from transifex suggestion
2014-08-06 20:48:26 +02:00
12207ec0c7
Fix SharedCache::getPathById
2014-08-06 13:38:14 +02:00
1deb6aadd3
return null instead of throwing an exception
2014-08-06 12:06:41 +02:00
a72dae6842
Merge pull request #10144 from owncloud/issue/9972
...
Issue/9972 Fix issues with group and username `0`
2014-08-06 09:53:13 +02:00
e902e3f659
[tx-robot] updated from transifex
2014-08-06 01:54:43 -04:00
9fb79c86f0
Merge pull request #10191 from owncloud/sharing_rm_trailing_slash
...
[sharing] remove trailing slash
2014-08-05 23:13:35 +02:00
48c57b80e3
remove trailing slash from path
2014-08-05 20:34:32 +02:00
d35bfc9a4c
Merge pull request #9520 from owncloud/theme_urls
...
Add ability to theme iOS and Android client URLs just like desktop URLs.
2014-08-05 17:53:18 +02:00
bf8f910a32
Fix Folder::getById
2014-08-05 16:58:10 +02:00
676fa459d7
Minor fixes
...
* instanceof \OC\Files\View
* fix misplaced paranthesis
* remove misplaced character in comment
2014-08-05 16:53:28 +02:00
244d4e1399
Make View->shouldEmitHooks more robust
2014-08-05 16:53:28 +02:00
8561d0dfca
remove escaping because it's unneeded
2014-08-05 13:18:38 +02:00
7b222c4ab5
fix uppercase issue
2014-08-05 13:16:51 +02:00
2e127d2c5e
Add ability to theme iOS and Android client URLs just like desktop URLs.
2014-08-05 13:16:51 +02:00
41cca70a63
don't display share permission if resharing was disabled by the admin
2014-08-05 10:57:51 +02:00
c0e78d9841
Merge pull request #10151 from owncloud/issue/9912
...
Increase word wrap limit for emails to 78 characters
2014-08-05 08:20:57 +02:00
5ecbc27753
[tx-robot] updated from transifex
2014-08-05 02:05:17 -04:00
303f6da76f
Check return of fopen() before using it
...
Fix #9968
2014-08-04 17:53:06 +02:00
f4c7e3c1e9
Merge pull request #10083 from th3fallen/fix-9969-take-two
...
Fix 9969
2014-08-04 17:41:03 +02:00
66a3a641b9
Merge pull request #10138 from owncloud/innodb-repair-non-oc
...
Dont touch non-oc tables when doing the InnoDB repair step
2014-08-04 16:23:46 +02:00
c1b8d93cb0
Increase word wrap limit for emails to 78 characters
2014-08-04 16:05:09 +02:00
4865c52aa6
Fix isLoggedIn() check for user '0'
...
Fix #9972
2014-08-04 15:53:55 +02:00
f80baf03d4
Fix getting group '0' from database backend
...
Fix #9972
2014-08-04 15:53:55 +02:00
cb842ba793
Previous commit was not based on master, retry. Removed broken tar cutter, double extensions are not possible in temp files. Added tar support. Fixed extension switch.
2014-08-04 14:10:09 +02:00
8b4d3c065c
only set core version at the end
2014-08-04 13:42:16 +02:00
ae263da69a
Also set the app version when updating from app store
2014-08-04 13:41:05 +02:00
776cc45a5a
Allow loading app without checking the upgrade
2014-08-04 13:41:05 +02:00
4602d1f2a6
extract upgrade parts to their own methods
2014-08-04 13:41:05 +02:00
4608f8a3b5
Throw an exception when we try to load an app that needs to be upgraded
2014-08-04 13:41:04 +02:00
43d790239d
Extend OC_Util::needUpgrade to also catch app upgrades
2014-08-04 13:41:04 +02:00
ca463f9c10
Dont touch non-oc tables when doing the InnoDB repair step
2014-08-04 13:14:12 +02:00
65903a012a
Merge pull request #10025 from owncloud/l10n-typo
...
typo fix from transifex suggestion
2014-08-04 11:03:50 +02:00
d1aaa7a12e
[tx-robot] updated from transifex
2014-08-02 01:54:33 -04:00
7a07690b25
expire -> expiration
2014-08-02 04:02:39 +02:00
a0ab4c2434
fix return documentation
2014-08-01 13:42:35 +02:00
378f35f0ec
prevent PHP errors and enhance logging
2014-08-01 09:54:32 +02:00
86cdfa3db3
[tx-robot] updated from transifex
2014-08-01 01:54:28 -04:00
5f015067f4
suggestions by deepdiver
2014-08-01 01:39:52 +02:00
26af116fcd
Removing unnecessary switch statements in fopen methods.
2014-07-31 09:34:27 -04:00
d975012ae6
Improved scanner error message
2014-07-31 13:12:35 +02:00
4eb2b4e1b0
Merge pull request #10051 from owncloud/preview-empty-text
...
Use svg mimeicons for empty text files
2014-07-31 11:38:29 +02:00
c1562057e8
[tx-robot] updated from transifex
2014-07-31 01:55:01 -04:00
f2e20757f6
Fix checking of NULL or empty OC::$THIRDPARTYROOT/OC::$THIRDPARTYWEBROOT
...
Fixes #10065
2014-07-30 23:24:55 +02:00
5b11a18dea
Merge pull request #10044 from owncloud/transparency_fix
...
extract transparency fix from #8050
2014-07-30 18:36:51 +02:00
521934ee0d
Merge pull request #10029 from owncloud/fix-thirdparty
...
Fix silent crash if 3rdparty dir is not available
2014-07-30 18:34:55 +02:00
62b37fbb99
Merge pull request #10024 from owncloud/preview-restrict-height
...
Also keep maxY into account when scaling a preview while preserving aspect ratio
2014-07-30 17:22:20 +02:00
dd9347fdd2
Merge pull request #10000 from owncloud/fix-lowlat-cache-autoload
...
Cache factory needs to use globalPrefix in createLowLatency()
2014-07-30 16:56:45 +02:00
4a9b0d5465
Use svg mimeicons for empty text files
2014-07-30 16:31:37 +02:00
fa461befbc
extract transparency fix from #8050
2014-07-30 16:13:33 +02:00
38e309b0fe
Merge pull request #9970 from owncloud/sharing_set_expire_date
...
Sharing set expire date
2014-07-30 14:37:16 +02:00
90d8f42d7c
typo fix from transifex suggestion
2014-07-30 14:07:32 +02:00
eb9bd200fa
Replace exit with return
2014-07-30 14:03:31 +02:00
31e7fdb9bf
Fix silent crash if 3rdparty dir is not available
2014-07-30 14:03:31 +02:00
c066320208
Also keep maxY into account when scaling a preview while preserving aspect ratio
2014-07-30 13:52:40 +02:00
0113ad0b33
Log unsuccessful temp file creation and return false
2014-07-30 13:50:41 +02:00
54d5d03271
Merge pull request #9888 from owncloud/mysql-tinyint-master
...
migration test for sqlite - adding type mapping for 'tinyint unsigned'
2014-07-30 11:48:10 +02:00
7d6221d25d
Merge pull request #9914 from owncloud/fix-appframework-blank-template
...
Fix template rendering for 'blank' templates
2014-07-30 10:31:15 +02:00
47e72917e5
[tx-robot] updated from transifex
2014-07-30 01:55:32 -04:00
889088f72d
Fix template rendering for 'blank' templates
2014-07-29 16:49:50 +02:00
a36c4402f5
Merge pull request #9988 from owncloud/sharing_remove_share_permission
...
remove share permission if user is excluded from sharing
2014-07-29 14:05:13 +02:00
a8fbc709ce
Add registerAutoloaderCache().
2014-07-29 11:18:40 +02:00
9be8ac5867
Memcache\Factory: Remove static, use globalPrefix.
2014-07-29 11:14:36 +02:00
da391b8932
InstanceId is properly injected into factory. Remove comment.
2014-07-29 11:03:10 +02:00
67e302885c
remove share permission if user is excluded from sharing
2014-07-29 10:08:08 +02:00
58472a2660
migration test for sqlite - adding type mapping for 'tinyint unsigned'
2014-07-29 09:18:37 +02:00
29a3f1e2af
[tx-robot] updated from transifex
2014-07-29 09:16:02 +02:00
4e87ac2bb9
make sure that we set the expire date if a date is adefault date is set
2014-07-28 22:45:03 +02:00
c53b56e313
Merge pull request #9798 from owncloud/ocs_share_api_add_expire_date
...
[share api] add OCS api call to set expire date for link shares
2014-07-28 17:28:32 +02:00
1fbbaed261
Merge pull request #9949 from owncloud/fixing-sqlite-migration-shared-hoster
...
generate copy of sqlite database file in data directory
2014-07-28 16:54:52 +02:00
cb0ff19dc4
Merge pull request #9924 from owncloud/eventsource-nginx-buffering
...
Prevent nginx from buffering event source events
2014-07-28 16:17:35 +02:00
4e8e69dc81
implement a txt preview fallback for the case that ttf is not support
2014-07-28 13:05:08 +02:00
539d2b7ec3
Merge pull request #9784 from josh4trunks/libreoffice_match_cl
...
Cleanup Document Preview
2014-07-28 13:03:33 +02:00
a3411e3719
Merge pull request #9641 from owncloud/localuser-addressbook
...
ownCloud users are exported as address book
2014-07-28 12:18:56 +02:00
534fb9ebf9
Merge pull request #9631 from owncloud/update-getid3
...
update getID3 library
2014-07-28 11:51:36 +02:00
11214219f3
Merge pull request #9819 from owncloud/updater-setversionafterupdate
...
Set version AFTER a successful update
2014-07-28 11:19:57 +02:00
0aa652ecfd
Merge pull request #9859 from tiezdne/master
...
Update mimetypes.list.php
2014-07-28 11:16:43 +02:00
cfaa05cc0e
Merge pull request #9905 from owncloud/joblist-non-existing-class
...
Dont try to execute jobs that no longer exist
2014-07-28 11:09:27 +02:00
ab8efe3aa2
Merge pull request #9935 from owncloud/harden-get-urlco
...
Verify whether the URL is valid
2014-07-28 11:07:41 +02:00
c87f425fe7
generate copy of sqlite database file in data directory
2014-07-28 10:29:39 +02:00
f2982b7a08
Merge pull request #9904 from owncloud/loggedout-getuserfolder
...
Dont throw an error when calling $server->getUserFolder when logged out
2014-07-28 10:04:01 +02:00
37f673c8b5
Merge pull request #9843 from owncloud/dont-silently-exit-in-cli-mode-master
...
don't silently exit in cli-mode in case ownCloud in not yet installed
2014-07-28 09:40:40 +02:00
a169572223
[tx-robot] updated from transifex
2014-07-28 01:54:30 -04:00
260729fd7d
Verify whether the URL is valid
...
Required for https://github.com/owncloud/mail/pull/100#issuecomment-50266017
@karlitschek Backport for stable6 and stable7 requested.
2014-07-27 16:46:32 +02:00
9a4d2871eb
[tx-robot] updated from transifex
2014-07-27 01:54:31 -04:00
2c4e06d325
Prevent nginx from buffering event source events
2014-07-26 16:07:11 +02:00
010732019a
[tx-robot] updated from transifex
2014-07-26 01:54:40 -04:00
ecdd04374a
Allow specifying the item source in unshareFromSelf().
2014-07-26 02:00:49 +02:00
ec7a10f882
reorder if statements to remove negation, indentation correction
2014-07-25 19:39:29 +02:00
43978befda
Dont try to execute jobs that no longer exist
2014-07-25 18:02:02 +02:00
acafb4a426
Merge pull request #9669 from owncloud/group-public
...
Add group management to the public api
2014-07-25 17:55:12 +02:00
bf12bba079
Dont throw an error when calling $server->getUserFolder when logged out
2014-07-25 17:52:50 +02:00
ae3761f15d
add autoload
2014-07-25 17:37:33 +02:00
a9666c4f5b
update getID3 library
2014-07-25 15:25:45 +02:00
ecc1f92bb6
add OCS api call to set expire date for link shares
2014-07-25 13:38:18 +02:00
07dc0b2fdf
setting and checking default_charset in php.ini to be UTF-8
2014-07-25 09:53:25 +02:00
3f58d949e0
[tx-robot] updated from transifex
2014-07-25 01:54:32 -04:00
176ecbd311
ownCloud users are exported as address book
2014-07-24 17:35:02 +02:00
788a2eca2f
Merge pull request #9841 from owncloud/fix-password-reset-master
...
Fix password reset in console command and lost password controller
2014-07-24 15:58:02 +02:00
6a2f3921f6
Update mimetypes.list.php
2014-07-24 15:43:55 +02:00
2594fb80aa
don't silently exit in cli-mode in case ownCloud in not yet installed
2014-07-24 13:45:06 +02:00
a8b6cc6a07
- adding default value for $recoveryPassword
...
- set password correctly in lost password
2014-07-24 12:50:39 +02:00
7d60f7a222
register type mappings for unknown/unsupported mysql types
2014-07-24 12:17:26 +02:00
6f329dcb6c
Set version AFTER a successful update
...
If an app upgrade failed, the core version will not be increased either
in the database. This will re-display the update page and make it
possible to redo the apps upgrade.
Note that any core repair routine must take into account that an update
might need to be redone again even though the core's DB state is already
the one of the new version.
2014-07-23 23:38:17 +02:00
363ba04f5e
only commit in case a transaction is active
2014-07-23 20:13:19 +02:00
acd5660492
Cleanup Document Preview
...
Use the env:UserInstallation flag like https://github.com/owncloud/documents/blob/master/lib/converter.php .
This will stop the creating of multiple directories for document conversion in tmpDir.
2014-07-22 22:46:38 -07:00
4e2954673a
Revert change
2014-07-22 19:45:01 +02:00
eacdf26cde
Allow getAppFolder to get another apps path
...
cc @Raydiation
2014-07-22 16:07:43 +02:00
0567fd031f
Merge pull request #9772 from owncloud/fix-chunked-upload-master-2
...
adding special handling of checkPrecondition() for chunked upload
2014-07-22 15:47:55 +02:00
8ed6adaf85
Merge pull request #9738 from owncloud/remove-uneeded-strip
...
Remove uneeded strip_tags
2014-07-22 15:06:23 +02:00
31149fb1c3
adding special handling of checkPrecondition() for chunked upload
2014-07-22 13:06:20 +02:00
e9de20952a
Return the proper owner for home storages
2014-07-21 16:59:59 +02:00
677c0288fb
Merge pull request #9757 from owncloud/issue/9756
...
Add language parameter to public API for getL10N()
2014-07-21 16:50:48 +02:00
01878153e0
Add language parameter to public API for getL10N()
...
Fix #9756
2014-07-21 14:50:34 +02:00
0a9e0d1051
perm -> permissions
2014-07-21 13:49:22 +02:00
3df7a83c72
Merge pull request #9406 from philfry/master
...
silently discard the response body, needed for apache/mod_dav and maybe ...
2014-07-21 12:22:06 +02:00
76a5fa11f5
Merge pull request #9741 from owncloud/fix-repair-innodb-9737-master
...
check if $tables is an array
2014-07-20 21:40:53 +02:00
8cd1f7464e
Merge pull request #9672 from owncloud/mysql-affectedrows
...
Make MySQL affected row count consistent with other DBMSes
* owncloud/mysql-affectedrows:
Added test of OCS privatedata to trigger key duplication
Document why we have to check with defined() first.
Make MySQL return "number of found rows" instead of number of "affected rows".
2014-07-20 21:29:16 +02:00
f0c0bd5251
check if $tables is an array
2014-07-19 20:23:38 +02:00
1c16d012ab
Remove uneeded `strip_tags`
...
This `strip_tags` seems to be completely unneeded and will cause problems with passwords containing stripped characters. (e.g. `<` or `>`)
Needs https://github.com/owncloud/core/pull/9735 to be merged first.
2014-07-19 10:17:24 +02:00
d09ec36751
[tx-robot] updated from transifex
2014-07-19 01:54:42 -04:00
bfd59bddf4
Extract Auth Header logic into new function handleAuthHeaders().
2014-07-19 02:21:18 +02:00
fafed17c60
Deduplicate user/password extraction from alternative HTTP headers.
2014-07-19 02:06:37 +02:00
80983f5853
[tx-robot] updated from transifex
2014-07-18 01:54:43 -04:00
f92b5a2507
update appstore api url
2014-07-17 21:54:46 -04:00
77d6d11b91
Merge pull request #9682 from owncloud/mappedlocal-rename
...
Fix renaming files in the root folder of a MappedLocal storage
2014-07-17 09:19:17 +02:00
b736864e78
[tx-robot] updated from transifex
2014-07-17 01:55:09 -04:00
5a0397eb5e
Fix renaming files in the root folder of a MappedLocal storage
2014-07-16 21:24:18 +02:00
d58c8d72cf
Merge pull request #9550 from kofemann/dcache-fixes-for-upstream
...
storage: do not check file mode on rename
2014-07-16 16:06:14 +02:00
d8bd8c4b66
Document why we have to check with defined() first.
2014-07-16 15:13:35 +02:00
e26612244a
Make MySQL return "number of found rows" instead of number of "affected rows".
2014-07-16 14:35:47 +02:00
Clark Tomlinson
Thomas Müller
Vincent Petry
Jenkins for ownCloud
gekmihesg
Tom Needham
Bjoern Schiessle
Morris Jobke
Michael Roitzsch
Robin Appelman
Volkan Gezer
scolebrook
Joas Schilling
Remco Brenninkmeijer
Jörn Friedrich Dreyer
Martin
marc0s
Jan-Christoph Borchardt
Georg Ehrke
Victor Dubiniuk
Andreas Fischer
Lukas Reschke
Michael Kuhn
tiezdne
josh4trunks
Sander
Lukas Reschke
Frank Karlitschek
icewind1991