Björn Schießle
|
6aed7abfbe
|
Merge branch 'master' into trashbin_encryption
|
2013-02-21 00:05:30 +01:00 |
Björn Schießle
|
fc1fba2304
|
don't show empty trash bin message for sub folders
|
2013-02-21 00:02:52 +01:00 |
Thomas Mueller
|
3eb9cd035f
|
Merge branch 'master' into trash_bin_delete_selected
|
2013-02-20 23:46:15 +01:00 |
Björn Schießle
|
c1847aaf51
|
change for loop to make it hopefully work with IE
|
2013-02-20 22:32:44 +01:00 |
Björn Schießle
|
2d6efae257
|
update path to deleted files
|
2013-02-20 22:19:23 +01:00 |
Björn Schießle
|
b685aa8bcb
|
some fixes for the keyfile handling
|
2013-02-20 22:17:04 +01:00 |
Bernhard Posselt
|
3b9d9eea09
|
replaced for in loops with normal enumerating loops to fix #1803
|
2013-02-20 21:57:50 +01:00 |
Björn Schießle
|
5329c9ea31
|
update script which copies all trash bin related files to user/files_trashbin
|
2013-02-20 19:18:34 +01:00 |
Björn Schießle
|
5ce6d1fb57
|
reuse delete() function in expire()
|
2013-02-20 18:00:15 +01:00 |
Björn Schießle
|
4b5a662e09
|
delete keyfiles if file in trash bin gets deleted permanently
|
2013-02-20 17:58:04 +01:00 |
Frank Karlitschek
|
383194cb44
|
Merge pull request #1753 from owncloud/Extra_info
Ability for the action handler to get more info on the current file
|
2013-02-20 08:33:57 -08:00 |
Frank Karlitschek
|
57fbfaf86a
|
Merge pull request #1787 from maelzx/patch-1
Update apps/files_versions/js/versions.js
|
2013-02-20 08:32:36 -08:00 |
Björn Schießle
|
273e1a146b
|
switch to json encoded file list
|
2013-02-20 16:33:45 +01:00 |
Björn Schießle
|
3a364639b7
|
use "|" as delimiter instead of ";", since "|" is not allowed in file/folder names
|
2013-02-20 15:17:32 +01:00 |
Björn Schießle
|
c49e73d43c
|
restore filekeys from trash bin
|
2013-02-20 15:14:32 +01:00 |
Björn Schießle
|
4d0df9614b
|
put all trash bin content in user/files_trashbin
|
2013-02-20 13:34:32 +01:00 |
Björn Schießle
|
d426a09f90
|
Merge pull request #1752 from schiesbn/versioning_use_new_filesystem_api
Versioning app use new filesystem api
|
2013-02-20 03:38:37 -08:00 |
maelzx
|
94e5de8fd0
|
Update apps/files_versions/js/versions.js
Fix "All version..." button not clickable.
Reason is Google Chrome blocking inline javascript execution.
|
2013-02-20 11:14:24 +08:00 |
Frank Karlitschek
|
3878203679
|
Merge pull request #1731 from owncloud/unknown-freespace
Give storage backends the option to define having no known free space
|
2013-02-19 15:18:12 -08:00 |
Jenkins for ownCloud
|
99758dce2b
|
[tx-robot] updated from transifex
|
2013-02-20 00:03:28 +01:00 |
Björn Schießle
|
686254ac11
|
move2trash() handles keyfiles
|
2013-02-19 18:45:46 +01:00 |
Björn Schießle
|
211e651d72
|
add timestamp to function call; fix trash.js to handle multiple delete operation at once
|
2013-02-19 12:38:00 +01:00 |
Björn Schießle
|
7bfbfe6562
|
initialize $result
|
2013-02-19 12:24:51 +01:00 |
Björn Schießle
|
f45b268b93
|
rebase to master
|
2013-02-19 12:16:54 +01:00 |
Björn Schießle
|
e6c39fc3e7
|
change $_REQUEST to $_POST; fix check if file was successfully deleted
|
2013-02-19 12:14:44 +01:00 |
Björn Schießle
|
95751874a1
|
Merge pull request #1740 from houqp/issue#1688
Bug fix for Issue#1688
|
2013-02-19 03:09:03 -08:00 |
Björn Schießle
|
ac1b2a74ef
|
add missing paramenter to post request
|
2013-02-19 11:50:29 +01:00 |
Björn Schießle
|
815e964362
|
use instead of
|
2013-02-19 11:49:41 +01:00 |
Lukas Reschke
|
3d7545269b
|
Merge pull request #1764 from owncloud/Undelete_directory_fix
Fix for Undelete directory action
|
2013-02-19 01:34:49 -08:00 |
Björn Schießle
|
51cef9d8f0
|
allow user to delete selected files from the trash bin permanently
|
2013-02-19 10:24:21 +01:00 |
Björn Schießle
|
9a93db9642
|
remove obsolete variables
|
2013-02-19 10:23:34 +01:00 |
Thomas Müller
|
c56542c58d
|
Merge pull request #1771 from owncloud/mountconfig
JSON mount config: no pretty print
|
2013-02-18 22:15:56 -08:00 |
Thomas Mueller
|
0e9b9f4f5f
|
no pretty print
|
2013-02-19 00:48:38 +01:00 |
Jenkins for ownCloud
|
76c4dc6296
|
[tx-robot] updated from transifex
|
2013-02-19 00:06:51 +01:00 |
Thomas Müller
|
d9035d4fdc
|
Merge pull request #1728 from owncloud/mountconfig
Use json for new mount configuration files
|
2013-02-18 14:56:25 -08:00 |
Thomas Mueller
|
f343d9d247
|
files_versions no longer contains a personal settings page -> remove the call
|
2013-02-18 23:04:22 +01:00 |
Victor Dubiniuk
|
e2f87e456f
|
Calculate size for existing directories only
|
2013-02-18 23:48:08 +03:00 |
Björn Schießle
|
37352bba96
|
close file handler after readdir()
|
2013-02-18 18:16:19 +01:00 |
Thomas Müller
|
0ab87204ec
|
Merge pull request #1759 from owncloud/redirect_fix_1737
fix redirect, use the new routing
|
2013-02-18 07:13:19 -08:00 |
Qingping Hou
|
c0ac98066e
|
check filename and timestamp in Trashbin's file_exists method
|
2013-02-18 09:49:50 -05:00 |
Robin Appelman
|
3bf9aa408e
|
Merge branch 'mountconfig' of github.com:owncloud/core into mountconfig
|
2013-02-18 15:13:25 +01:00 |
Robin Appelman
|
2bbb57e429
|
merge master into mountconfig
|
2013-02-18 15:12:15 +01:00 |
Björn Schießle
|
4a3374ecf8
|
fix redirect, use the new routing
|
2013-02-18 14:38:29 +01:00 |
VicDeo
|
fde0a8b520
|
Add Ability to the app to detect more details on the file
|
2013-02-18 13:22:43 +03:00 |
Björn Schießle
|
efa024cc62
|
fix getUidAndFilename() function
|
2013-02-18 11:19:40 +01:00 |
Lukas Reschke
|
79284b8e57
|
Sanitize HTML
|
2013-02-18 08:11:59 +01:00 |
Jenkins for ownCloud
|
3b9796bfcc
|
[tx-robot] updated from transifex
|
2013-02-18 00:06:45 +01:00 |
Thomas Müller
|
8e76a98d2f
|
Merge pull request #1709 from owncloud/style-cleanup-files_external
Style cleanup files_external
|
2013-02-17 11:53:51 -08:00 |
Bernhard Posselt
|
90939c8f12
|
Merge pull request #1708 from owncloud/style-cleanup-user_ldap
Style cleanup user_ldap
|
2013-02-17 07:02:45 -08:00 |
Thomas Mueller
|
325746ae45
|
Merge branch 'master' into fix-googledrive
|
2013-02-17 09:41:37 +01:00 |