mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
9,865 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

9865 Commits

Author SHA1 Message Date
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
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
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
Robin Appelman 451daf3ab1 Keep user quota into account when the storage backend has unkown free space 2013-02-17 20:09:03 +01: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
Thomas Tanghus 5a8e0f2048 Extra position check for multiselect dropdown. Fix app/issues/575 2013-02-16 19:56:56 +01: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
Robin Appelman d96146a017 Give storage backends the option to define having no known free space 
When this is the case only the configured max upload size is taking into account for uploading
 2013-02-16 03:27:50 +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
Jan-Christoph Borchardt 953c87db9c fix erroneous CSS, remove obsolete selectors 2013-02-15 18:37:52 +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
Bart Visscher 6c197227d0 Join split translated strings 2013-02-15 15:58:52 +01:00
Bart Visscher 5616690506 Style cleanup files_external 2013-02-15 15:58:52 +01:00
Bart Visscher 925de78cec Join split translated strings 2013-02-15 15:51:55 +01:00
Bart Visscher 92a36ca8b8 Join short comment lines 2013-02-15 15:45:34 +01:00
Thomas Mueller e3ba0c3082 adding a new test class for mapped local using a dot in the datadir - reflects the issue described in #1659 2013-02-15 14:46:09 +01:00
blizzz cd310add23 Merge pull request #1694 from owncloud/users-header 
Users header
 2013-02-15 05:36:21 -08:00
Thomas Müller 2ce398c68e Merge pull request #1715 from owncloud/fixing-1640-master 
changing the bit mask of OC_USER_BACKEND_SET_DISPLAYNAME
 2013-02-15 03:58:05 -08:00
Jan-Christoph Borchardt ac32ae79af Merge pull request #1683 from owncloud/ie-fixes 
IE fixes
 2013-02-15 03:32:31 -08:00
Björn Schießle 08b68aac6c check if glob() returns any results, fix for stable45 was already approved by pull request #1695 2013-02-15 12:29:52 +01:00
Thomas Mueller 297c50db18 changing the bit mask of OC_USER_BACKEND_SET_DISPLAYNAME 2013-02-15 12:24:49 +01:00
Jan-Christoph Borchardt 8b09fbc150 Merge pull request #1700 from owncloud/fixing-1680-master 
Fixing 1680 master
 2013-02-15 03:21:49 -08:00