summaryrefslogtreecommitdiffstats
path: root/apps/files_external
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-03-271-0/+4
|
* [tx-robot] updated from transifexJenkins for ownCloud2013-03-201-0/+6
|
* [tx-robot] updated from transifexJenkins for ownCloud2013-03-191-1/+3
|
* [tx-robot] updated from transifexJenkins for ownCloud2013-03-161-0/+2
|
* Merge remote-tracking branch 'upstream/master'sherbrecher2013-03-15123-894/+27942
|\ | | | | | | | | Conflicts: apps/files_external/templates/settings.php
| * [tx-robot] updated from transifexJenkins for ownCloud2013-03-141-0/+5
| |
| * [tx-robot] updated from transifexJenkins for ownCloud2013-03-131-0/+2
| |
| * [tx-robot] updated from transifexJenkins for ownCloud2013-03-121-4/+6
| |
| * Store the global mount configuration file in the datadirRobin Appelman2013-03-101-2/+4
| |
| * [tx-robot] updated from transifexJenkins for ownCloud2013-03-081-2/+4
| |
| * [tx-robot] updated from transifexJenkins for ownCloud2013-03-072-1/+15
| |
| * [tx-robot] updated from transifexJenkins for ownCloud2013-03-063-3/+9
| |
| * Merge pull request #2030 from j-ed/masterBernhard Posselt2013-03-041-10/+10
| |\ | | | | | | suppress log messages like `include path for class ... 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\/\"`
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-03-032-0/+4
| | |
| * | Remove uneeded sanitizeHTMLLukas Reschke2013-03-021-1/+1
| | |
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-03-022-0/+4
| | |
| * | Merge masterLukas Reschke2013-03-0145-0/+67
| |\ \
| | * | [tx-robot] updated from transifexJenkins for ownCloud2013-03-0145-0/+67
| | | |
| * | | Merge masterLukas Reschke2013-02-2846-176/+0
| |\| |
| | * | [tx-robot] updated from transifexJenkins for ownCloud2013-02-2846-176/+0
| | |/
| * / [files_external] From echo to pLukas Reschke2013-02-273-58/+58
| |/
| * 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-256-28/+46
| | |\
| | * | 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-1914-87/+67
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-125-1/+11
| | |\ \ \
| | * | | | fixing namespaceThomas Mueller2013-02-122-3/+3
| | | | | |
| | * | | | Merge branch 'master' into external_storage_ui_feedbackThomas Mueller2013-02-123-6/+12
| | |\ \ \ \
| | * | | | | 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-1160-320/+26450
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0919-11/+127
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | |