Jan-Christoph Borchardt
|
a9072056a0
|
Merge pull request #3990 from owncloud/size-mb
add MB indicator to size heading, fix #3987
|
2013-07-10 08:42:05 -07:00 |
Morris Jobke
|
eed516c31a
|
Merge pull request #4002 from owncloud/use_OC_in_settings_js
[settings] Use OC instead of oc to show alert at an error.
|
2013-07-10 04:55:21 -07:00 |
Jan-Christoph Borchardt
|
3fb3a7baa8
|
add MB indicator to size heading, fix #3987
|
2013-07-10 13:52:55 +02:00 |
Morris Jobke
|
01c6ca94c2
|
Merge pull request #4003 from owncloud/use_close_png_instead_of_delete_png_for_dialogs
Use close.png instead of delete.png for closing dialogs
|
2013-07-10 04:36:37 -07:00 |
Arthur Schiwon
|
5387e5c354
|
LDAP: even better check for emptiness, fixes #3815
|
2013-07-10 11:39:47 +02:00 |
Jörn Friedrich Dreyer
|
6a50848a6e
|
Merge pull request #3994 from owncloud/fix_oracle_setup
General setup fixes for Oracle
|
2013-07-10 01:02:52 -07:00 |
kondou
|
4cd87549e1
|
Close.png instead of delete.png for close dialogs
|
2013-07-10 04:39:22 +02:00 |
kondou
|
efb707a431
|
Use OC instead of oc to show alert at an error.
Related to #4001
|
2013-07-10 04:28:54 +02:00 |
Jenkins for ownCloud
|
7ec6f3bde9
|
[tx-robot] updated from transifex
|
2013-07-10 02:20:59 +02:00 |
Victor Dubiniuk
|
194ab11322
|
General fixes
|
2013-07-10 00:49:05 +03:00 |
mvn23
|
40879c6327
|
Merge pull request #3787 from mvn23/patch-1
Thanks @bartv2 and @bantu, merged and closed.
|
2013-07-09 08:21:07 -07:00 |
VicDeo
|
43755a292b
|
Merge pull request #3943 from owncloud/encode_uri_component
Add path encoding to public API.
|
2013-07-09 08:13:50 -07:00 |
Thomas Tanghus
|
9e9c323acd
|
Set path in cookie.
|
2013-07-09 16:46:35 +02:00 |
Victor Dubiniuk
|
c0b210f0d5
|
Add unit test
|
2013-07-09 17:46:11 +03:00 |
Victor Dubiniuk
|
257096f1d4
|
Encode current trashbin directory
|
2013-07-09 17:46:11 +03:00 |
Victor Dubiniuk
|
582631323a
|
Migrate to encodePath
|
2013-07-09 17:46:11 +03:00 |
Victor Dubiniuk
|
5a3fce12a4
|
Implement encodePath
|
2013-07-09 17:46:11 +03:00 |
Jan-Christoph Borchardt
|
d70d4f435e
|
apply @LukasReschke's cookie changes, hopefully finally fix #854
|
2013-07-09 15:00:36 +02:00 |
Jörn Friedrich Dreyer
|
cc0965b9bc
|
Merge pull request #3980 from owncloud/try-permissions-hook-again
Add update permissions hook to sharing
|
2013-07-09 05:40:16 -07:00 |
Jörn Friedrich Dreyer
|
5513e30752
|
Merge pull request #3920 from owncloud/Fixing_search_ie8
[ie8] Fix lazy CSS loading and missing borders in search dropdown
|
2013-07-09 05:29:18 -07:00 |
Jenkins for ownCloud
|
439cad07b5
|
[tx-robot] updated from transifex
|
2013-07-09 02:12:22 +02:00 |
Michael Gapczynski
|
4feff3456b
|
Only emit permissions hook for files and and include path
|
2013-07-08 17:28:18 -04:00 |
Thomas Müller
|
244d376a16
|
Merge pull request #3977 from owncloud/enable_oracle_in_autotests
enable oracle testing by default
|
2013-07-08 13:44:12 -07:00 |
icewind1991
|
af1c3dd4ce
|
Merge pull request #3963 from owncloud/update-logic-split
Move the upgrade logic to \OC\Updater
|
2013-07-08 12:38:39 -07:00 |
Robin Appelman
|
a0d5ba1167
|
fix typo
|
2013-07-08 21:13:31 +02:00 |
Jörn Friedrich Dreyer
|
15907f6aee
|
Merge pull request #3979 from owncloud/permissions-hook
Add update permissions hook to sharing
|
2013-07-08 09:32:10 -07:00 |
Bart Visscher
|
e7b882a4fc
|
stupid namespace
|
2013-07-08 18:29:43 +02:00 |
Bart Visscher
|
4a6803ef9d
|
Check if logger is set, also no need to return true
|
2013-07-08 18:26:11 +02:00 |
Bart Visscher
|
abe9abab99
|
Add constructor documentation
|
2013-07-08 18:01:32 +02:00 |
Jörn Friedrich Dreyer
|
301c9e1399
|
requires fixes in 3rdparty mdb2
|
2013-07-08 18:01:20 +02:00 |
Bart Visscher
|
52553c64ed
|
Merge branch 'master' into convert-oc_config
Conflicts:
lib/config.php
|
2013-07-08 17:59:50 +02:00 |
Michael Gapczynski
|
5c2a0325ba
|
Add update permissions hook to sharing
|
2013-07-08 11:40:10 -04:00 |
Robin Appelman
|
4a4e139c83
|
forward previously registerd hooks
|
2013-07-08 16:54:26 +02:00 |
Robin Appelman
|
925d09cb0e
|
add forwarding emitter for agregating multiple emitters
|
2013-07-08 16:45:19 +02:00 |
Jörn Friedrich Dreyer
|
ccce93755f
|
enable oracle testing by default
|
2013-07-08 16:42:19 +02:00 |
Thomas Müller
|
02d2e41e04
|
Merge pull request #3954 from owncloud/update_insertifnotexist_and_test
fix insertIfNotExist return value, update doc and corresponding test
|
2013-07-08 07:17:45 -07:00 |
Jan-Christoph Borchardt
|
8d8f99fbc4
|
Merge pull request #3757 from owncloud/icon-cleanup
Icon cleanup
|
2013-07-08 06:56:29 -07:00 |
Thomas Müller
|
0365d244e0
|
Merge pull request #3946 from owncloud/fixing-3942-master
handle anonymous upload to reshared folder
|
2013-07-08 02:27:21 -07:00 |
Björn Schießle
|
9b9ea7cd8e
|
Merge https://github.com/owncloud/core/pull/3827
Squashed commit of the following:
commit eed4b49cebcbcc252a75ed85097730b73213b0da
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 8 10:03:23 2013 +0200
initialize OC_Defaults only once
commit bf6f07ccc8fb87535a069ca341789a590cb187ee
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 8 10:02:48 2013 +0200
link to doc in error messages
commit ea61ee60e06ee98f2671aec1fdaff666c50f47c2
Merge: e41af3d 3c1308f
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jul 4 11:10:56 2013 +0200
Merge branch 'master' into better-messages
commit e41af3d7bad26aa5ca9ab21ec7dcbadd3cfe5d4f
Author: Björn Schießle <schiessle@owncloud.com>
Date: Thu Jul 4 11:10:41 2013 +0200
move to non-static defaults.php
commit 9e4258b1905244bdf34943a825421f041cbed43d
Author: Björn Schießle <schiessle@owncloud.com>
Date: Tue Jul 2 10:32:13 2013 +0200
no sprintf here, lets t() handle it
commit fe1df349e248667a137f70d78b04225e5b42a111
Merge: d8f6859 cb5811b
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 1 11:13:38 2013 +0200
Merge branch 'master' into better-messages
commit d8f68595df2dc0e0917d916cbde511ec5333010b
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 1 11:10:57 2013 +0200
use document base url from defaults.php
commit 6c5403748a45717125a2aa375550f05646317d72
Merge: bea6b1c 7b0e3e6
Author: Björn Schießle <schiessle@owncloud.com>
Date: Mon Jul 1 11:00:15 2013 +0200
Merge branch 'master' into better-messages
commit bea6b1c8a0968846065b9153e0a3f46a4e3245ee
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon Jun 24 16:21:12 2013 +0200
link to docs in WebDAV message, ref #3791
commit 3119b364a1094769e711283d1ce9014505f64ab9
Author: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon Jun 24 16:10:21 2013 +0200
link to docs in error messages, fix #3819
|
2013-07-08 10:07:57 +02:00 |
Jenkins for ownCloud
|
3cb4a72960
|
[tx-robot] updated from transifex
|
2013-07-08 02:09:41 +02:00 |
Jenkins for ownCloud
|
096d7674fc
|
[tx-robot] updated from transifex
|
2013-07-07 02:06:06 +02:00 |
Robin Appelman
|
9cd7ecd502
|
Updater: pass update url as argument to update check
|
2013-07-06 17:05:38 +02:00 |
Robin Appelman
|
58f473d734
|
split upgrade logic from ajax file
|
2013-07-06 17:00:00 +02:00 |
Jenkins for ownCloud
|
c8ad3df1fa
|
[tx-robot] updated from transifex
|
2013-07-06 02:08:38 +02:00 |
Thomas Müller
|
c956a08d22
|
fixing check if public share is a folder or not
|
2013-07-06 00:12:29 +02:00 |
Thomas Müller
|
98da4bf704
|
removing unused getSharedItem()
|
2013-07-06 00:04:01 +02:00 |
Thomas Müller
|
dad91c156f
|
Merge branch 'master' into fixing-3942-master
Conflicts:
apps/files/ajax/upload.php
|
2013-07-06 00:02:11 +02:00 |
Thomas Müller
|
bc1c776642
|
Merge pull request #3951 from owncloud/fixing-3936-master
get the real physical folder name for anonymous upload
|
2013-07-05 14:43:47 -07:00 |
Bart Visscher
|
ab2037ab5d
|
Only change integer type when the length is set
|
2013-07-05 22:05:16 +02:00 |
Bart Visscher
|
b8a7e97301
|
Add comment to column definition
|
2013-07-05 21:42:37 +02:00 |