summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-03-01171-340/+441
* Merge pull request #1979 from maelzx/patch-2Lukas Reschke2013-02-281-1/+1
|\
| * Fix window.location mistakes in previous codemaelzx2013-02-281-1/+1
* | Merge pull request #1992 from owncloud/fix-heartbeatLukas Reschke2013-02-281-2/+2
|\ \
| * | The router base url is without / on the endBart Visscher2013-02-281-2/+2
* | | Merge pull request #1937 from owncloud/check-resharingBart Visscher2013-02-282-3/+28
|\ \ \
| * | | Check resharing settingMichael Gapczynski2013-02-262-3/+28
* | | | Merge pull request #1988 from owncloud/permissionscache_cleanicewind19912013-02-282-10/+18
|\ \ \ \ | |_|/ / |/| | |
| * | | Cache: cleanup permissions cache when removing a file from the cacheRobin Appelman2013-02-281-0/+3
| * | | Cache: add option to delete file from permissions cache for all usersRobin Appelman2013-02-281-10/+15
* | | | Merge pull request #1989 from owncloud/selectSanitizeBjörn Schießle2013-02-281-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Sanitize HTML in html_select_optionsLukas Reschke2013-02-281-1/+1
* | | | Merge pull request #1987 from owncloud/fixinstalldepsBernhard Posselt2013-02-281-1/+10
|\ \ \ \
| * | | | add checks for xml and dom when installingBernhard Posselt2013-02-281-1/+10
| | |_|/ | |/| |
* | | | 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
| |_|_|_|/ / |/| | | | |
* | | | | | 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
|/ / / / / / /
* | | | | | | 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
| * | | | | | | | | Merge branch 'master' into external_storage_ui_feedbackThomas Mueller2013-02-12313-3631/+15858
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | fixing namespaceThomas Mueller2013-02-122-3/+3
| * | | | | | | | | | Merge branch 'master' into external_storage_ui_feedbackThomas Mueller2013-02-12131-627/+957
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fixing namespaceThomas Mueller2013-02-122-3/+3