]>
source.dussan.org Git - nextcloud-server.git/log
Qingping Hou [Mon, 25 Feb 2013 20:40:57 +0000 (15:40 -0500)]
add span tag to displayname on expand button
Qingping Hou [Sun, 24 Feb 2013 23:13:25 +0000 (18:13 -0500)]
update oldDisplayName value on displayName change
This patch fixes a bug that can be reproduced in following way:
1. change displayName
2. clear text in displayName input click change again
Then you will get an error and previous displayName will be restored.
Expected behavior should restore the new updated displayName.
Qingping Hou [Sun, 24 Feb 2013 23:07:35 +0000 (18:07 -0500)]
when user changes displayName, also update it on expand button
Thomas Müller [Sun, 24 Feb 2013 19:23:27 +0000 (11:23 -0800)]
Merge pull request #1881 from owncloud/safemode_check
add a safe_mode check
Jenkins for ownCloud [Sat, 23 Feb 2013 23:06:53 +0000 (00:06 +0100)]
[tx-robot] updated from transifex
Michael Gapczynski [Sat, 23 Feb 2013 22:38:29 +0000 (14:38 -0800)]
Merge pull request #1879 from owncloud/fix-webdav-quota
Don't throw insufficient storage exception if free space is unknown
Michael Gapczynski [Sat, 23 Feb 2013 21:00:50 +0000 (16:00 -0500)]
Reuse $freeSpace variable
Michael Gapczynski [Sat, 23 Feb 2013 20:37:44 +0000 (15:37 -0500)]
Don't throw insufficient storage exception if free space is unknown
Thomas Müller [Sat, 23 Feb 2013 19:39:13 +0000 (11:39 -0800)]
Merge pull request #1862 from owncloud/whitespace-cleanup
Whitespace cleanup
Jenkins for ownCloud [Fri, 22 Feb 2013 23:05:33 +0000 (00:05 +0100)]
[tx-robot] updated from transifex
Bart Visscher [Fri, 22 Feb 2013 16:21:57 +0000 (17:21 +0100)]
Whitespace fixes
Bernhard Posselt [Fri, 22 Feb 2013 15:44:24 +0000 (07:44 -0800)]
Merge pull request #1855 from owncloud/userlist_load_displaynames
Fetch displayname in userlist ajax requests. Refs #1681
Bernhard Posselt [Fri, 22 Feb 2013 15:43:13 +0000 (07:43 -0800)]
Merge pull request #1859 from owncloud/blacklist-fix
Add OC\Files\Filesystem::isFileBlacklisted
Robin Appelman [Fri, 22 Feb 2013 15:13:08 +0000 (16:13 +0100)]
Add OC\Files\Filesystem::isFileBlacklisted
Jörn Friedrich Dreyer [Fri, 22 Feb 2013 15:02:51 +0000 (07:02 -0800)]
Merge pull request #1711 from owncloud/style-cleanup
Codestyle cleanup
Thomas Tanghus [Fri, 22 Feb 2013 13:51:21 +0000 (14:51 +0100)]
Fetch displayname in userlist ajax requests. Refs #1681
blizzz [Fri, 22 Feb 2013 13:37:31 +0000 (05:37 -0800)]
Merge pull request #1854 from owncloud/fix_mount_order
Fix order of mount commands in lib/files/filesystem.php
Georg Ehrke [Fri, 22 Feb 2013 13:19:29 +0000 (14:19 +0100)]
fix order of mount commands
blizzz [Fri, 22 Feb 2013 12:54:25 +0000 (04:54 -0800)]
Merge pull request #1849 from owncloud/mount_users_home
mount users home before write/read file to it, necessary to deal with external homes [master]
Björn Schießle [Fri, 22 Feb 2013 12:15:47 +0000 (13:15 +0100)]
mount users home before write/read file to it, necessary to deal with external homes
Frank Karlitschek [Fri, 22 Feb 2013 12:02:26 +0000 (04:02 -0800)]
Merge pull request #1848 from owncloud/keep_transparency
keep transparency when resizing or cropping png/gif
Jörn Friedrich Dreyer [Fri, 22 Feb 2013 11:42:40 +0000 (12:42 +0100)]
keep transparency when resizing or cropping png/gif
Thomas Müller [Fri, 22 Feb 2013 10:14:00 +0000 (02:14 -0800)]
Merge pull request #1838 from owncloud/fix-changedisplayname-call
Fix error path in changedisplayname call
Bart Visscher [Thu, 21 Feb 2013 23:49:44 +0000 (00:49 +0100)]
Fix error path in changedisplayname call
Bart Visscher [Thu, 21 Feb 2013 23:21:06 +0000 (00:21 +0100)]
Fix review issues
Jenkins for ownCloud [Thu, 21 Feb 2013 23:08:47 +0000 (00:08 +0100)]
[tx-robot] updated from transifex
Bart Visscher [Fri, 15 Feb 2013 15:04:18 +0000 (16:04 +0100)]
Join split translated strings
Bart Visscher [Thu, 14 Feb 2013 22:29:51 +0000 (23:29 +0100)]
Style cleanup settings
Bart Visscher [Thu, 14 Feb 2013 22:19:12 +0000 (23:19 +0100)]
Style cleanup core dir
Bart Visscher [Thu, 14 Feb 2013 21:53:30 +0000 (22:53 +0100)]
Style cleanup files_versions
Bart Visscher [Thu, 14 Feb 2013 21:46:28 +0000 (22:46 +0100)]
Style cleanup files_trashbin
Bart Visscher [Thu, 14 Feb 2013 21:37:49 +0000 (22:37 +0100)]
Style cleanup files_sharing
Bernhard Posselt [Thu, 21 Feb 2013 22:07:13 +0000 (14:07 -0800)]
Merge pull request #1835 from owncloud/normalize-giant-caret
fix giant advanced caret in installation
Lukas Reschke [Thu, 21 Feb 2013 20:39:48 +0000 (12:39 -0800)]
Merge pull request #1836 from owncloud/update-version-remark
Update hint by the internal version number.
Bart Visscher [Thu, 21 Feb 2013 20:30:25 +0000 (21:30 +0100)]
Update hint by the internal version number.
So we don't repeat the 4.5 <=> 4.90 mixup
Jan-Christoph Borchardt [Thu, 21 Feb 2013 17:20:14 +0000 (18:20 +0100)]
fix giant advanced caret in installation
Frank Karlitschek [Thu, 21 Feb 2013 16:52:14 +0000 (08:52 -0800)]
Merge pull request #1830 from owncloud/fix_css_number
make number-input fields look like they should
Björn Schießle [Thu, 21 Feb 2013 15:34:22 +0000 (16:34 +0100)]
rename app to 'deleted files'
Arthur Schiwon [Thu, 21 Feb 2013 15:25:47 +0000 (16:25 +0100)]
make number-input fields look like they should
Björn Schießle [Thu, 21 Feb 2013 13:58:34 +0000 (05:58 -0800)]
Merge pull request #1812 from owncloud/add-logging-to-webdav-test-master
Enhancment to the WebDAV-Testing ...
Frank Karlitschek [Thu, 21 Feb 2013 10:09:00 +0000 (11:09 +0100)]
add a safe_mode check
Björn Schießle [Thu, 21 Feb 2013 09:09:15 +0000 (01:09 -0800)]
Merge pull request #1768 from houqp/issue_1739
bug fix for issue 1739
Jenkins for ownCloud [Wed, 20 Feb 2013 23:15:58 +0000 (00:15 +0100)]
[tx-robot] updated from transifex
Björn Schießle [Wed, 20 Feb 2013 23:03:26 +0000 (15:03 -0800)]
Merge pull request #1773 from owncloud/trash_bin_delete_selected
Trash bin delete selected
Thomas Mueller [Wed, 20 Feb 2013 22:46:15 +0000 (23:46 +0100)]
Merge branch 'master' into trash_bin_delete_selected
Thomas Mueller [Wed, 20 Feb 2013 22:11:38 +0000 (23:11 +0100)]
WebDAV-Testing:
- write the exception to the log
- in case curl is missing we should return true as well
Björn Schießle [Wed, 20 Feb 2013 21:38:14 +0000 (13:38 -0800)]
Merge pull request #1809 from owncloud/fix_ie_deletefolder
replaced for in loops with normal enumerating loops to fix #1803
Björn Schießle [Wed, 20 Feb 2013 21:32:44 +0000 (22:32 +0100)]
change for loop to make it hopefully work with IE
Bernhard Posselt [Wed, 20 Feb 2013 20:57:50 +0000 (21:57 +0100)]
replaced for in loops with normal enumerating loops to fix #1803
Bernhard Posselt [Wed, 20 Feb 2013 20:36:07 +0000 (12:36 -0800)]
Merge pull request #1806 from eMerzh/ref_1799
Add message when trouble sending email ref #1799
Brice Maron [Wed, 20 Feb 2013 20:14:55 +0000 (21:14 +0100)]
Add message when trouble sending email ref #1799
Frank Karlitschek [Wed, 20 Feb 2013 18:09:58 +0000 (19:09 +0100)]
5.0.0 beta 1
Frank Karlitschek [Wed, 20 Feb 2013 16:34:26 +0000 (08:34 -0800)]
Merge pull request #1738 from owncloud/fix_multiselect_in_settings
Extra position check for multiselect dropdown. Fix app/issues/575
Frank Karlitschek [Wed, 20 Feb 2013 16:33:57 +0000 (08:33 -0800)]
Merge pull request #1753 from owncloud/Extra_info
Ability for the action handler to get more info on the current file
Frank Karlitschek [Wed, 20 Feb 2013 16:32:36 +0000 (08:32 -0800)]
Merge pull request #1787 from maelzx/patch-1
Update apps/files_versions/js/versions.js
Björn Schießle [Wed, 20 Feb 2013 15:33:45 +0000 (16:33 +0100)]
switch to json encoded file list
Björn Schießle [Wed, 20 Feb 2013 14:17:32 +0000 (15:17 +0100)]
use "|" as delimiter instead of ";", since "|" is not allowed in file/folder names
Björn Schießle [Wed, 20 Feb 2013 11:38:37 +0000 (03:38 -0800)]
Merge pull request #1752 from schiesbn/versioning_use_new_filesystem_api
Versioning app use new filesystem api
Jan-Christoph Borchardt [Wed, 20 Feb 2013 11:20:56 +0000 (03:20 -0800)]
Merge pull request #1790 from owncloud/update_office_icons
Update office icons
Jörn Friedrich Dreyer [Wed, 20 Feb 2013 09:42:54 +0000 (10:42 +0100)]
Update office icons
maelzx [Wed, 20 Feb 2013 03:14:24 +0000 (11:14 +0800)]
Update apps/files_versions/js/versions.js
Fix "All version..." button not clickable.
Reason is Google Chrome blocking inline javascript execution.
Frank Karlitschek [Tue, 19 Feb 2013 23:18:12 +0000 (15:18 -0800)]
Merge pull request #1731 from owncloud/unknown-freespace
Give storage backends the option to define having no known free space
Jenkins for ownCloud [Tue, 19 Feb 2013 23:03:28 +0000 (00:03 +0100)]
[tx-robot] updated from transifex
Frank Karlitschek [Tue, 19 Feb 2013 18:44:58 +0000 (10:44 -0800)]
Merge pull request #1720 from owncloud/usermenu-css
fix erroneous CSS, remove obsolete selectors
Björn Schießle [Tue, 19 Feb 2013 11:38:00 +0000 (12:38 +0100)]
add timestamp to function call; fix trash.js to handle multiple delete operation at once
Björn Schießle [Tue, 19 Feb 2013 11:24:51 +0000 (12:24 +0100)]
initialize $result
Björn Schießle [Tue, 19 Feb 2013 11:16:54 +0000 (12:16 +0100)]
rebase to master
Björn Schießle [Tue, 19 Feb 2013 11:14:44 +0000 (12:14 +0100)]
change $_REQUEST to $_POST; fix check if file was successfully deleted
Björn Schießle [Tue, 19 Feb 2013 11:09:03 +0000 (03:09 -0800)]
Merge pull request #1740 from houqp/issue#1688
Bug fix for Issue#1688
Björn Schießle [Tue, 19 Feb 2013 10:50:29 +0000 (11:50 +0100)]
add missing paramenter to post request
Björn Schießle [Tue, 19 Feb 2013 10:49:41 +0000 (11:49 +0100)]
use instead of
Lukas Reschke [Tue, 19 Feb 2013 09:34:49 +0000 (01:34 -0800)]
Merge pull request #1764 from owncloud/Undelete_directory_fix
Fix for Undelete directory action
Björn Schießle [Tue, 19 Feb 2013 09:24:21 +0000 (10:24 +0100)]
allow user to delete selected files from the trash bin permanently
Björn Schießle [Tue, 19 Feb 2013 09:23:34 +0000 (10:23 +0100)]
remove obsolete variables
Thomas Müller [Tue, 19 Feb 2013 06:15:56 +0000 (22:15 -0800)]
Merge pull request #1771 from owncloud/mountconfig
JSON mount config: no pretty print
Thomas Mueller [Mon, 18 Feb 2013 23:48:38 +0000 (00:48 +0100)]
no pretty print
Jenkins for ownCloud [Mon, 18 Feb 2013 23:06:51 +0000 (00:06 +0100)]
[tx-robot] updated from transifex
Qingping Hou [Mon, 18 Feb 2013 23:05:58 +0000 (18:05 -0500)]
bug fix for issue 1739, two changes included:
* fix typo in OC_Group_Database::DisplayNamesInGroup's SQL clause
* check array_diff return value in OC_Group::displayNamesInGroups,
when there is no difference between two arrays, it will return
NULL, so we have to take care of it.
Thomas Müller [Mon, 18 Feb 2013 22:56:25 +0000 (14:56 -0800)]
Merge pull request #1728 from owncloud/mountconfig
Use json for new mount configuration files
Lukas Reschke [Mon, 18 Feb 2013 22:25:10 +0000 (14:25 -0800)]
Merge pull request #1767 from owncloud/fixing-1766-master
files_versions no longer contains a personal settings page -> remove the...
Thomas Mueller [Mon, 18 Feb 2013 22:04:22 +0000 (23:04 +0100)]
files_versions no longer contains a personal settings page -> remove the call
Victor Dubiniuk [Mon, 18 Feb 2013 20:48:08 +0000 (23:48 +0300)]
Calculate size for existing directories only
Thomas Müller [Mon, 18 Feb 2013 18:54:27 +0000 (10:54 -0800)]
Merge pull request #1762 from owncloud/user_password_fix
Fix changing user password at 'Personal' page. Ref #1693
Victor Dubiniuk [Mon, 18 Feb 2013 18:20:48 +0000 (21:20 +0300)]
Do not set password if it has't provided
Victor Dubiniuk [Mon, 18 Feb 2013 18:15:32 +0000 (21:15 +0300)]
Correct new password input name
Björn Schießle [Mon, 18 Feb 2013 17:16:19 +0000 (18:16 +0100)]
close file handler after readdir()
Frank Karlitschek [Mon, 18 Feb 2013 15:17:27 +0000 (07:17 -0800)]
Merge pull request #1724 from owncloud/long-storage-id
Cache: hash long storage ids to ensure they fit in the database
Thomas Müller [Mon, 18 Feb 2013 15:13:19 +0000 (07:13 -0800)]
Merge pull request #1759 from owncloud/redirect_fix_1737
fix redirect, use the new routing
Qingping Hou [Mon, 18 Feb 2013 14:49:50 +0000 (09:49 -0500)]
check filename and timestamp in Trashbin's file_exists method
Robin Appelman [Mon, 18 Feb 2013 14:13:25 +0000 (15:13 +0100)]
Merge branch 'mountconfig' of github.com:owncloud/core into mountconfig
Robin Appelman [Mon, 18 Feb 2013 14:12:15 +0000 (15:12 +0100)]
merge master into mountconfig
Björn Schießle [Mon, 18 Feb 2013 13:38:29 +0000 (14:38 +0100)]
fix redirect, use the new routing
Frank Karlitschek [Mon, 18 Feb 2013 12:37:48 +0000 (04:37 -0800)]
Merge pull request #1751 from owncloud/sanitizeHTML
Sanitize html
VicDeo [Mon, 18 Feb 2013 10:22:43 +0000 (13:22 +0300)]
Add Ability to the app to detect more details on the file
Björn Schießle [Mon, 18 Feb 2013 10:19:40 +0000 (11:19 +0100)]
fix getUidAndFilename() function
Lukas Reschke [Mon, 18 Feb 2013 07:11:59 +0000 (08:11 +0100)]
Sanitize HTML
Lukas Reschke [Mon, 18 Feb 2013 07:04:35 +0000 (08:04 +0100)]
Sanitize user input
Jenkins for ownCloud [Sun, 17 Feb 2013 23:06:45 +0000 (00:06 +0100)]
[tx-robot] updated from transifex
Thomas Müller [Sun, 17 Feb 2013 19:53:51 +0000 (11:53 -0800)]
Merge pull request #1709 from owncloud/style-cleanup-files_external
Style cleanup files_external
Thomas Müller [Sun, 17 Feb 2013 19:47:35 +0000 (11:47 -0800)]
Merge pull request #1719 from owncloud/fixing-1659-master
Fixing 1659 master