summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Update app.phpj-ed2013-03-021-6/+6
| | | | | | | | | | | | | | | | | | | | | suppress log messages like `include path for class \"OC\\Files\\Storage\\Shared\" starts with \"apps\/\"`
| * | | | | | Update app.phpj-ed2013-03-021-10/+10
| | | | | | | | | | | | | | | | | | | | | suppress log message `include path for class \"OC\\Files\\Storage\\SMB\" starts with \"apps\/\"`
* | | | | | | Merge pull request #2082 from owncloud/fix-permissions-classBernhard Posselt2013-03-041-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Change remove() $user parameter to optional
| * | | | | | | Change remove() $user parameter to optionalMichael Gapczynski2013-03-041-1/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #2079 from owncloud/fix_expire_functionBernhard Posselt2013-03-041-5/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | fix expire function
| * | | | | | | fix expire functionBjörn Schießle2013-03-041-5/+5
| |/ / / / / /
* | | | | | | Corrects Files Layout in Trashbinraghunayyar2013-03-041-1/+1
| | | | | | |
* | | | | | | fix files table CSS specificity issue causing multiselect bar overlap, fix #2075Jan-Christoph Borchardt2013-03-041-1/+1
|/ / / / / /
* | | | | | Merge pull request #2073 from owncloud/trashbin_userHomeblizzz2013-03-041-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | make trashbin work with different user homes
| * | | | | | make trashbin work with different user homesBjörn Schießle2013-03-041-4/+4
| | | | | | |
* | | | | | | damn copy&paste, fix wrong var nameBjörn Schießle2013-03-041-1/+1
|/ / / / / /
* | | | | | Merge pull request #2069 from owncloud/fix_sanitize_callLukas Reschke2013-03-042-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | use p() for the output and not for the comparison
| * | | | | | fix p() callBjörn Schießle2013-03-041-1/+1
| | | | | | |
| * | | | | | use p() for the output and not for the comparisonBjörn Schießle2013-03-041-1/+1
| | | | | | |
* | | | | | | Merge pull request #2070 from owncloud/fix_quotaBjörn Schießle2013-03-042-5/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | fix quota calculation for trash and versions
| * | | | | | | fix type in var nameBjörn Schießle2013-03-042-2/+2
| | | | | | | |
| * | | | | | | fix quota calculation for trash and versionsBjörn Schießle2013-03-042-5/+5
| |/ / / / / /
* | | | | | | LDAP: orthograophy fixArthur Schiwon2013-03-041-1/+1
| | | | | | |
* | | | | | | LDAP: typos in app descriptionArthur Schiwon2013-03-042-3/+5
| | | | | | |
* | | | | | | Merge pull request #2044 from owncloud/fix_1779_including_permanent_sharesBart Visscher2013-03-041-1/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix file actions including permanent shares
| * | | | | | | durhurrrhurrrJörn Friedrich Dreyer2013-03-031-1/+7
| | | | | | | |
* | | | | | | | Datepicker height fixed.raghunayyar2013-03-042-2/+2
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | New id defined for files table for positioning.
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-0449-91/+62
| | | | | | |
* | | | | | | Merge pull request #2034 from owncloud/fix_bug47Michael Gapczynski2013-03-031-18/+19
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Fix #47 - Duplicate files create a (2) when multiples are uploaded
| * | | | | | fix oc#47Georg Ehrke2013-03-011-18/+19
| | | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-0320-34/+86
| | | | | | |
* | | | | | | Fix quoting of query for user_ldap ref #1983Brice Maron2013-03-021-3/+3
| | | | | | |
* | | | | | | Remove uneeded sanitizeHTMLLukas Reschke2013-03-021-1/+1
| | | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-025-3/+15
| | | | | | |
* | | | | | | Merge branch 'master' into from-insane-autoescape-to-pThomas Mueller2013-03-0167-24/+103
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/templates/index.php
| * | | | | | | fixes #2001 - in case the user has no permissions to upload/create ↵Thomas Mueller2013-03-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files/folders a clear warning is displayed
| * | | | | | | Merge pull request #2005 from owncloud/trash_add_signalsBernhard Posselt2013-03-011-0/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | add post_moveToTrash and post_restore signals to the trash bin
| | * | | | | | | add additional parameter to signalBjörn Schießle2013-03-011-2/+6
| | | | | | | | |
| | * | | | | | | add post_moveToTrash and post_restore signals to the trash binBjörn Schießle2013-03-011-0/+2
| | | | | | | | |
| * | | | | | | | fix getVersions() call for the history viewBjörn Schießle2013-03-011-1/+2
| | | | | | | | |
| * | | | | | | | make sure that the version app always work on the users real home folder and ↵Björn Schießle2013-03-011-7/+8
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | not on the mount point
| * | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-03-0162-15/+85
| | | | | | | |
| * | | | | | | Merge pull request #1979 from maelzx/patch-2Lukas Reschke2013-02-281-1/+1
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | Fix window.location mistakes in previous code
| | * | | | | | Fix window.location mistakes in previous codemaelzx2013-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sorry guys, I commit the incomplete code. It should be window.location.assign(url); However this is just tested in google chrome.
* | | | | | | | Sed was wrongLukas Reschke2013-02-281-1/+1
| | | | | | | |
* | | | | | | | Merge masterLukas Reschke2013-02-2879-323/+100
|\| | | | | | |
| * | | | | | | Merge pull request #1397 from owncloud/trash_fileactionsJan-Christoph Borchardt2013-02-284-31/+72
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | Enable fileactions while viewing trash
| | * | | | | | Trash: fix opening foldersRobin Appelman2013-02-281-2/+4
| | | | | | | |
| | * | | | | | Trash: disable text editor from trash for nowRobin Appelman2013-02-271-0/+4
| | | | | | | |
| | * | | | | | Trash: fix download.phpRobin Appelman2013-02-271-1/+1
| | | | | | | |
| | * | | | | | Trash: fix trash when default quota is usedRobin Appelman2013-02-271-1/+1
| | | | | | | |
| | * | | | | | Merge master into trash_fileactionsRobin Appelman2013-02-27373-2469/+30049
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ merge master into trash_fileactionsRobin Appelman2013-02-08259-1135/+3599
| | |\ \ \ \ \ \ \
| | * | | | | | | | Trash: use the same sorting algoritm as filesRobin Appelman2013-01-311-0/+12
| | | | | | | | | |
| | * | | | | | | | Trash: fix opening foldersRobin Appelman2013-01-311-0/+2
| | | | | | | | | |