wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
15513 commits 157 branches 562 tags 714 MiB
Commit graph

15513 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andreas Fischer
95dd58bfc0 Use old school query style that actually works. 2013-12-12 15:24:35 +01:00
Robin Appelman
46b72cbff0 remove unneeded ; in comment 2013-12-12 15:14:44 +01:00
Arthur Schiwon
5ba9344b0e LDAP: the browser shall not autofill userdn and password, usually login credentials are inserted. fixes #6283 2013-12-12 14:15:39 +01:00
Robin Appelman
8a86837eac remove unneeded ; in comment 2013-12-12 13:59:00 +01:00
Robin Appelman
30e0b474f8 Add test for having utf8 filenames in the cache 2013-12-12 13:43:55 +01:00
Andreas Fischer
f8d3b7cb6f DB tests: Test whether we can insert and read UTF8 data. 2013-12-12 13:19:08 +01:00
Robin Appelman
f23b7a262f fix fallback overwriting result of getHome 2013-12-12 12:57:25 +01:00
Jenkins for ownCloud
7b20212c0a [tx-robot] updated from transifex 2013-12-11 13:32:13 -05:00
Vsevolod Kukol
a8f814fe2d fix smbclient directory listing parser 2013-12-11 17:21:34 +01:00
Robin Appelman
3d29992378 user Group->users as assosiative array 2013-12-11 16:25:41 +01:00
Robin Appelman
366d75e947 cache the home folder of a User 2013-12-11 16:22:26 +01:00
Robin Appelman
b126374780 cache the result from inGroup 2013-12-11 15:47:36 +01:00
Vincent Petry
050f87c9e4 Merge pull request #6270 from owncloud/sharing-mixeduppermissionsfix 
Fixed sharing results to include the correct permissions
 2013-12-11 02:59:22 -08:00
Andreas Fischer
cdd182ce35 Send "SET NAMES utf8" to MySQL for PHP below 5.3.6 2013-12-11 00:19:51 +01:00
Thomas Müller
28180485d9 Merge pull request #6244 from owncloud/memcached-connectivity-tests 
Only run memcached tests if server is available.
 2013-12-10 12:14:36 -08:00
Vincent Petry
22abc53e3b Merge pull request #5968 from owncloud/legacy-popup-fixes 
fix the legacy popup to make calendar settings look nicer
 2013-12-10 05:37:52 -08:00
Vincent Petry
e9255e5d57 Added unit test for sharing permissions 2013-12-10 11:19:09 +01:00
Vincent Petry
89eb3759a8 Fixed sharing results to include the correct permissions 
Passing $includeCollections would return more than one entry which gives
mixed up file permissions.

Added a method getFile() that doesn't set $includeCollections to make
sure we only get one result which is the file itself.

Fixes #6265
 2013-12-09 18:14:58 +01:00
Andreas Fischer
3084a52a97 Merge pull request #6246 from owncloud/memcached-config-sample 
Document memcached settings in config.sample.php

* owncloud/memcached-config-sample:
  Document memcached settings in config.sample.php
 2013-12-09 14:35:00 +01:00
Andreas Fischer
67310b60f7 Ensure memcached extension is there before attempting to create an instance. 2013-12-09 14:33:26 +01:00
Jenkins for ownCloud
6aab1ebf44 [tx-robot] updated from transifex 2013-12-09 06:40:22 -05:00
Jan-Christoph Borchardt
e574158bd8 fix shadow size and arrow position 2013-12-09 12:21:37 +01:00
blizzz
bc3650e48c Merge pull request #6231 from owncloud/fix-plural-l10n 
fix plural translation - fixes #6226
 2013-12-09 01:41:06 -08:00
Andreas Fischer
5db73c05fb Document memcached settings in config.sample.php 2013-12-09 01:20:10 +01:00
Andreas Fischer
a67c737848 Only run memcached tests if server is available. 2013-12-09 01:02:42 +01:00
Jenkins for ownCloud
079d20a80e [tx-robot] updated from transifex 2013-12-07 22:28:29 -05:00
Morris Jobke
823c85e65f Merge pull request #6202 from owncloud/fix_6032_alt 
Add overlay noscript message to fix #6032
 2013-12-07 08:04:29 -08:00
Morris Jobke
3444c15b86 fix IE8 transparent background 2013-12-07 17:03:53 +01:00
Morris Jobke
67957294c2 fix wrong test data in l10n 2013-12-07 13:29:14 +01:00
Morris Jobke
4c4c9096c4 fix plural translation - fixes #6226 2013-12-07 11:38:01 +01:00
blizzz
6a747106db Merge pull request #6150 from owncloud/backgroundjob-log-exception 
Remove background jobs that are giving errors
 2013-12-06 11:56:53 -08:00
Vincent Petry
123bc9921a Merge pull request #6201 from owncloud/backgroundscan-reuse-etag 
reuse etags when doing a background scan
 2013-12-06 10:13:14 -08:00
Björn Schießle
575a68074f Merge pull request #6220 from owncloud/debug_oracle_errors 
cherry-picks from #5884, just for debugging purpose
 2013-12-06 10:00:04 -08:00
Robin Appelman
9eca2471b3 Merge branch 'master' into backgroundscan-reuse-etag 2013-12-06 18:27:46 +01:00
Robin Appelman
e888bdda30 get rid of failing test that don't cause additional downloads 2013-12-06 18:26:38 +01:00
Bart Visscher
4c8bc61753 XSendfile and encryption don't work together 
The file on disk is encrypted, and not readable on client systems
 2013-12-06 17:59:59 +01:00
blizzz
b5939324b0 Merge pull request #6218 from leo-b/fix_ldap_setOption_returncode 
correctly propagate the return value of ldap_set_option
 2013-12-06 08:54:29 -08:00
Björn Schießle
36c286f879 Merge pull request #6222 from owncloud/enc_reset_enc_file_size 
set unencrypted_size to 0 after decryption
 2013-12-06 08:06:22 -08:00
Bart Visscher
40f148cc6c Don't try to encrypt a file when the temp file isn't created 2013-12-06 17:01:13 +01:00
Bjoern Schiessle
9ff231590c set unencrypted_size to 0 after decryption... so that the unencrypted_size gets re-calculated if encryption was enabled again 2013-12-06 16:11:41 +01:00
Bart Visscher
6aa9daf4e6 Users of getFolderContent are mostly interested in the unecrypted file size 2013-12-06 15:51:49 +01:00
Vincent Petry
db0b291f63 Merge pull request #6213 from owncloud/fix-full-name-edit 
Fix full name edit for repetitive edit
 2013-12-06 06:46:34 -08:00
Björn Schießle
b18c8e5c53 Merge pull request #6206 from owncloud/sharing_etag_propagation_on_expire 
Sharing etag propagation on expire
 2013-12-06 05:41:08 -08:00
Morris Jobke
ae38ed51fe Merge pull request #6211 from owncloud/fix-5865 
Multiselect too slow patched
 2013-12-06 04:59:24 -08:00
Morris Jobke
ac77218d57 parent().parent() -> closest() 2013-12-06 13:53:01 +01:00
Robin Appelman
cf9b7e343a extend test case for etag preservation 2013-12-06 13:00:58 +01:00
Bjoern Schiessle
e447d978d3 it is not possible to unshare files 2013-12-06 12:35:47 +01:00
Bjoern Schiessle
9371944e43 fix typo 2013-12-06 12:20:42 +01:00
Bjoern Schiessle
58c0117c3d only create new key on password change if a recovery key exists or if the user don't have any private/public keys 2013-12-06 12:20:31 +01:00
Bjoern Schiessle
8082ef2073 show change password form if key couldn't be decrypted 2013-12-06 12:20:22 +01:00