| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | [files_encryption] Use p() instead of echo() | Lukas Reschke | 2013-02-27 | 2 | -8/+8 |
| | | |||||
| * | [Files] Use htmlspecialchars() | Lukas Reschke | 2013-02-27 | 1 | -2/+2 |
| | | |||||
| * | [Files] Use p() instead of echo | Lukas Reschke | 2013-02-27 | 6 | -83/+83 |
| | | |||||
| * | Remove the template autoescaping | Lukas Reschke | 2013-02-27 | 1 | -3/+1 |
| | | | | | Ref #1963 | ||||
| * | Merge pull request #1031 from owncloud/external_storage_ui_feedback | Michael Gapczynski | 2013-02-27 | 17 | -182/+397 |
| |\ | | | | | External Storage UI Improvements | ||||
| | * | Fix Dropbox and Google ui | Michael Gapczynski | 2013-02-25 | 2 | -11/+11 |
| | | | |||||
| | * | Merge branch 'master' into external_storage_ui_feedback | Michael Gapczynski | 2013-02-25 | 536 | -4787/+9431 |
| | |\ | |||||
| | * | | attach on() events to external storage table, dom events in the table will ↵ | Jörn Friedrich Dreyer | 2013-02-20 | 1 | -3/+3 |
| | | | | | | | | | | | | | always bubble up here | ||||
| | * | | Merge branch 'master' into external_storage_ui_feedback | Michael Gapczynski | 2013-02-19 | 593 | -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 strings | Thomas Mueller | 2013-02-13 | 2 | -7/+2 |
| | | | | | |||||
| | * | | | adding spinner while talking to the backend | Thomas Mueller | 2013-02-12 | 2 | -2/+7 |
| | | | | | |||||
| | * | | | Merge branch 'master' into external_storage_ui_feedback | Thomas Mueller | 2013-02-12 | 313 | -3631/+15858 |
| | |\ \ \ | |||||
| | * | | | | fixing namespace | Thomas Mueller | 2013-02-12 | 2 | -3/+3 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' into external_storage_ui_feedback | Thomas Mueller | 2013-02-12 | 131 | -627/+957 |
| | |\ \ \ \ | |||||
| | * | | | | | fixing namespace | Thomas Mueller | 2013-02-12 | 2 | -3/+3 |
| | | | | | | | |||||
| | * | | | | | Replace another mount point placeholder | Michael Gapczynski | 2013-02-11 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'master' into external_storage_ui_feedback | Michael Gapczynski | 2013-02-11 | 1552 | -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 wordings | Michael Gapczynski | 2013-02-11 | 1 | -3/+3 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'master' into external_storage_ui_feedback | Michael Gapczynski | 2013-01-09 | 585 | -9876/+18963 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_external/lib/webdav.php | ||||
| | * | | | | | | | Set status to waiting for Dropbox and Google Drive while authenticating | Michael Gapczynski | 2013-01-09 | 2 | -0/+6 |
| | | | | | | | | | |||||
| | * | | | | | | | Remove accidentally included file | Michael Gapczynski | 2013-01-02 | 1 | -5/+0 |
| | | | | | | | | | |||||
| | * | | | | | | | Listen to checkbox changes as well | Michael Gapczynski | 2013-01-02 | 1 | -0/+4 |
| | | | | | | | | | |||||
| | * | | | | | | | Fix 'Grant Access' button for multiple Google Drive mount points and prevent ↵ | Michael Gapczynski | 2013-01-02 | 3 | -11/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | multiple scripts being added | ||||
| | * | | | | | | | Turn off async for saving mount points, improve input detection for Google ↵ | Michael Gapczynski | 2013-01-01 | 3 | -71/+123 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and Dropbox 'Grant Access' buttons | ||||
| | * | | | | | | | Fix problems with chosen multiselect | Michael Gapczynski | 2012-12-28 | 1 | -15/+31 |
| | | | | | | | | | |||||
| | * | | | | | | | Fix some of the default mount points creating sub folders i.e. SMB / CIFS, ↵ | Michael Gapczynski | 2012-12-28 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ownCloud / WebDAV | ||||
| | * | | | | | | | Move storage backend tests from constructor to test function | Michael Gapczynski | 2012-12-28 | 9 | -26/+26 |
| | | | | | | | | | |||||
| | * | | | | | | | Fix last commit's variable | Michael Gapczynski | 2012-12-26 | 1 | -2/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Listen to paste events for dropbox configuration | Michael Gapczynski | 2012-12-26 | 1 | -4/+15 |
| | | | | | | | | | |||||
| | * | | | | | | | Change callback url for dropbox as well | Michael Gapczynski | 2012-12-26 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Save configuration after paste events and 2 seconds after typing | Michael Gapczynski | 2012-12-26 | 1 | -2/+17 |
| | | | | | | | | | |||||
| | * | | | | | | | Prevent javascript error if no value is set for the multiselect | Michael Gapczynski | 2012-12-24 | 1 | -1/+6 |
| | | | | | | | | | |||||
| | * | | | | | | | Change callback url to path only in case oauth parameters are still in url | Michael Gapczynski | 2012-12-24 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Show status icons for mount points in external storage UI | Michael Gapczynski | 2012-12-24 | 15 | -107/+203 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #1967 from eMerzh/refix_1931 | Thomas Müller | 2013-02-27 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Refix #1931 | ||||
| | * | | | | | | | | Refix #1931 | Brice Maron | 2013-02-27 | 1 | -1/+1 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge pull request #1964 from owncloud/versions_cleanup | Frank Karlitschek | 2013-02-27 | 5 | -42/+2 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Versions cleanup | ||||
| | * | | | | | | | | remove admin settings from app.php | Björn Schießle | 2013-02-27 | 1 | -2/+0 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge branch 'master' into versions_cleanup | Björn Schießle | 2013-02-27 | 217 | -4884/+4992 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | rename History to Versions | Björn Schießle | 2013-02-27 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | remove admin settings for versions | Björn Schießle | 2013-02-27 | 4 | -38/+0 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #1962 from owncloud/big_upload_fix | Bernhard Posselt | 2013-02-27 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | timeout after a longer time | ||||
| | * | | | | | | | | | timeout after a longer time | Bernhard Posselt | 2013-02-27 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-02-27 | 201 | -4833/+4927 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge pull request #1956 from owncloud/session-error-format | Bart Visscher | 2013-02-27 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | add styles before session init | ||||
| | * | | | | | | | | | only add style.css to initsession | Bernhard Posselt | 2013-02-27 | 1 | -1/+2 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | add css and scripts before session init | Bernhard Posselt | 2013-02-27 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge pull request #1961 from owncloud/trans_fix | Bart Visscher | 2013-02-27 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | fixed bug that would cause a failure because of undefined variable inst... | ||||
| | * | | | | | | | | | | fixed bug that would cause a failure because of undefined variable instead ↵ | Bernhard Posselt | 2013-02-27 | 1 | -1/+1 |
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of %s in a translation string | ||||
| * | | | | | | | | | | Merge pull request #1953 from owncloud/escape_regular_expressions | Frank Karlitschek | 2013-02-27 | 2 | -4/+3 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | escape regular expressions; fix typo in variable name | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |