7bfbfe6562
initialize $result
2013-02-19 12:24:51 +01:00
f45b268b93
rebase to master
2013-02-19 12:16:54 +01:00
e6c39fc3e7
change $_REQUEST to $_POST; fix check if file was successfully deleted
2013-02-19 12:14:44 +01:00
95751874a1
Merge pull request #1740 from houqp/issue#1688
...
Bug fix for Issue#1688
2013-02-19 03:09:03 -08:00
ac1b2a74ef
add missing paramenter to post request
2013-02-19 11:50:29 +01:00
815e964362
use instead of
2013-02-19 11:49:41 +01:00
3d7545269b
Merge pull request #1764 from owncloud/Undelete_directory_fix
...
Fix for Undelete directory action
2013-02-19 01:34:49 -08:00
51cef9d8f0
allow user to delete selected files from the trash bin permanently
2013-02-19 10:24:21 +01:00
9a93db9642
remove obsolete variables
2013-02-19 10:23:34 +01:00
c56542c58d
Merge pull request #1771 from owncloud/mountconfig
...
JSON mount config: no pretty print
2013-02-18 22:15:56 -08:00
0e9b9f4f5f
no pretty print
2013-02-19 00:48:38 +01:00
76c4dc6296
[tx-robot] updated from transifex
2013-02-19 00:06:51 +01:00
2c78c5ccab
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.
2013-02-18 18:05:58 -05:00
d9035d4fdc
Merge pull request #1728 from owncloud/mountconfig
...
Use json for new mount configuration files
2013-02-18 14:56:25 -08:00
474b82931b
Merge pull request #1767 from owncloud/fixing-1766-master
...
files_versions no longer contains a personal settings page -> remove the...
2013-02-18 14:25:10 -08:00
f343d9d247
files_versions no longer contains a personal settings page -> remove the call
2013-02-18 23:04:22 +01:00
e2f87e456f
Calculate size for existing directories only
2013-02-18 23:48:08 +03:00
c8e02060c1
Merge pull request #1762 from owncloud/user_password_fix
...
Fix changing user password at 'Personal' page. Ref #1693
2013-02-18 10:54:27 -08:00
06dbcec5a1
Do not set password if it has't provided
2013-02-18 21:20:48 +03:00
c5f6a77dbd
Correct new password input name
2013-02-18 21:15:32 +03:00
37352bba96
close file handler after readdir()
2013-02-18 18:16:19 +01:00
f554347db5
Merge pull request #1724 from owncloud/long-storage-id
...
Cache: hash long storage ids to ensure they fit in the database
2013-02-18 07:17:27 -08:00
0ab87204ec
Merge pull request #1759 from owncloud/redirect_fix_1737
...
fix redirect, use the new routing
2013-02-18 07:13:19 -08:00
c0ac98066e
check filename and timestamp in Trashbin's file_exists method
2013-02-18 09:49:50 -05:00
3bf9aa408e
Merge branch 'mountconfig' of github.com:owncloud/core into mountconfig
2013-02-18 15:13:25 +01:00
2bbb57e429
merge master into mountconfig
2013-02-18 15:12:15 +01:00
4a3374ecf8
fix redirect, use the new routing
2013-02-18 14:38:29 +01:00
96ae110a2c
Merge pull request #1751 from owncloud/sanitizeHTML
...
Sanitize html
2013-02-18 04:37:48 -08:00
2675290325
Merge branch 'master' into master-sqlserver
2013-02-18 11:39:04 +01:00
fde0a8b520
Add Ability to the app to detect more details on the file
2013-02-18 13:22:43 +03:00
efa024cc62
fix getUidAndFilename() function
2013-02-18 11:19:40 +01:00
79284b8e57
Sanitize HTML
2013-02-18 08:11:59 +01:00
a984a27fa0
Sanitize user input
2013-02-18 08:04:35 +01:00
3b9796bfcc
[tx-robot] updated from transifex
2013-02-18 00:06:45 +01:00
8e76a98d2f
Merge pull request #1709 from owncloud/style-cleanup-files_external
...
Style cleanup files_external
2013-02-17 11:53:51 -08:00
55d6b96348
Merge pull request #1719 from owncloud/fixing-1659-master
...
Fixing 1659 master
2013-02-17 11:47:35 -08:00
451daf3ab1
Keep user quota into account when the storage backend has unkown free space
2013-02-17 20:09:03 +01:00
90939c8f12
Merge pull request #1708 from owncloud/style-cleanup-user_ldap
...
Style cleanup user_ldap
2013-02-17 07:02:45 -08:00
c0fafe8199
Merge pull request #1642 from owncloud/fix-googledrive
...
Remove the leading slash from the filename for opendir
2013-02-17 01:52:12 -08:00
325746ae45
Merge branch 'master' into fix-googledrive
2013-02-17 09:41:37 +01:00
0f8058cb12
Merge pull request #1699 from owncloud/multiselect-bar-fix
...
fix multiselect bar offset on shared page, close #1339 finally
2013-02-17 00:39:16 -08:00
71472c21ed
Merge pull request #1730 from owncloud/ldap_fix_warnings
...
LDAP: check array with isset first to avoid warnings about undefined ind...
2013-02-17 00:25:40 -08:00
c8e7b14ab3
[tx-robot] updated from transifex
2013-02-17 00:26:17 +01:00
4b4b1f8692
Properly delete empty directories in Trashbin
...
Instead of checking delted file size, we do a real check.
this fixes #1688
2013-02-16 17:44:51 -05:00
50759607e4
add file_exists method to files_trashbin app
2013-02-16 17:42:06 -05:00
5a8e0f2048
Extra position check for multiselect dropdown. Fix app/issues/575
2013-02-16 19:56:56 +01:00
17d21a84b6
Merge pull request #1729 from owncloud/fix_1727
...
LDAP: announce that OC_USER_BACKEND_GET_DISPLAYNAME is implemented, fixe...
2013-02-16 05:48:18 -08:00
4708d4549d
Add missing requesttoken
...
This is a trivial fix for a regression caused by #1648
2013-02-16 13:28:49 +01:00
cad65915a7
look where you are typing ...
2013-02-16 12:55:36 +01:00
e1700c28fa
pretty print json
2013-02-16 12:10:54 +01:00
Björn Schießle
Björn Schießle
Lukas Reschke
Thomas Müller
Qingping Hou
Victor Dubiniuk
Frank Karlitschek
Robin Appelman
Bernhard Posselt
Thomas Tanghus
Jörn Friedrich Dreyer