]>
source.dussan.org Git - nextcloud-server.git/log
Lukas Reschke [Mon, 25 Feb 2013 20:53:23 +0000 (12:53 -0800)]
Merge pull request #1839 from owncloud/no_recursive_object_walking
Don't walk objects with array_walk_recursive()
Thomas Müller [Mon, 25 Feb 2013 20:50:32 +0000 (12:50 -0800)]
Merge pull request #1706 from owncloud/master-sqlserver
Microsoft SQL-Server support for ownCloud!
Frank Karlitschek [Mon, 25 Feb 2013 19:00:40 +0000 (20:00 +0100)]
5 beta 2
Frank Karlitschek [Mon, 25 Feb 2013 17:48:25 +0000 (09:48 -0800)]
Merge pull request #1894 from owncloud/texfix
fixed bug that prevented a newly created file to be opened with register...
Bernhard Posselt [Mon, 25 Feb 2013 16:50:17 +0000 (17:50 +0100)]
fixed bug that prevented a newly created file to be opened with registered files actions
Bernhard Posselt [Mon, 25 Feb 2013 16:27:20 +0000 (08:27 -0800)]
Merge pull request #1891 from owncloud/set_timeout
use a 5 sec timeout for the webdav check
Frank Karlitschek [Mon, 25 Feb 2013 16:23:32 +0000 (08:23 -0800)]
Merge pull request #1864 from owncloud/fix_display_default
LDAP: simplify default for user home settings, fixes wrong display of de...
Björn Schießle [Mon, 25 Feb 2013 15:59:09 +0000 (07:59 -0800)]
Merge pull request #1890 from owncloud/trashbin_fix
fix quota calculation for trash bin and versions
Björn Schießle [Mon, 25 Feb 2013 15:44:35 +0000 (07:44 -0800)]
Merge pull request #1892 from owncloud/files_remove_row_on_delete
delete table row if file was deleted instead of just hide it
Thomas Müller [Mon, 25 Feb 2013 15:33:11 +0000 (07:33 -0800)]
Merge pull request #1889 from owncloud/use_distance_option
use distance option to delay dragging in sane browsers
Björn Schießle [Mon, 25 Feb 2013 15:22:06 +0000 (16:22 +0100)]
delete table row if file was deleted instead of just hide it
Frank Karlitschek [Mon, 25 Feb 2013 15:30:11 +0000 (16:30 +0100)]
use a 5 sec timeout for the webdav check
Björn Schießle [Mon, 25 Feb 2013 15:12:44 +0000 (16:12 +0100)]
fix quota calculation
Björn Schießle [Mon, 25 Feb 2013 15:09:48 +0000 (07:09 -0800)]
Merge pull request #1865 from owncloud/fix-displaying-db-errors
Don't use routes when displaying error page
Björn Schießle [Mon, 25 Feb 2013 14:34:36 +0000 (15:34 +0100)]
fix getVersion call
Jörn Friedrich Dreyer [Mon, 25 Feb 2013 14:08:14 +0000 (15:08 +0100)]
use distance option to delay dragging in sane browsers
Björn Schießle [Mon, 25 Feb 2013 13:30:21 +0000 (05:30 -0800)]
Merge pull request #1823 from owncloud/update-expire-function
Update expire function
Björn Schießle [Mon, 25 Feb 2013 13:29:31 +0000 (14:29 +0100)]
fix line endings
Björn Schießle [Mon, 25 Feb 2013 13:26:59 +0000 (14:26 +0100)]
Merge branch 'master' into update-expire-function
Conflicts:
apps/files_trashbin/appinfo/version
apps/files_trashbin/lib/trash.php
Björn Schießle [Mon, 25 Feb 2013 13:13:38 +0000 (05:13 -0800)]
Merge pull request #1810 from owncloud/trashbin_encryption
Trashbin file encryption support
Björn Schießle [Mon, 25 Feb 2013 13:12:56 +0000 (14:12 +0100)]
some final code clean-up
Björn Schießle [Mon, 25 Feb 2013 13:09:20 +0000 (14:09 +0100)]
always use "==="
Bernhard Posselt [Mon, 25 Feb 2013 12:59:47 +0000 (04:59 -0800)]
Merge pull request #1827 from owncloud/fix_getVersions
fix getVersions(), we need to get the correct user and filename
Thomas Müller [Mon, 25 Feb 2013 12:35:34 +0000 (04:35 -0800)]
Merge pull request #1832 from owncloud/fix_1779
use :hover pseudo class to set opacity
Thomas Müller [Mon, 25 Feb 2013 12:34:13 +0000 (04:34 -0800)]
Merge pull request #1833 from owncloud/fix_1465
Fix 1465
Bart Visscher [Mon, 25 Feb 2013 12:16:38 +0000 (04:16 -0800)]
Merge pull request #1887 from owncloud/fixing-1843-master
remove the check for session data folder - causes trouble on some enviro...
Björn Schießle [Mon, 25 Feb 2013 11:57:29 +0000 (03:57 -0800)]
Merge pull request #1888 from Raydiation/master
Fixes apps require version checking
Bernhard Posselt [Mon, 25 Feb 2013 11:47:34 +0000 (12:47 +0100)]
more tests to fail the version check
Bernhard Posselt [Mon, 25 Feb 2013 11:38:00 +0000 (12:38 +0100)]
created unittests and factored out version test into seperate method
Björn Schießle [Mon, 25 Feb 2013 11:14:51 +0000 (12:14 +0100)]
Merge branch 'master' into trashbin_encryption
Conflicts:
apps/files_trashbin/index.php
apps/files_trashbin/lib/trash.php
Bernhard Posselt [Mon, 25 Feb 2013 10:40:55 +0000 (11:40 +0100)]
spaces to tabs
Bernhard Posselt [Mon, 25 Feb 2013 10:39:32 +0000 (11:39 +0100)]
version checks for apps now use all three version numbers and fixed bug that would not do the version check correctly for the second version
Björn Schießle [Mon, 25 Feb 2013 10:14:06 +0000 (11:14 +0100)]
Merge branch 'master' into update-expire-function
Conflicts:
apps/files_trashbin/lib/trash.php
Frank Karlitschek [Mon, 25 Feb 2013 10:04:12 +0000 (02:04 -0800)]
Merge pull request #1856 from owncloud/fix_error_handling_stream_copy
don't use the number of written bytes as indicator if streamCopy() was successful
Thomas Mueller [Mon, 25 Feb 2013 09:12:47 +0000 (10:12 +0100)]
remove the check for session data folder - causes trouble on some environments
let's try to find another solution for =C6
Frank Karlitschek [Mon, 25 Feb 2013 08:37:22 +0000 (00:37 -0800)]
Merge pull request #1882 from owncloud/required_version
Set required owncloud version to 4.93
Jenkins for ownCloud [Sun, 24 Feb 2013 23:06:17 +0000 (00:06 +0100)]
[tx-robot] updated from transifex
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
Robin Appelman [Sun, 24 Feb 2013 16:38:36 +0000 (17:38 +0100)]
Set required owncloud version to 4.93
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
Thomas Mueller [Fri, 22 Feb 2013 21:59:09 +0000 (22:59 +0100)]
Merge branch 'master' into master-sqlserver
Conflicts:
core/templates/installation.php
Bart Visscher [Fri, 22 Feb 2013 20:39:44 +0000 (21:39 +0100)]
Don't use routes when displaying error page
Arthur Schiwon [Fri, 22 Feb 2013 20:26:07 +0000 (21:26 +0100)]
LDAP: simplify default for user home settings, fixes wrong display of default value in settings
Bart Visscher [Fri, 22 Feb 2013 16:21:57 +0000 (17:21 +0100)]
Whitespace fixes
Björn Schießle [Fri, 22 Feb 2013 15:45:57 +0000 (16:45 +0100)]
put value assignment into brackets
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
Björn Schießle [Fri, 22 Feb 2013 15:43:11 +0000 (16:43 +0100)]
return both, count and result if the operation succeeded or failed. Maybe in some cases it is useful to know how much bytes where copied
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
Björn Schießle [Fri, 22 Feb 2013 13:56:50 +0000 (14:56 +0100)]
using the number of writen bytes as indicator if streamCopy() was successfully. Instead check if fwrite returns the number of bytes or false
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
Björn Schießle [Fri, 22 Feb 2013 09:05:08 +0000 (10:05 +0100)]
use the same string lengths like the file cache
Thomas Tanghus [Thu, 21 Feb 2013 23:51:54 +0000 (00:51 +0100)]
Don't walk objects with array_walk_recursive()
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
Björn Schießle [Thu, 21 Feb 2013 21:44:44 +0000 (22:44 +0100)]
increase db fileds for usernames
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
Jörn Friedrich Dreyer [Thu, 21 Feb 2013 16:38:25 +0000 (17:38 +0100)]
IE8 does not support window.onclick
Jörn Friedrich Dreyer [Thu, 21 Feb 2013 15:52:18 +0000 (16:52 +0100)]
use :hover pseudo class to set opacity
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 ...
Björn Schießle [Thu, 21 Feb 2013 13:40:16 +0000 (14:40 +0100)]
fix getVersions(), we need to get the correct user and filename
Björn Schießle [Thu, 21 Feb 2013 11:37:13 +0000 (12:37 +0100)]
calculate trashbin size per user
Björn Schießle [Thu, 21 Feb 2013 11:20:29 +0000 (12:20 +0100)]
calculate versions size per user
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:05:30 +0000 (00:05 +0100)]
Merge branch 'master' into trashbin_encryption
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
Björn Schießle [Wed, 20 Feb 2013 23:02:52 +0000 (00:02 +0100)]
don't show empty trash bin message for sub folders
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
Björn Schießle [Wed, 20 Feb 2013 21:19:23 +0000 (22:19 +0100)]
update path to deleted files