]>
source.dussan.org Git - nextcloud-server.git/log
Frank Karlitschek [Sat, 28 Sep 2013 15:43:14 +0000 (17:43 +0200)]
prepare the updater for the new update channels
Morris Jobke [Tue, 27 Aug 2013 21:21:34 +0000 (14:21 -0700)]
Merge pull request #4572 from NCTU-NBA/pr-checkbox-displacement
Fix "select all" checkbox displacement when checked, fix #4571
Arthur Schiwon [Tue, 27 Aug 2013 11:47:31 +0000 (13:47 +0200)]
LDAP: case insensitive replace for more robustness
Jenkins for ownCloud [Tue, 27 Aug 2013 15:23:18 +0000 (11:23 -0400)]
[tx-robot] updated from transifex
Morris Jobke [Tue, 27 Aug 2013 15:07:47 +0000 (08:07 -0700)]
Merge pull request #3208 from owncloud/api_capabilities_quota
Add the quota to the external API for use with the mobile and desktop clients
Morris Jobke [Tue, 27 Aug 2013 14:07:25 +0000 (16:07 +0200)]
add documentation
Björn Schießle [Tue, 27 Aug 2013 13:40:39 +0000 (06:40 -0700)]
Merge pull request #4596 from owncloud/fix_isEmpty_trash
trash bin: fix isEmpty() function
Tom Needham [Wed, 1 May 2013 17:26:02 +0000 (18:26 +0100)]
Code style
Tom Needham [Wed, 1 May 2013 17:20:46 +0000 (18:20 +0100)]
Add quota to core api
Bjoern Schiessle [Tue, 27 Aug 2013 12:39:43 +0000 (14:39 +0200)]
the trash bin can also contain empty files. Don't use the trash bin size as indicator to decide if the trash bin is empty or not
Jörn Friedrich Dreyer [Tue, 27 Aug 2013 11:26:51 +0000 (04:26 -0700)]
Merge pull request #4348 from owncloud/fixing-4343-master
fixes #4343
blizzz [Tue, 27 Aug 2013 10:47:56 +0000 (03:47 -0700)]
Merge pull request #4507 from owncloud/existingusersfromgroup
return only existing users in group
Morris Jobke [Tue, 27 Aug 2013 09:00:48 +0000 (02:00 -0700)]
Merge pull request #4586 from owncloud/fixing-3431-master
kill zh_CN.GB2312
Thomas Müller [Tue, 27 Aug 2013 08:49:10 +0000 (10:49 +0200)]
revert debugging code which accidentially entered this pull request
Morris Jobke [Tue, 27 Aug 2013 08:40:50 +0000 (01:40 -0700)]
Merge pull request #4585 from owncloud/fixing-4385-master
Fixing 4385 master
Morris Jobke [Tue, 27 Aug 2013 08:26:16 +0000 (01:26 -0700)]
Merge pull request #4584 from owncloud/fixing-4575-master
adding translations to update events
Thomas Müller [Mon, 26 Aug 2013 23:27:05 +0000 (01:27 +0200)]
kill zh_CN.GB2312
Thomas Müller [Mon, 26 Aug 2013 22:59:58 +0000 (00:59 +0200)]
storage information is path specific
Thomas Müller [Mon, 26 Aug 2013 22:57:28 +0000 (00:57 +0200)]
webdav quota now displays the same values as the web interface does
Thomas Müller [Mon, 26 Aug 2013 22:26:44 +0000 (00:26 +0200)]
adding translations to update events
Thomas Müller [Mon, 26 Aug 2013 18:21:16 +0000 (20:21 +0200)]
lacy initialization of fileView - in case basic auth is used FileSystem is not yet initialized during the initialize() call
Morris Jobke [Mon, 26 Aug 2013 16:04:49 +0000 (18:04 +0200)]
Merge branch 'xsendfile_complete_zip_fix' of github.com:riso/owncloud-core into riso-xsendfile_complete_zip_fix from pull request #3307
Conflicts:
lib/helper.php
Arthur Schiwon [Mon, 26 Aug 2013 15:46:31 +0000 (17:46 +0200)]
consolidate validity check for users in group class
Bart Visscher [Mon, 26 Aug 2013 11:07:18 +0000 (04:07 -0700)]
Merge pull request #4292 from owncloud/add_appconfig_unittest
Add \OC_Appconfig Unittest
Morris Jobke [Mon, 26 Aug 2013 09:59:31 +0000 (02:59 -0700)]
Merge pull request #4281 from owncloud/ie8-multiselect
Better ie8 multiselect
Morris Jobke [Mon, 26 Aug 2013 09:19:32 +0000 (02:19 -0700)]
Merge pull request #4542 from owncloud/fixing-4504-master
remove duplicate code
Morris Jobke [Mon, 26 Aug 2013 07:47:34 +0000 (00:47 -0700)]
Merge pull request #4519 from owncloud/style-fixes
fix minor style issue in the app navigation
Morris Jobke [Mon, 26 Aug 2013 07:44:21 +0000 (09:44 +0200)]
fix reviewers concerns
Pellaeon Lin [Mon, 26 Aug 2013 02:57:14 +0000 (10:57 +0800)]
Fix "select all" checkbox displacement when checked
Jenkins for ownCloud [Sun, 25 Aug 2013 23:21:52 +0000 (19:21 -0400)]
[tx-robot] updated from transifex
Christopher [Sun, 25 Aug 2013 18:56:56 +0000 (11:56 -0700)]
Merge pull request #4331 from owncloud/improve_app-management
Improve app-management
Jenkins for ownCloud [Sat, 24 Aug 2013 00:17:08 +0000 (20:17 -0400)]
[tx-robot] updated from transifex
Thomas Müller [Thu, 22 Aug 2013 15:59:39 +0000 (17:59 +0200)]
Merge branch 'master' into fixing-4343-master
Conflicts:
lib/connector/sabre/quotaplugin.php
Jenkins for ownCloud [Thu, 22 Aug 2013 14:37:23 +0000 (10:37 -0400)]
[tx-robot] updated from transifex
Thomas Müller [Thu, 22 Aug 2013 08:50:31 +0000 (01:50 -0700)]
Merge pull request #4537 from owncloud/no-realpath
Do not use realpath() on includes.
Thomas Müller [Wed, 21 Aug 2013 22:18:14 +0000 (00:18 +0200)]
Merge branch 'master' of github.com:owncloud/core
Thomas Müller [Wed, 21 Aug 2013 20:41:34 +0000 (22:41 +0200)]
additional readdir check in mappedlocal
Thomas Müller [Wed, 21 Aug 2013 22:09:43 +0000 (00:09 +0200)]
remove duplicate code
Arthur Schiwon [Sat, 17 Aug 2013 16:45:36 +0000 (18:45 +0200)]
Sharing: only determine path root if owner is available
Arthur Schiwon [Sat, 17 Aug 2013 15:55:46 +0000 (17:55 +0200)]
LDAP: fix wrong hook name
kondou [Wed, 21 Aug 2013 17:20:25 +0000 (19:20 +0200)]
Merge branch 'master' into improve_app-management
Conflicts:
settings/js/apps.js
Jenkins for ownCloud [Wed, 21 Aug 2013 12:14:27 +0000 (08:14 -0400)]
[tx-robot] updated from transifex
Andreas Fischer [Wed, 21 Aug 2013 08:59:31 +0000 (10:59 +0200)]
Use __DIR__ instead of dirname(__FILE__).
This is possible because we require PHP 5.3 or higher.
Andreas Fischer [Wed, 21 Aug 2013 08:53:18 +0000 (10:53 +0200)]
Also remove other unnecessary realpath() calls.
Andreas Fischer [Wed, 21 Aug 2013 08:52:22 +0000 (10:52 +0200)]
Do not use realpath() on includes.
If the file does not exist, realpath() returns false and "include false;"
produces "Failed opening '' for inclusion" which is a useless error message.
'include' works just fine with symlinks, "./" and "../".
Christopher [Tue, 20 Aug 2013 19:45:10 +0000 (12:45 -0700)]
Merge pull request #4262 from owncloud/fix_jslint_kondou
Fix some JSLint warnings
Morris Jobke [Tue, 20 Aug 2013 09:49:48 +0000 (02:49 -0700)]
Merge pull request #4447 from owncloud/fix_4351_master
Use JSON to send/receive group data.
Thomas Müller [Tue, 20 Aug 2013 08:17:25 +0000 (01:17 -0700)]
Merge pull request #4512 from owncloud/readdir-strict-equals
use strict equals in readdir loops to prevent issues with '0' files
Jenkins for ownCloud [Mon, 19 Aug 2013 19:14:38 +0000 (15:14 -0400)]
[tx-robot] updated from transifex
Georg Ehrke [Mon, 19 Aug 2013 15:30:56 +0000 (17:30 +0200)]
Merge branch 'master' into readdir-strict-equals
Arthur Schiwon [Mon, 19 Aug 2013 13:53:20 +0000 (15:53 +0200)]
no assoc index here, makes tests pass again
Morris Jobke [Mon, 19 Aug 2013 13:42:51 +0000 (15:42 +0200)]
fix minor style issue in the app navigation
Thomas Müller [Mon, 19 Aug 2013 12:13:20 +0000 (05:13 -0700)]
Merge pull request #4510 from owncloud/f_e_webdav_urlencoding
Fix files_external webdav up and download when path contains ' '
icewind1991 [Mon, 19 Aug 2013 10:38:55 +0000 (03:38 -0700)]
Merge pull request #4467 from owncloud/storage-wrapper-quota
Move quota logic from filesystem proxy to storage wrapper
Robin Appelman [Mon, 19 Aug 2013 10:04:53 +0000 (12:04 +0200)]
use strict equals in readdir loops to prevent issues with '0' files
Arthur Schiwon [Sun, 18 Aug 2013 15:30:16 +0000 (17:30 +0200)]
return only existing users in group
Jörn Friedrich Dreyer [Mon, 19 Aug 2013 09:09:55 +0000 (11:09 +0200)]
replace ' ' with '%20' in urls for curl
Morris Jobke [Mon, 19 Aug 2013 08:54:54 +0000 (01:54 -0700)]
Merge pull request #4509 from owncloud/add-odf-templates-master
adding file templates for ods, odt and odp
Thomas Müller [Sun, 18 Aug 2013 19:11:11 +0000 (21:11 +0200)]
adding file templates for ods, odt and odp
Björn Schießle [Sun, 18 Aug 2013 16:51:48 +0000 (09:51 -0700)]
Merge pull request #4239 from owncloud/decrypt_files_again
Enable user to decrypt files again after encryption app was disabled
Christopher [Sun, 18 Aug 2013 16:30:47 +0000 (09:30 -0700)]
Merge pull request #4498 from owncloud/uploadprogress-near-uploadbutton
move upload progress bar near upload button, more contextual
kondou [Sun, 18 Aug 2013 15:37:22 +0000 (17:37 +0200)]
Move .errormsg from settings-css to .warning in core. Reusable!
Kondou [Sun, 18 Aug 2013 14:16:15 +0000 (07:16 -0700)]
Merge pull request #4497 from owncloud/newlines_at_eof_kondou
Add newlines at the end of files
Thomas Tanghus [Sun, 18 Aug 2013 13:53:52 +0000 (15:53 +0200)]
Port DAV groupMemberSet fix to master #4458
Kondou [Sun, 18 Aug 2013 13:46:48 +0000 (06:46 -0700)]
Merge pull request #4496 from owncloud/fixing-error-page-layout-master
fixing error page layout
kondou [Sun, 18 Aug 2013 12:49:11 +0000 (14:49 +0200)]
Use appitem instead of always recreating a jquery object
Also fix some wrong data storages
kondou [Sun, 18 Aug 2013 11:49:34 +0000 (13:49 +0200)]
Don't use an alert for displaying app-mgmt-errors
Rather display a dominant div and mark the problematic app in the applist.
Fix #305
Markus Goetz [Sun, 18 Aug 2013 10:32:13 +0000 (03:32 -0700)]
Merge pull request #4485 from guruz/class_autoloader_optimization
Class Auto Loader: Cache paths in APC
Markus Goetz [Sat, 17 Aug 2013 14:01:37 +0000 (16:01 +0200)]
Class Auto Loader: Cache paths in APC
Using benchmark_single.php (from administration repo) I can
measure a speed improvement of 5% to 20% loading the /index.php
when logged in. (when using APC and php-fpm).
Bart Visscher [Sun, 18 Aug 2013 10:26:35 +0000 (03:26 -0700)]
Merge pull request #4483 from owncloud/compare-true-false
Compare result are already true/false
kondou [Sun, 18 Aug 2013 10:15:22 +0000 (12:15 +0200)]
Merge branch 'master' into improve_app-management
Bart Visscher [Sun, 18 Aug 2013 09:50:41 +0000 (02:50 -0700)]
Merge pull request #4486 from owncloud/ldap_adjust_cache
LDAP: use memcache if available
Robin Appelman [Sun, 18 Aug 2013 09:34:56 +0000 (11:34 +0200)]
merge master in storage-wrapper-quota
Bjoern Schiessle [Sun, 18 Aug 2013 09:31:25 +0000 (11:31 +0200)]
revert changes to 3rdparty submodule reference
Jan-Christoph Borchardt [Sun, 18 Aug 2013 09:27:51 +0000 (11:27 +0200)]
remove unneeded extra ID selectors
Bjoern Schiessle [Sun, 18 Aug 2013 09:21:01 +0000 (11:21 +0200)]
don't change the etags if a file gets encrypted/decrypted to avoid that the sync client downloads all files again
Jan-Christoph Borchardt [Sun, 18 Aug 2013 09:18:16 +0000 (11:18 +0200)]
move upload progress bar near upload button, more contextual
Owen Winkler [Sun, 18 Aug 2013 09:18:04 +0000 (02:18 -0700)]
Merge pull request #4493 from owncloud/fixing-initL10n-master
fixing undefined js error
Owen Winkler [Sun, 18 Aug 2013 09:17:28 +0000 (05:17 -0400)]
Fixed inconsistent spacing.
kondou [Sun, 18 Aug 2013 09:02:08 +0000 (11:02 +0200)]
Add _many_ newlines at the end of files
Owen Winkler [Sun, 18 Aug 2013 09:03:20 +0000 (05:03 -0400)]
Break long lines into smaller ones.
Jan-Christoph Borchardt [Sun, 18 Aug 2013 08:52:51 +0000 (01:52 -0700)]
Merge pull request #4426 from owncloud/ldap_settings_design
Ldap settings design
Thomas Müller [Sun, 18 Aug 2013 08:30:21 +0000 (10:30 +0200)]
fixing error page layout
kondou [Sat, 17 Aug 2013 22:38:52 +0000 (00:38 +0200)]
Merge branch 'master' into fix_jslint_kondou
Conflicts:
apps/files/js/file-upload.js
Andreas Fischer [Sat, 17 Aug 2013 21:41:37 +0000 (23:41 +0200)]
Use boolean casting for bitwise and result.
Andreas Fischer [Sat, 17 Aug 2013 21:39:26 +0000 (23:39 +0200)]
Add trailing comma for all touched array lines.
Andreas Fischer [Sat, 17 Aug 2013 21:38:26 +0000 (23:38 +0200)]
Fix spacing of all touched lines.
Thomas Müller [Sat, 17 Aug 2013 17:24:06 +0000 (19:24 +0200)]
fixing undefined js error
Thomas Müller [Sat, 17 Aug 2013 15:42:49 +0000 (08:42 -0700)]
Merge pull request #4339 from owncloud/mimetype-defaults
Add the option to provide templates for newly created files
Arthur Schiwon [Sat, 17 Aug 2013 15:22:54 +0000 (17:22 +0200)]
LDAP: use memcache if available
Morris Jobke [Sat, 17 Aug 2013 15:09:07 +0000 (08:09 -0700)]
Merge pull request #4427 from owncloud/fix_4425
use OC files API to create missing directory
Kondou [Sat, 17 Aug 2013 13:58:34 +0000 (06:58 -0700)]
Merge pull request #4482 from owncloud/remove_cancel_button_filepicker
Remove cancel button from filepicker
Bjoern Schiessle [Sat, 17 Aug 2013 11:49:42 +0000 (13:49 +0200)]
switched to dirname()
Bjoern Schiessle [Sat, 17 Aug 2013 11:46:33 +0000 (13:46 +0200)]
added missing parameter documentation
Morris Jobke [Sat, 17 Aug 2013 11:37:49 +0000 (04:37 -0700)]
Merge pull request #4475 from owncloud/brighter-font-color
change font on login/install page from black to white
Björn Schießle [Sat, 17 Aug 2013 11:37:09 +0000 (04:37 -0700)]
Merge pull request #4481 from owncloud/fix_versioning_size_check
first check if file exists before checking the files size
Bjoern Schiessle [Sat, 17 Aug 2013 11:28:35 +0000 (13:28 +0200)]
added createMissingDirectories() method
Bjoern Schiessle [Sat, 17 Aug 2013 11:15:22 +0000 (13:15 +0200)]
Merge branch 'master' into decrypt_files_again
Conflicts:
apps/files_encryption/tests/keymanager.php
Björn Schießle [Sat, 17 Aug 2013 11:10:15 +0000 (04:10 -0700)]
Merge pull request #4352 from owncloud/encryption_clean_up
crypt.php clean up
Bart Visscher [Sat, 17 Aug 2013 10:58:10 +0000 (12:58 +0200)]
Compare result are already true/false