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

8611 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jenkins for ownCloud
6832dddf39 [tx-robot] updated from transifex 2013-01-25 00:05:56 +01:00
Lukas Reschke
48e6ce7c56 Merge pull request #1291 from owncloud/drop-simpletest-compatibility-master 
drop SimpleTest compatibility
 2013-01-24 08:06:39 -08:00
Thomas Mueller
ef88ceba8c drop SimpleTest compatibility 2013-01-24 16:47:17 +01:00
Thomas Müller
1dac2ba496 Merge pull request #1286 from owncloud/ocs_api 
Check that external api methods return instances of OC_OCS_Result
 2013-01-24 02:37:40 -08:00
Lukas Reschke
f9a9fc5670 Merge pull request #1265 from j-ed/master 
add additional mail_smtp.. parameters to fix possible SMTP connection problems.
 2013-01-24 00:11:03 -08:00
Tom Needham
8f9d3cd01d Code style update 2013-01-23 23:39:29 +00:00
Jenkins for ownCloud
3ff32eba25 [tx-robot] updated from transifex 2013-01-24 00:07:38 +01:00
Jenkins for ownCloud
c986dbe573 [tx-robot] updated from transifex 2013-01-23 00:06:18 +01:00
Michael Gapczynski
9eecb91338 Merge pull request #1113 from owncloud/fix-issue-1085 
Fix rendering of database connection error page
 2013-01-22 14:38:44 -08:00
Thomas Müller
ec8609fa21 Merge pull request #1259 from TheSFReader/master 
Add two specific mimetype extensions (ebooks): for epub and mobi files
 2013-01-22 14:06:50 -08:00
j-ed
dcda792fbc Update config/config.sample.php 
fixed an other typo.
 2013-01-22 21:42:39 +01:00
j-ed
dfa5f2de4d Update config/config.sample.php 
Fixed type in line 70. Thank you for pointing me to that typo.
 2013-01-22 21:33:01 +01:00
icewind1991
12e286b21c Merge pull request #1237 from owncloud/fix-template-tests 
Remove unnecessary ob_end_clean() from template tests
 2013-01-22 11:12:40 -08:00
Sam Tuke
c18aec56e2 Merge pull request #1105 from owncloud/files_encryption 
Files encryption
 2013-01-22 09:51:19 -08:00
Sam Tuke
aa648fca75 Merge branch 'master' into files_encryption 
Conflicts:
	apps/files_encryption/templates/settings.php
 2013-01-22 17:31:05 +00:00
Sam Tuke
ca454f0228 Removed depreciated file 2013-01-22 17:15:51 +00:00
Sam Tuke
47592657d7 Added localisation for encryption settings 2013-01-22 17:15:03 +00:00
Sam Tuke
619780a67d Merge branch 'master' into files_encryption 2013-01-22 16:50:20 +00:00
j-ed
9c069530cb Update config/config.sample.php 
Added three additional mail_smtp.. parameters.
- mail_smtpdebug - enable debug messages to analyse SMTP problems.
- mail_smtptimeout - set SMTP timeout which is set to 10s by
  default and this is sometimes to short especially if a malware/
  spam scanner is used.
- mail_smtpsecure - force secure SMTP connections.
 2013-01-22 14:24:00 +01:00
j-ed
df6ba6955d Update lib/mail.php 
Added three additional mail_smtp.. parameters.
- mail_smtpdebug - enable debug messages to analyse SMTP problems.
- mail_smtptimeout - set SMTP timeout which is set to 10s by
  default and this is sometimes to short especially if a malware/
  spam scanner is used.
- mail_smtpsecure - force secure SMTP connections.
 2013-01-22 14:13:24 +01:00
Michael Gapczynski
5136f6d818 Make database connection error messages less verbose 2013-01-21 22:53:32 -05:00
icewind1991
dd40b691ee Merge pull request #1255 from owncloud/leftcontent_fix 
Fix scrolling of leftcontent
 2013-01-21 15:18:38 -08:00
Thomas Mueller
d8d812a91e enable unittesting on appframework and apptemplateadvanced 2013-01-21 23:19:17 +01:00
Robin Appelman
8817b603d7 Fix scrolling of leftcontent 2013-01-21 18:29:18 +01:00
Thomas Mueller
d58cee2f76 returning http status code 503 in case connecting to the database failed 2013-01-21 14:57:33 +01:00
Jenkins for ownCloud
aede26d996 [tx-robot] updated from transifex 2013-01-21 00:05:34 +01:00
Thomas Müller
b0716ba0e0 Merge pull request #1247 from owncloud/clear-queries-cache-on-schema-change-master 
cached queries need to be reset on schema change because they become inv...
 2013-01-20 14:00:15 -08:00
Thomas Mueller
dea77b7610 cached queries need to be reset on schema change because they become invalid 
fixes: https://github.com/owncloud/apps/issues/468
 2013-01-20 22:46:26 +01:00
Michael Gapczynski
68272fa253 Remove unnecessary ob_end_clean() from template tests 2013-01-19 20:28:45 -05:00
Jenkins for ownCloud
ebc0c4b85b [tx-robot] updated from transifex 2013-01-20 00:06:40 +01:00
Lukas Reschke
10a9ddd9b2 Merge pull request #1233 from owncloud/visualphpunit 
Add listener for VisualPHPUnit
 2013-01-19 11:25:31 -08:00
Lukas Reschke
8daefd00fb Sanitize the exception 2013-01-19 19:57:17 +01:00
Lukas Reschke
42b924da0e Also replace the backslash with a minus 
For Windows systems
 2013-01-19 19:47:26 +01:00
Bernhard Posselt
f1939866f3 Merge pull request #1214 from Raydiation/master 
Load Classpaths of apps before appinfo/routes.php
 2013-01-19 09:44:48 -08:00
Lukas Reschke
53b95cb8fd Merge pull request #1230 from owncloud/remove-unused-autocomplete.php 
Remove uneeded file
 2013-01-19 05:56:27 -08:00
Jan-Christoph Borchardt
ae244972cb Merge pull request #1228 from owncloud/generating_zip_message 
Make the ZIP download information friendlier
 2013-01-19 04:33:39 -08:00
Lukas Reschke
02bd8dd45a Change the second part of the notification 2013-01-19 13:12:27 +01:00
Michael Gapczynski
bc8957a195 Add listener for VisualPHPUnit 2013-01-18 23:03:53 -05:00
Jenkins for ownCloud
a17ca3a69a [tx-robot] updated from transifex 2013-01-19 00:05:38 +01:00
Lukas Reschke
f447e6469f Remove uneeded file 
I don't saw any usage of this file through the code, I assume it can
safely be removed.
 2013-01-18 23:07:11 +01:00
Thomas Müller
31cc9aa80d Merge pull request #986 from owncloud/fixing-784-master 
the maximum upload size is now part of the response of the upload and de...
 2013-01-18 14:06:00 -08:00
Lukas Reschke
ad57db3e87 Make the message friendlier 2013-01-18 22:35:26 +01:00
Lukas Reschke
edf3572835 Merge pull request #1224 from davidgumberg/patch-2 
Typo fix (comment) /lib/base.php
 2013-01-18 12:33:15 -08:00
Thomas Mueller
5ff29b4348 fixing indent 2013-01-18 20:09:03 +01:00
davidgumberg
487e401361 Typo fix (comment) /lib/base.php 2013-01-18 10:52:29 -08:00
Bart Visscher
9ffd4197ae Fix wrong word in comment 2013-01-18 16:38:40 +01:00
Björn Schießle
d2c5f9bec7 fix error message, add "appid" to the output to know which app caused the error if OC_App::getStorage() fails. 
Port of approved patch for stable45: https://github.com/owncloud/core/pull/1222
 2013-01-18 15:14:42 +01:00
Thomas Müller
0ed635240a Merge pull request #1205 from owncloud/ocs_api 
Return 401 headers when trying to access a restricted api call
 2013-01-18 05:52:51 -08:00
Thomas Müller
5df57e4ada Merge pull request #1181 from owncloud/return-503-in-maintenance 
in case of maintenance the error page returns http status 503.
 2013-01-18 04:02:03 -08:00
Jenkins for ownCloud
824fcf6624 [tx-robot] updated from transifex 2013-01-18 00:04:36 +01:00