summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1972 from owncloud/raw-pathinfoBernhard Posselt2013-02-272-2/+15
|\ | | | | Use the plain urlencoded path info for the routing matching
| * 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 Sqlite
| * | 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 upgrade
| * | 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
|\ \ \ | | | | | | | | OC5 beta 2 - prevent multiple slashes in a row when building URLs.
| * | | Update apps/files/templates/part.list.phpj-ed2013-02-271-2/+2
|/ / / | | | | | | prevent multiple slashes in a row when building URLs.
* | | Merge pull request #1031 from owncloud/external_storage_ui_feedbackMichael Gapczynski2013-02-2717-182/+397
|\ \ \ | | | | | | | | External Storage UI Improvements
| * | | 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 ↵Jörn Friedrich Dreyer2013-02-201-3/+3
| | | | | | | | | | | | | | | | | | | | always bubble up here
| * | | | Merge branch 'master' into external_storage_ui_feedbackMichael Gapczynski2013-02-19593-9922/+11746
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_external/js/settings.js apps/files_external/lib/smb.php apps/files_external/templates/settings.php lib/files/storage/common.php
| * | | | | 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
| | | | | | | |
| * | | | | | | Replace another mount point placeholderMichael Gapczynski2013-02-111-1/+1
| | | | | | | |
| * | | | | | | Merge branch 'master' into external_storage_ui_feedbackMichael Gapczynski2013-02-111552-42741/+125927
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_external/js/dropbox.js apps/files_external/js/google.js apps/files_external/js/settings.js apps/files_external/lib/amazons3.php apps/files_external/lib/dropbox.php apps/files_external/lib/google.php apps/files_external/lib/smb.php apps/files_external/lib/swift.php apps/files_external/lib/webdav.php lib/filestorage.php
| * | | | | | | | Change wordingsMichael Gapczynski2013-02-111-3/+3
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into external_storage_ui_feedbackMichael Gapczynski2013-01-09585-9876/+18963
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_external/lib/webdav.php
| * | | | | | | | | Set status to waiting for Dropbox and Google Drive while authenticatingMichael Gapczynski2013-01-092-0/+6
| | | | | | | | | |
| * | | | | | | | | Remove accidentally included fileMichael Gapczynski2013-01-021-5/+0
| | | | | | | | | |
| * | | | | | | | | Listen to checkbox changes as wellMichael Gapczynski2013-01-021-0/+4
| | | | | | | | | |
| * | | | | | | | | Fix 'Grant Access' button for multiple Google Drive mount points and prevent ↵Michael Gapczynski2013-01-023-11/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | multiple scripts being added
| * | | | | | | | | Turn off async for saving mount points, improve input detection for Google ↵Michael Gapczynski2013-01-013-71/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and Dropbox 'Grant Access' buttons
| * | | | | | | | | Fix problems with chosen multiselectMichael Gapczynski2012-12-281-15/+31
| | | | | | | | | |
| * | | | | | | | | Fix some of the default mount points creating sub folders i.e. SMB / CIFS, ↵Michael Gapczynski2012-12-281-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ownCloud / WebDAV
| * | | | | | | | | Move storage backend tests from constructor to test functionMichael Gapczynski2012-12-289-26/+26
| | | | | | | | | |
| * | | | | | | | | Fix last commit's variableMichael Gapczynski2012-12-261-2/+1
| | | | | | | | | |
| * | | | | | | | | Listen to paste events for dropbox configurationMichael Gapczynski2012-12-261-4/+15
| | | | | | | | | |
| * | | | | | | | | Change callback url for dropbox as wellMichael Gapczynski2012-12-261-1/+1
| | | | | | | | | |
| * | | | | | | | | Save configuration after paste events and 2 seconds after typingMichael Gapczynski2012-12-261-2/+17
| | | | | | | | | |
| * | | | | | | | | Prevent javascript error if no value is set for the multiselectMichael Gapczynski2012-12-241-1/+6
| | | | | | | | | |
| * | | | | | | | | Change callback url to path only in case oauth parameters are still in urlMichael Gapczynski2012-12-241-1/+1
| | | | | | | | | |
| * | | | | | | | | Show status icons for mount points in external storage UIMichael Gapczynski2012-12-2415-107/+203
| | | | | | | | | |
* | | | | | | | | | Merge pull request #1967 from eMerzh/refix_1931Thomas Müller2013-02-271-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Refix #1931
| * | | | | | | | | | Refix #1931Brice Maron2013-02-271-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #1964 from owncloud/versions_cleanupFrank Karlitschek2013-02-275-42/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Versions cleanup
| * | | | | | | | | | remove admin settings from app.phpBjörn Schießle2013-02-271-2/+0
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into versions_cleanupBjörn Schießle2013-02-27217-4884/+4992
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | rename History to VersionsBjörn Schießle2013-02-271-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | remove admin settings for versionsBjörn Schießle2013-02-274-38/+0
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1962 from owncloud/big_upload_fixBernhard Posselt2013-02-271-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | timeout after a longer time
| * | | | | | | | | | | timeout after a longer timeBernhard Posselt2013-02-271-2/+2
| | | | | | | | | | | |
* | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-27201-4833/+4927
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #1956 from owncloud/session-error-formatBart Visscher2013-02-271-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | add styles before session init
| * | | | | | | | | | | only add style.css to initsessionBernhard Posselt2013-02-271-1/+2
| | | | | | | | | | | |