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
|
686254ac11
|
move2trash() handles keyfiles
|
2013-02-19 18:45:46 +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 |
|
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 |
|
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 |
|
Lukas Reschke
|
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 |
|
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 |
|
Thomas Müller
|
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 |
|
Victor Dubiniuk
|
06dbcec5a1
|
Do not set password if it has't provided
|
2013-02-18 21:20:48 +03:00 |
|
Victor Dubiniuk
|
c5f6a77dbd
|
Correct new password input name
|
2013-02-18 21:15:32 +03:00 |
|
Frank Karlitschek
|
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 |
|
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 |
|
Frank Karlitschek
|
96ae110a2c
|
Merge pull request #1751 from owncloud/sanitizeHTML
Sanitize html
|
2013-02-18 04:37:48 -08:00 |
|
Lukas Reschke
|
79284b8e57
|
Sanitize HTML
|
2013-02-18 08:11:59 +01:00 |
|
Lukas Reschke
|
a984a27fa0
|
Sanitize user input
|
2013-02-18 08:04:35 +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 |
|
Thomas Müller
|
55d6b96348
|
Merge pull request #1719 from owncloud/fixing-1659-master
Fixing 1659 master
|
2013-02-17 11:47:35 -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 Müller
|
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 |
|
Thomas Mueller
|
325746ae45
|
Merge branch 'master' into fix-googledrive
|
2013-02-17 09:41:37 +01:00 |
|
Thomas Müller
|
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 |
|
Thomas Müller
|
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 |
|
Jenkins for ownCloud
|
c8e7b14ab3
|
[tx-robot] updated from transifex
|
2013-02-17 00:26:17 +01:00 |
|
Qingping Hou
|
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 |
|
Qingping Hou
|
50759607e4
|
add file_exists method to files_trashbin app
|
2013-02-16 17:42:06 -05:00 |
|
Frank Karlitschek
|
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 |
|
Lukas Reschke
|
4708d4549d
|
Add missing requesttoken
This is a trivial fix for a regression caused by #1648
|
2013-02-16 13:28:49 +01:00 |
|
Jörn Friedrich Dreyer
|
cad65915a7
|
look where you are typing ...
|
2013-02-16 12:55:36 +01:00 |
|
Jörn Friedrich Dreyer
|
e1700c28fa
|
pretty print json
|
2013-02-16 12:10:54 +01:00 |
|
Arthur Schiwon
|
a28df74ee5
|
LDAP: check array with isset first to avoid warnings about undefined index
|
2013-02-16 02:33:19 +01:00 |
|
Arthur Schiwon
|
bef48bad8b
|
LDAP: announce that OC_USER_BACKEND_GET_DISPLAYNAME is implemented, fixes #1727
|
2013-02-16 02:06:45 +01:00 |
|
Robin Appelman
|
6da2c6c83e
|
Create new mountconfig files in json
|
2013-02-16 01:50:40 +01:00 |
|
Robin Appelman
|
46626915ef
|
Use a parser to read custom mount configuration instead of including the php files
|
2013-02-16 01:30:44 +01:00 |
|
Jenkins for ownCloud
|
83f0c8ce61
|
[tx-robot] updated from transifex
|
2013-02-16 00:05:50 +01:00 |
|
Robin Appelman
|
0c1ec758e8
|
Cache: hash long storage ids to ensure they fit in the database
|
2013-02-15 22:11:39 +01:00 |
|
Thomas Mueller
|
40739350c9
|
class Mapper no respects an unchanged physical root which will be excluded from slugifying the path
|
2013-02-15 17:42:17 +01:00 |
|
Thomas Mueller
|
b488800bd5
|
fix error in recursive search
|
2013-02-15 17:41:22 +01:00 |
|
Thomas Mueller
|
191da024fa
|
new test cases added to search in sub folders
|
2013-02-15 17:40:52 +01:00 |
|
Thomas Mueller
|
c0f3d8578a
|
folder should be created :-(
|
2013-02-15 17:40:07 +01:00 |
|
icewind1991
|
425d41aaf9
|
Merge pull request #1717 from owncloud/fix-warning-template
Fix strict standard warning in user template
|
2013-02-15 08:07:02 -08:00 |
|
Robin Appelman
|
b8e2454f68
|
Fix strict standard warning in user template
|
2013-02-15 16:10:06 +01:00 |
|