Morris Jobke
|
47058b1904
|
Merge pull request #3932 from owncloud/fix_label_position
fix position of 'user shared the folder foldername with you' label
|
2013-07-04 11:03:42 -07:00 |
VicDeo
|
f67fc78531
|
Merge pull request #3899 from owncloud/encryption_check_php_version
check php version, the encryption app needs php >= 5.3.3
|
2013-07-04 06:53:17 -07:00 |
Björn Schießle
|
f30dd1557e
|
more verbose error message
|
2013-07-04 14:50:07 +02:00 |
Kondou
|
63c83ff50b
|
Merge pull request #3914 from owncloud/wrong-pw_for_share-with-pw
Add a "Wrong password." message, if the password for the public share was wrong.
|
2013-07-04 03:12:51 -07:00 |
Björn Schießle
|
5f2378be5b
|
revert changes which where introduced by accident during merge 23cc69b816
|
2013-07-04 12:06:36 +02:00 |
Georg Ehrke
|
8d59893e90
|
fix position of 'user shared the folder foldername with you' label
|
2013-07-04 10:32:26 +02:00 |
Björn Schießle
|
3c1308fb6d
|
eddition string should be empty by default
|
2013-07-04 10:12:07 +02:00 |
Björn Schießle
|
6cfa016c39
|
add public api
|
2013-07-04 10:11:55 +02:00 |
Björn Schießle
|
3c691c9ec9
|
move to non-static OC_Defaults
Conflicts:
lib/mail.php
|
2013-07-04 10:11:16 +02:00 |
Björn Schießle
|
d46e62886a
|
Add init funtion to OC_Defaults to be able to wrap translatable strings
|
2013-07-04 10:09:28 +02:00 |
Jenkins for ownCloud
|
51cfacd789
|
[tx-robot] updated from transifex
|
2013-07-04 09:33:58 +02:00 |
Bart Visscher
|
20be58bfdc
|
Merge pull request #3888 from owncloud/ocs_api_fixes
Ocs api fixes
|
2013-07-03 12:33:04 -07:00 |
Victor Dubiniuk
|
a20f7f1d67
|
Do not add groups if user has no groups
|
2013-07-03 22:06:09 +03:00 |
kondou
|
65bcedfbbe
|
Use better wording.
|
2013-07-03 20:13:10 +02:00 |
kondou
|
aa7d8edd14
|
Suppress warning in setup if config doesn't exist
|
2013-07-03 16:00:23 +02:00 |
Michael Gapczynski
|
33e1ced53c
|
Merge pull request #3911 from owncloud/fixing-unittests-master
rename can cause mtime change - invalid assert
|
2013-07-03 06:19:56 -07:00 |
Morris Jobke
|
56e91aa7b3
|
Merge pull request #3915 from owncloud/summary_as_last_filelist_entry
Show a summary as the last filelist entry
|
2013-07-03 04:17:17 -07:00 |
Björn Schießle
|
690323092e
|
don't run hooks for .part files
|
2013-07-03 10:11:50 +02:00 |
Björn Schießle
|
04e4d9580f
|
if a part file gets renamed to a real file, that this was the second step of a write operation, hence emit a write signal
|
2013-07-03 10:11:37 +02:00 |
Jenkins for ownCloud
|
811cf02675
|
[tx-robot] updated from transifex
|
2013-07-03 02:04:16 +02:00 |
Björn Schießle
|
4c1820a2a1
|
Merge pull request #3858 from owncloud/more_ssl_error_messages
add openssl_error_string() output to the owncloud.log
|
2013-07-02 07:58:22 -07:00 |
Björn Schießle
|
4d4484fac1
|
Merge pull request #3870 from owncloud/reset_migration_status
introduce pre-disable-app hook and first usage in files_encryption
|
2013-07-02 07:26:48 -07:00 |
Jenkins for ownCloud
|
cec8384b1a
|
[tx-robot] updated from transifex
|
2013-07-02 15:35:55 +02:00 |
Björn Schießle
|
3fc5b34247
|
Merge branch 'master' into encryption_check_php_version
Conflicts:
apps/files_encryption/files/error.php
|
2013-07-02 13:54:31 +02:00 |
Björn Schießle
|
38ed00398f
|
Merge branch 'encryption_check_php_version' of github.com:owncloud/core into encryption_check_php_version
|
2013-07-02 13:49:49 +02:00 |
kondou
|
063b0a2d17
|
Don't escape filesize (can contain a '<')
|
2013-07-02 13:09:07 +02:00 |
Björn Schießle
|
40e6ede6a2
|
improved error message
|
2013-07-02 10:14:33 +02:00 |
Björn Schießle
|
29dd7eda2d
|
improved error message
|
2013-07-02 10:11:42 +02:00 |
kondou
|
b1d0de95a9
|
Show a summary as the last filelist entry
Fix #993
|
2013-07-02 04:28:52 +02:00 |
kondou
|
2c4a9e0776
|
Add a "Wrong password." message, if the password
for the public share was wrong.
Fix #2725
|
2013-07-02 03:16:42 +02:00 |
Thomas Müller
|
fbdf46b76e
|
Merge pull request #3748 from owncloud/fixing-3740-master
in case $_SERVER['HTTP_HOST']) is not set let's return localhost - bette...
|
2013-07-01 15:08:08 -07:00 |
Thomas Müller
|
7d7a2ce317
|
use $_SERVER['SERVER_NAME'] in case $_SERVER['HTTP_HOST'] is not set
|
2013-07-01 23:51:43 +02:00 |
Thomas Müller
|
c777026506
|
Merge pull request #3775 from owncloud/test_fixes_for_dbschema
use executeAudited, add table name to assert message, skip schema changi...
|
2013-07-01 14:38:28 -07:00 |
Thomas Müller
|
bf901eb52f
|
Merge pull request #3793 from owncloud/remove_unnecessary_exception_catch_block
remove unnecessary try catch blocks
|
2013-07-01 14:37:09 -07:00 |
Thomas Müller
|
b4f7a88788
|
rename can cause mtime change - invalid assert
|
2013-07-01 22:02:21 +02:00 |
Thomas Müller
|
5fff4e0d08
|
Merge pull request #3903 from owncloud/nonpublic-uploading
Fix upload regressions
|
2013-07-01 12:35:32 -07:00 |
Thomas Müller
|
3b1018ec00
|
no ?> at the end of a file
missing .
|
2013-07-01 21:13:04 +02:00 |
Thomas Müller
|
a7f2563990
|
typo
|
2013-07-01 21:12:21 +02:00 |
Thomas Müller
|
a20e9dee89
|
Merge pull request #3894 from owncloud/ie8_compatibility_fixes
Ie8 compatibility fixes
|
2013-07-01 11:57:29 -07:00 |
Björn Schießle
|
d5c4854708
|
cast result to bool
|
2013-07-01 17:18:16 +02:00 |
Robin Appelman
|
492c0571a0
|
fix detection of public upload in filelist.js
|
2013-07-01 15:47:40 +02:00 |
Robin Appelman
|
86342224da
|
fix uploading when ['dirtoken'] is not set
|
2013-07-01 15:39:11 +02:00 |
Robin Appelman
|
e55ed10b0d
|
code style
|
2013-07-01 15:37:52 +02:00 |
Björn Schießle
|
9512382ae0
|
fix error string
|
2013-07-01 12:24:21 +02:00 |
Björn Schießle
|
16a719173f
|
add correct php version
|
2013-07-01 12:23:26 +02:00 |
Björn Schießle
|
adcee5b695
|
check php version, the encryption app needs php >= 5.3.3
|
2013-07-01 12:16:36 +02:00 |
Björn Schießle
|
cb5811bcf5
|
backport from pull request #3863
|
2013-07-01 11:12:18 +02:00 |
Björn Schießle
|
7b0e3e6303
|
Merge branch 'master' of github.com:owncloud/core
|
2013-07-01 10:48:58 +02:00 |
Björn Schießle
|
d8b3aee24e
|
set default logo claim to ''
|
2013-07-01 10:48:26 +02:00 |
Björn Schießle
|
d97d00fe0f
|
add logo claim to defaults.php
|
2013-07-01 10:48:13 +02:00 |