5329c9ea31
update script which copies all trash bin related files to user/files_trashbin
2013-02-20 19:18:34 +01:00
59fd9b2bd2
5.0.0 beta 1
2013-02-20 19:09:58 +01:00
6ecc3d7ee1
Reduced email input width by 10% to increase space.
2013-02-20 23:08:21 +05:30
5ce6d1fb57
reuse delete() function in expire()
2013-02-20 18:00:15 +01:00
4b5a662e09
delete keyfiles if file in trash bin gets deleted permanently
2013-02-20 17:58:04 +01:00
18dab4a88e
Merge pull request #1738 from owncloud/fix_multiselect_in_settings
...
Extra position check for multiselect dropdown. Fix app/issues/575
2013-02-20 08:34:26 -08:00
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
57fbfaf86a
Merge pull request #1787 from maelzx/patch-1
...
Update apps/files_versions/js/versions.js
2013-02-20 08:32:36 -08:00
326aae8a08
Hovering on the unshare doesnt spoil look
2013-02-20 21:59:12 +05:30
d8e8dab006
Fixes the Email Button and the email input Width.
2013-02-20 21:37:23 +05:30
170a5856e9
Merge branch 'sharing-css-fix' into sharing-dropdown-fixes
2013-02-20 21:25:18 +05:30
273e1a146b
switch to json encoded file list
2013-02-20 16:33:45 +01:00
3a364639b7
use "|" as delimiter instead of ";", since "|" is not allowed in file/folder names
2013-02-20 15:17:32 +01:00
c49e73d43c
restore filekeys from trash bin
2013-02-20 15:14:32 +01:00
4d0df9614b
put all trash bin content in user/files_trashbin
2013-02-20 13:34:32 +01:00
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
7a9200f48a
Merge pull request #1790 from owncloud/update_office_icons
...
Update office icons
2013-02-20 03:20:56 -08:00
05a8766cbc
attach on() events to external storage table, dom events in the table will always bubble up here
2013-02-20 12:06:08 +01:00
5062ae250b
Merge branch 'master' into master-sqlserver
...
Conflicts:
lib/files/cache/cache.php
2013-02-20 10:55:20 +01:00
0efa4182dc
Update office icons
2013-02-20 10:42:54 +01:00
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
3dfb1628ce
Include etags for the root of the shared folder
2013-02-19 20:42:48 -05:00
702c27b0e6
Merge branch 'master' into external_storage_ui_feedback
...
Conflicts:
apps/files_external/js/settings.js
apps/files_external/lib/smb.php
apps/files_external/templates/settings.php
lib/files/storage/common.php
2013-02-19 19:12:14 -05:00
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
99758dce2b
[tx-robot] updated from transifex
2013-02-20 00:03:28 +01:00
a085e4c435
Merge pull request #1720 from owncloud/usermenu-css
...
fix erroneous CSS, remove obsolete selectors
2013-02-19 10:44:58 -08:00
686254ac11
move2trash() handles keyfiles
2013-02-19 18:45:46 +01:00
211e651d72
add timestamp to function call; fix trash.js to handle multiple delete operation at once
2013-02-19 12:38:00 +01:00
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
d82c9fd623
Text stays inside the sharing dropdown
2013-02-19 15:12:35 +05:30
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
Björn Schießle
Frank Karlitschek
raghunayyar
Björn Schießle
Jan-Christoph Borchardt
Jörn Friedrich Dreyer
Thomas Mueller
maelzx
Michael Gapczynski
Lukas Reschke
Qingping Hou
Victor Dubiniuk