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

16475 commits

This branch
This branch
All branches
Author SHA1 Message Date
root
6585bd5a50 "reset" ldap pagedSearch control by setting it to a high value 
call nextEntry via invokeLDAPMethod
 2014-03-06 12:07:03 +01:00
root
8fcc29ee8b only check ldap_errno if an ldap_* function actually fails 
fix wizard errors
reset search paging right after the search, not before some of the possible next search operations
cookie contains binary characters, don't log it
  (avoids json_encode(): Invalid UTF-8 sequence in argument errors)
 2014-03-06 12:07:03 +01:00
Raghu Nayyar
7c3f3cc933 Merge pull request #7522 from owncloud/email-field-wording 
update wording of email field
 2014-03-04 15:05:22 +05:30
Morris Jobke
af2c2b3a16 update wording of email field 2014-03-04 10:22:54 +01:00
Thomas Müller
1cd0fd6e9e Merge pull request #7497 from owncloud/add-.scrutinizer.yml 
add .scrutinizer.yml
 2014-03-03 20:05:21 +01:00
Thomas Müller
a86e229848 Remove duplicate row 2014-03-03 20:05:14 +01:00
Vincent Petry
ad195a881e Merge pull request #7453 from owncloud/preview-fileinfo 
Cache the fileinfo in OC\Preview
 2014-03-03 18:52:25 +01:00
Vincent Petry
568c9cfe01 Merge pull request #7511 from owncloud/emailtemplatefix 
Fix mail template to use p() for colors
 2014-03-03 17:45:39 +01:00
Vincent Petry
25251d4bf7 Fix mail template to use p() for colors 
Now using p() instead of print_unescaped() for colors.
 2014-03-03 17:36:12 +01:00
Frank Karlitschek
7983c90fdc Merge pull request #7500 from owncloud/theme-mailtemplate 
Enable theming of the mail template header
 2014-03-03 17:22:33 +01:00
Jan-Christoph Borchardt
11054c6bb0 Merge pull request #7502 from jbtbnl/master 
Do not override button background image
 2014-03-03 16:23:19 +01:00
Vincent Petry
761251dfc5 Merge pull request #7506 from owncloud/master-update3rdpartysubmoduleforlibxmlfix 
Update 3rdparty submodule pointer to include libxml fixes
 2014-03-03 16:17:37 +01:00
Vincent Petry
9c688454df Update 3rdparty submodule pointer to include libxml fixes 2014-03-03 15:41:25 +01:00
Vincent Petry
79ae3c4527 Allow XML entity loader for MDB2 schema loader 
Forward port of 762b0d9 from stable6 to master
 2014-03-03 14:17:51 +01:00
jbtbnl
e603164517 Do not override button background image 2014-03-03 14:07:44 +01:00
Vincent Petry
84a87b96af Merge pull request #7482 from owncloud/reset-3rdparty-submodule 
Update 3rdparty submodule
 2014-03-03 13:59:21 +01:00
Jan-Christoph Borchardt
b8d0fc9494 make mail notification header color themable 2014-03-03 12:43:22 +01:00
Jan-Christoph Borchardt
eac9eebfdb compress mail notification logo 2014-03-03 12:42:58 +01:00
Jan-Christoph Borchardt
607f205bda mail template: remove off-white background color to better blend into mail client 2014-03-03 12:21:08 +01:00
Thomas Müller
dcae91429f add .scrutinizer.yml 2014-03-03 10:55:01 +01:00
Arthur Schiwon
b968eed27b remove remaining testing artefact 2014-03-03 10:20:37 +01:00
Arthur Schiwon
c7751c0795 intendetion. where did the whitespaces come from? 2014-03-03 10:20:31 +01:00
Arthur Schiwon
a8883f4ed2 LDAP: let proxy for multiple server access methods from Access 2014-03-03 10:20:25 +01:00
Morris Jobke
084050530c Merge pull request #7486 from owncloud/l10n_docstrings 
Fix some docstrings in l10n.php
 2014-03-01 10:38:48 +01:00
Thomas Tanghus
eff7667d26 Merge pull request #7433 from owncloud/config_basic_auth 
Config to disable basic_auth username checking
 2014-03-01 06:08:32 +01:00
kondou
5d5306175f Fix some docstrings in l10n.php 2014-03-01 03:38:35 +01:00
Thomas Müller
d802ae298f Update 3rdparty submodule 2014-02-28 19:11:40 +01:00
Vincent Petry
88c9ae129e Merge pull request #7480 from owncloud/sabredav-1.7.11 
Update SabreDAV to 1.7.11
 2014-02-28 19:07:31 +01:00
Thomas Müller
1dcb4f740a Update SabreDAV to 1.7.11 2014-02-28 16:55:50 +01:00
Thomas Müller
dd32091016 Merge pull request #7444 from owncloud/fix/7443 
remove unused code and fix wrong variable names - some PHPDoc updated
 2014-02-28 14:48:21 +01:00
Morris Jobke
d3866754a4 Merge pull request #7471 from owncloud/fix-css-loading 
CSS is now loaded directly instead via PHP
 2014-02-28 14:19:36 +01:00
icewind1991
8a93a2e7d5 Merge pull request #7455 from owncloud/rawlist-fileinfo 
Update rawlist to work with new fileinfo object
 2014-02-28 12:36:56 +01:00
Thomas Müller
6335f855f9 Merge pull request #7470 from owncloud/abort-cancel 
profile image: relabel technical 'Abort' to more widely used 'Cancel'
 2014-02-28 11:57:24 +01:00
Lukas Reschke
4c4bb70cb6 CSS is now loaded directly instead via PHP 
269f24cf96 was not changed in setup.php which prevented loading of CSS files in some environments (e.g. my local setup) for apps.
 2014-02-28 11:14:18 +01:00
Jan-Christoph Borchardt
e78da036c1 profile image: relabel technical 'Abort' to more widely used 'Cancel' 2014-02-28 10:09:34 +01:00
Björn Schießle
61bc76fdd6 Merge pull request #7454 from owncloud/enc_remember_fopen_mode 
[enc] remember original fopen access type in pre-proxy
 2014-02-28 09:57:58 +01:00
Vincent Petry
fefd724858 Fixed wrong field name 
This re-fixes an issue where the unencrypted size isn't updated
correctly when saving a text file in the UI multiple times.

Fixes #7467
 2014-02-27 23:53:29 +01:00
Thomas Müller
93b8aba3a1 Merge pull request #7439 from owncloud/unit-test-for-7430 
adding test for migrations on columns using keywords
 2014-02-27 21:52:46 +01:00
Raghu Nayyar
e304809612 Merge pull request #7382 from jbtbnl/master 
Remove necessity of icon class
 2014-02-27 21:11:26 +05:30
Morris Jobke
7af846e656 Merge pull request #7452 from owncloud/icon-delete-hover 
icons: automatically show delete hover instead of using explicit class
 2014-02-27 14:44:29 +01:00
Morris Jobke
49b331be39 add BMP mimetype for BMP previews 2014-02-27 14:39:16 +01:00
Bjoern Schiessle
4ace1a273d remember original fopen access type in pre-proxy because sometimes they change 
during the fopen call, e.g. 'r' becomes 'r+' if we open an URL
 2014-02-27 14:16:03 +01:00
Robin Appelman
7c92e2e3ad Update rawlist to work with new fileinfo object 2014-02-27 14:04:19 +01:00
Thomas Müller
ba4b593f84 Merge pull request #7446 from owncloud/etag_assert_fixes 
use assertSame and assertNotSame for etag checks
 2014-02-27 13:51:14 +01:00
Thomas Müller
f62b8a7896 Merge pull request #7451 from owncloud/fix-jshint 
rename config to camelcase
 2014-02-27 13:37:18 +01:00
Morris Jobke
6fe1cf7ae4 Merge pull request #7449 from owncloud/remove-input-border 
remove border from log in input fields, simpler and works better with themes
 2014-02-27 13:24:44 +01:00
Robin Appelman
8282cfff04 Cache the fileinfo in OC\Preview 2014-02-27 13:15:18 +01:00
Jan-Christoph Borchardt
58bc6aee51 icons: automatically show delete hover instead of using explicit class 2014-02-27 12:48:25 +01:00
Jörn Friedrich Dreyer
2ba6cd4e2b initialize etags of temporary storage 2014-02-27 12:44:07 +01:00
Raghu Nayyar
832f6e4e42 Merge pull request #7450 from owncloud/rename-advanced 
Installation: relabel 'Advanced' to more descriptive 'Storage & database'
 2014-02-27 16:56:28 +05:30