Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into load-apps-proper-master | Thomas Müller | 2014-03-21 | 96 | -1294/+1687 |
|\ | | | | | | | | | | | | | Conflicts: apps/files/ajax/rawlist.php cron.php ocs/v1.php | ||||
| * | remove executable flag for file-upload.js | Morris Jobke | 2014-03-20 | 1 | -0/+0 |
| | | |||||
| * | Merge pull request #7814 from oskholl/master | Morris Jobke | 2014-03-20 | 1 | -0/+2 |
| |\ | | | | | | | Fix: 'Upload button tooltip doesn't disappear' | ||||
| | * | Comment moved to prevent 'Line is too long' warning. | Oskar Hollmann | 2014-03-19 | 1 | -1/+2 |
| | | | |||||
| | * | Fix: 'Upload button tooltip doesn't disappear' | Oskar Hollmann | 2014-03-19 | 1 | -0/+1 |
| | | | | | | | | | | | | Fixes issue #7461. Tipsy tooltip must be hidden when the upload starts. Otherwise it covers the progress bar and stays in DOM. | ||||
| * | | Merge pull request #7651 from owncloud/close-session-faster-master | Thomas Müller | 2014-03-20 | 12 | -8/+14 |
| |\ \ | | | | | | | | | Close session faster | ||||
| | * \ | Merge branch 'master' into close-session-faster-master | Thomas Müller | 2014-03-19 | 6 | -149/+72 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/ajax/upgrade.php | ||||
| | * \ \ | Merge branch 'master' into close-session-faster-master | Thomas Müller | 2014-03-17 | 65 | -344/+548 |
| | |\ \ \ | |||||
| | * | | | | close the session on all file operations | Thomas Müller | 2014-03-10 | 13 | -9/+15 |
| | | | | | | |||||
| * | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-20 | 50 | -102/+58 |
| | |_|_|/ | |/| | | | |||||
| * | | | | Improve sorting performance of large lists of files | Robin Appelman | 2014-03-19 | 2 | -9/+11 |
| | |_|/ | |/| | | |||||
| * | | | Merge pull request #7790 from owncloud/fix/7788 | Thomas Müller | 2014-03-19 | 4 | -149/+62 |
| |\ \ \ | | | | | | | | | | | drop file cache migration OC5 -> OC6 | ||||
| | * | | | drop file cache migration OC5 -> OC6 | Thomas Müller | 2014-03-18 | 4 | -149/+62 |
| | | |/ | | |/| | |||||
| * / | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-19 | 2 | -0/+10 |
| |/ / | |||||
| * | | Merge pull request #7734 from owncloud/icon-class-remove | Morris Jobke | 2014-03-16 | 1 | -4/+4 |
| |\ \ | | | | | | | | | remove unneeded icon class | ||||
| | * | | remove unneeded icon class | Jan-Christoph Borchardt | 2014-03-14 | 1 | -4/+4 |
| | | | | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-16 | 1 | -0/+5 |
| | | | | |||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-15 | 3 | -0/+11 |
| |/ / | |||||
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-13 | 4 | -0/+110 |
| | | | |||||
| * | | Merge pull request #7671 from fpiraneo/patch-1 | Vincent Petry | 2014-03-13 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Update index.php | ||||
| | * | | Update index.php | Francesco Piraneo G. | 2014-03-11 | 1 | -1/+1 |
| | | | | | | | | | | | | On line #69 added id="selectedActionsList" to allow an easy adding of new actions customs apps wants to perform on selected files; | ||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-13 | 1 | -0/+5 |
| | | | | |||||
| * | | | Merge pull request #7681 from owncloud/remove-Sabre_DAV_Browser_Plugin-master | Lukas Reschke | 2014-03-12 | 1 | -1/+0 |
| |\ \ \ | | | | | | | | | | | remove Sabre_DAV_Browser_Plugin | ||||
| | * | | | remove Sabre_DAV_Browser_Plugin | Thomas Müller | 2014-03-12 | 1 | -1/+0 |
| | |/ / | |||||
| * / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-12 | 10 | -32/+78 |
| |/ / | |||||
| * / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-11 | 62 | -307/+335 |
| |/ | |||||
| * | Merge pull request #7629 from owncloud/files-allfileswarningtypo | Vincent Petry | 2014-03-10 | 1 | -1/+1 |
| |\ | | | | | | | Fixed log warning when deleting a single file | ||||
| | * | Fixed log warning when deleting a single file | Vincent Petry | 2014-03-07 | 1 | -1/+1 |
| | | | |||||
| * | | only initialise upload dropZone if public upload is allowed | IchEben | 2014-03-07 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #7592 from owncloud/fixstoragefreespace | Vincent Petry | 2014-03-06 | 2 | -499/+633 |
| |\ | | | | | | | Fixed upload issue when free space is not known (ex: FTP) | ||||
| | * | Fixed upload issue when free space is not known | Vincent Petry | 2014-03-06 | 1 | -1/+3 |
| | | | |||||
| | * | Added unit tests for "add()" method for file upload | Vincent Petry | 2014-03-06 | 2 | -499/+631 |
| | | | | | | | | | | | | | | | | | | - Added OC.Upload.init() to make the code testable - Added unit tests for the add() method of the uploader with some error cases | ||||
| * | | Merge branch 'master' into fix-7307 | Thomas Müller | 2014-03-06 | 6 | -34/+73 |
| |\| | | | | | | | | | | | | | | | | Conflicts: core/js/router.js settings/js/admin.js | ||||
| | * | Merge pull request #7575 from owncloud/issue/7571 | Vincent Petry | 2014-03-05 | 1 | -2/+2 |
| | |\ | | | | | | | | | Do not set #dir when on public.php | ||||
| | | * | Do not set #dir when on public.php | Joas Schilling | 2014-03-05 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | Fix #7571 | ||||
| | * | | Merge pull request #7531 from owncloud/dont_create_shared_folder | Björn Schießle | 2014-03-05 | 5 | -26/+61 |
| | |\ \ | | | |/ | | |/| | don't allow to create a file or folder named 'Shared' in the root folder | ||||
| | | * | don't allow to create a file or folder named 'Shared' in the root folder, ↵ | Bjoern Schiessle | 2014-03-05 | 5 | -26/+61 |
| | | | | | | | | | | | | | | | | also exclude all combinations of lower and upper case letters | ||||
| | * | | Merge branch 'master' into display-share-owner-master | Thomas Müller | 2014-02-28 | 8 | -71/+126 |
| | |\| | | | | | | | | | | | | | | | | | Conflicts: apps/files_sharing/lib/cache.php | ||||
| | * | | store the share owner in a data-attribute instead of a separate span | Thomas Müller | 2014-02-20 | 1 | -5/+9 |
| | | | | |||||
| | * | | adding share owner information to the file list | Thomas Müller | 2014-02-20 | 1 | -5/+5 |
| | | | | |||||
| * | | | fixing download url in files app | Thomas Müller | 2014-03-02 | 1 | -1/+1 |
| | | | | |||||
| * | | | Replace OC.Router.generate() with OC.generateUrl() | Thomas Müller | 2014-03-02 | 2 | -3/+5 |
| | |/ | |/| | |||||
| * | | Update rawlist to work with new fileinfo object | Robin Appelman | 2014-02-27 | 1 | -31/+28 |
| | | | |||||
| * | | coding style fixes, cut long lines, comments not on same lines, curly braces | Jan-Christoph Borchardt | 2014-02-26 | 1 | -8/+11 |
| | | | |||||
| * | | Merge pull request #7285 from owncloud/mimeicons-svg | Morris Jobke | 2014-02-24 | 4 | -17/+29 |
| |\ \ | | | | | | | | | Show svg mime icons when no preview is available | ||||
| | * | | rename url parameter | Robin Appelman | 2014-02-24 | 1 | -1/+1 |
| | | | | |||||
| | * | | Add url parameter to control whether previews should return 404 when the ↵ | Robin Appelman | 2014-02-21 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | mimetype is unsupported | ||||
| | * | | Make unit tests expect the svg icons | Robin Appelman | 2014-02-20 | 1 | -2/+6 |
| | | | | |||||
| | * | | Merge branch 'master' into mimeicons-svg | Robin Appelman | 2014-02-20 | 7 | -40/+105 |
| | |\| | |||||
| | * | | Fix svg icons for public shares and external/shared files | Robin Appelman | 2014-02-19 | 1 | -3/+3 |
| | | | |