aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | 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
| | | |
| * | | 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
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-2875-292/+29
| | | |
* | | | 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-2716-182/+390
|\ \ \ | | | | | | | | External Storage UI Improvements
| * | | Fix Dropbox and Google uiMichael Gapczynski2013-02-252-11/+11
| | | |
| * | | Merge branch 'master' into external_storage_ui_feedbackMichael Gapczynski2013-02-25124-595/+1129
| |\ \ \
| * | | | 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-19116-262/+801
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1216-22/+146
| |\ \ \ \ \
| * | | | | | fixing namespaceThomas Mueller2013-02-122-3/+3
| | | | | | |
| * | | | | | Merge branch 'master' into external_storage_ui_feedbackThomas Mueller2013-02-1219-7/+102
| |\ \ \ \ \ \
| * | | | | | | 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-11503-3541/+37533
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-09144-184/+896
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-287-26/+17
| | | | | | | | | |
| * | | | | | | | | 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
| | | | | | | | | |
* | | | | | | | | | remove admin settings from app.phpBjörn Schießle2013-02-271-2/+0
| | | | | | | | | |