summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* merge master into filesystemRobin Appelman2012-12-0273-237/+270
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-0212-43/+99
| * [tx-robot] updated from transifexJenkins for ownCloud2012-12-0155-106/+0
| * Merge pull request #644 from butonic/checkstyle_fixesBart Visscher2012-11-3010-73/+152
| |\
| | * fix checkstyle for files appJörn Friedrich Dreyer2012-11-2911-74/+153
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-11-305-13/+18
* | | add upgrade path from old cache to preserve file id'sRobin Appelman2012-11-302-3/+13
* | | merge master into filesystemRobin Appelman2012-11-3031-59/+359
|\| |
| * | use new obEnd function instead of ob_end_cleanRobin Appelman2012-11-292-2/+2
| |/
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-291-0/+1
| * Merge pull request #601 from butonic/add_drag_shadow_in_firefoxBart Visscher2012-11-281-1/+1
| |\
| | * show drag shadow in firefox by using helper:'clone'Jörn Friedrich Dreyer2012-11-271-1/+1
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-11-289-0/+75
| |/
| * [tx-robot] updated from transifexJenkins for ownCloud2012-11-279-0/+18
| * Merge pull request #380 from butonic/feature_share_link_with_tokenJörn Friedrich Dreyer2012-11-261-149/+205
| |\
| | * readd fallback code for pre token linksJörn Friedrich Dreyer2012-11-231-143/+197
| | * implement share via link tokenJörn Friedrich Dreyer2012-11-201-103/+105
| * | use normalizePath to have a proper target pathArthur Schiwon2012-11-261-3/+1
| * | all but the first parameter are introduced by &Arthur Schiwon2012-11-261-1/+1
| * | make sure path starts with /Arthur Schiwon2012-11-261-0/+3
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-11-269-1/+54
* | | Merge branch 'master' into filesystemRobin Appelman2012-11-2554-51/+37
|\| |
| * | make sure the output buffer is closed when handeling webdavRobin Appelman2012-11-251-0/+2
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-11-257-0/+11
| * | [tx-robot] updated from transifexJenkins for ownCloud2012-11-2453-51/+24
* | | Add checks for storage objectMichael Gapczynski2012-11-241-7/+8
* | | merge master into filesystemRobin Appelman2012-11-236-19/+42
|\| |
| * | Merge pull request #479 from owncloud/fix_438Thomas Müller2012-11-233-6/+7
| |\ \
| | * | Do the url encoding once, only in breadcrumbs templateBart Visscher2012-11-163-6/+7
| * | | Merge pull request #480 from owncloud/fix_435_and_437Thomas Müller2012-11-232-3/+16
| |\ \ \
| | * | | introduce Files.containsInvalidCharacters(), use when creating or renaming filesJörn Friedrich Dreyer2012-11-222-11/+19
| | * | | some more invalid characters have been addedThomas Mueller2012-11-221-6/+11
| | * | | Also reject names with \ in the nameBart Visscher2012-11-221-2/+2
| | | |/ | | |/|
| * | | Merge pull request #418 from libasys/Fix-IE8-fileactions-bindingThomas Müller2012-11-231-11/+20
| |\ \ \
| | * | | Fixes two issues if you using IE8. IE8 has problems with .bind actions and si...libasys2012-11-141-11/+20
* | | | | merge master into filesystemRobin Appelman2012-11-238-2/+65
|\| | | |
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-234-1/+14
| * | | | Merge pull request #506 from owncloud/fix_505Thomas Müller2012-11-221-0/+8
| |\ \ \ \
| | * | | | refs #505 - defining publicListView based on template parameterThomas Mueller2012-11-181-0/+8
| * | | | | Merge pull request #482 from eMerzh/fix_prevent_shared_folderblizzz2012-11-221-0/+4
| |\ \ \ \ \
| | * | | | | Show error message to prevent adding a shared folder in the root dir fix #468Brice Maron2012-11-161-0/+4
| | | |_|_|/ | | |/| | |
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-222-1/+39
* | | | | | use background scannerRobin Appelman2012-11-232-55/+72
* | | | | | merge master into filesystemRobin Appelman2012-11-2130-44/+320
|\| | | | |
| * | | | | port 95cee0e from stable45Arthur Schiwon2012-11-211-1/+14
| * | | | | port dd694b5 from stable45Arthur Schiwon2012-11-211-11/+6
| * | | | | LDAP: Make update script escape all known DNs. Requires version bump.Arthur Schiwon2012-11-212-6/+33
| * | | | | LDAP: escape values in the DN, fixes #419Arthur Schiwon2012-11-211-0/+13
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-11-2117-25/+166
| * | | | | interpret http 403 and http 401 as not authorizedFrank Karlitschek2012-11-201-1/+1
| | |_|_|/ | |/| | |