summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #1397 from owncloud/trash_fileactionsJan-Christoph Borchardt2013-02-284-31/+72
|\ \ \ \ \ \
| * | | | | | 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-271359-26581/+90396
| |\ \ \ \ \ \
| * \ \ \ \ \ \ merge master into trash_fileactionsRobin Appelman2013-02-08823-16352/+28509
| |\ \ \ \ \ \ \
| * | | | | | | | Trash: use the same sorting algoritm as filesRobin Appelman2013-01-311-0/+12
| * | | | | | | | Trash: fix opening foldersRobin Appelman2013-01-311-0/+2
| * | | | | | | | Trash: enable fileactions while viewing trashRobin Appelman2013-01-311-9/+27
| * | | | | | | | Trash: don't use depricated filesystem api classesRobin Appelman2013-01-312-107/+107
| * | | | | | | | Trash: highlight Files navigation entry while in trashRobin Appelman2013-01-311-14/+16
* | | | | | | | | Merge pull request #1985 from owncloud/sharing-moreBernhard Posselt2013-02-282-3/+9
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | up limit of share dropdown from 4 to 15, scrollbar after 4 1/2 entries, fix #135Jan-Christoph Borchardt2013-02-282-3/+9
|/ / / / / / / /
* | | | | | | | Merge pull request #1973 from owncloud/share-improvementsJan-Christoph Borchardt2013-02-271-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | reduce minimum length for username suggestions in share dialog, fix #1666Jan-Christoph Borchardt2013-02-271-1/+1
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-28237-3712/+2627
| |_|_|_|/ / / / |/| | | | | | |
| | | | | | * | [Files] Use p() instead of echoLukas Reschke2013-02-271-2/+1
| | | | | | * | Merge masterLukas Reschke2013-02-275-8/+36
| | | | | | |\ \ | |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Merge pull request #1972 from owncloud/raw-pathinfoBernhard Posselt2013-02-272-2/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | Use the plain urlencoded path info for the routing matchingBart Visscher2013-02-272-2/+15
* | | | | | | | | Merge pull request #1945 from owncloud/sqlite-query-cacheBernhard Posselt2013-02-271-1/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Disable query cache for SqliteBart Visscher2013-02-271-1/+4
|/ / / / / / / / /
* | | | | | | | | Merge pull request #1944 from owncloud/query-caching-upgradeBernhard Posselt2013-02-272-3/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Disable prepared query caching while doing an upgradeRobin Appelman2013-02-262-3/+15
* | | | | | | | | | Merge pull request #1969 from j-ed/mastericewind19912013-02-271-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Update apps/files/templates/part.list.phpj-ed2013-02-271-2/+2
|/ / / / / / / /
| | | | | | | * Remove uneeded OAuth filesLukas Reschke2013-02-272-121/+0
| | | | | | | * Typo...Lukas Reschke2013-02-271-1/+1
| | | | | | | * Add a missing )Lukas Reschke2013-02-271-1/+1
| | | | | | | * [core] From echo to pLukas Reschke2013-02-2723-302/+302
| | | | | | | * Remove uneeded fileLukas Reschke2013-02-271-32/+0
| | | | | | | * [user_webdavauth] From echo to pLukas Reschke2013-02-271-4/+4
| | | | | | | * [user_ldap] From echo to pLukas Reschke2013-02-272-55/+55
| | | | | | | * [files_versions] From echo to pLukas Reschke2013-02-271-11/+11
| | | | | | | * [files_trashbin] From echo to pLukas Reschke2013-02-273-41/+41
| | | | | | | * [files] Unescape file sizeLukas Reschke2013-02-271-1/+1
| | | | | | | * [files_sharing] From echo to pLukas Reschke2013-02-273-32/+31
| | | | | | | * [files_external] From echo to pLukas Reschke2013-02-273-58/+58
| | | | | | | * [files_encryption] Use p() instead of echo()Lukas Reschke2013-02-272-8/+8
| | | | | | | * [Files] Use htmlspecialchars()Lukas Reschke2013-02-271-2/+2
| | | | | | | * [Files] Use p() instead of echoLukas Reschke2013-02-276-83/+83
| | | | | | | * Remove the template autoescapingLukas Reschke2013-02-271-3/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge pull request #1031 from owncloud/external_storage_ui_feedbackMichael Gapczynski2013-02-2717-182/+397
|\ \ \ \ \ \ \
| * | | | | | | Fix Dropbox and Google uiMichael Gapczynski2013-02-252-11/+11
| * | | | | | | Merge branch 'master' into external_storage_ui_feedbackMichael Gapczynski2013-02-25536-4787/+9431
| |\ \ \ \ \ \ \
| * | | | | | | | attach on() events to external storage table, dom events in the table will al...Jörn Friedrich Dreyer2013-02-201-3/+3
| * | | | | | | | Merge branch 'master' into external_storage_ui_feedbackMichael Gapczynski2013-02-19593-9922/+11746
| |\ \ \ \ \ \ \ \
| * | | | | | | | | fixing issues with UTF8 characters in translatable stringsThomas Mueller2013-02-132-7/+2
| * | | | | | | | | adding spinner while talking to the backendThomas Mueller2013-02-122-2/+7