Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-16 | 6 | -0/+6 |
| | |||||
* | Merge pull request #12360 from owncloud/files-tags | Lukas Reschke | 2014-12-15 | 17 | -8/+1182 |
|\ | | | | | Add favorites to files app | ||||
| * | Fixed small code style issues | Vincent Petry | 2014-12-15 | 5 | -12/+16 |
| | | |||||
| * | Remove spinner when toggling file favorite | Vincent Petry | 2014-12-15 | 1 | -9/+14 |
| | | |||||
| * | Fixed has-favorites CSS | Vincent Petry | 2014-12-15 | 3 | -2/+5 |
| | | |||||
| * | shift actions to the left a bit to account for right shift due to favorites ↵ | Jan-Christoph Borchardt | 2014-12-15 | 1 | -0/+1 |
| | | | | | | | | action, not not overlap with size info | ||||
| * | add CSS to shift header to account for when favorites are present | Jan-Christoph Borchardt | 2014-12-15 | 1 | -0/+8 |
| | | |||||
| * | Use star icon for favorites | Vincent Petry | 2014-12-15 | 2 | -10/+44 |
| | | |||||
| * | Correctly replace favorites icon when re-rendering file actions | Vincent Petry | 2014-12-15 | 1 | -1/+1 |
| | | |||||
| * | Added favorites feature to the files app | Vincent Petry | 2014-12-15 | 17 | -8/+1127 |
| | | |||||
* | | Merge pull request #12555 from owncloud/app_specific_search | Jörn Friedrich Dreyer | 2014-12-15 | 1 | -1/+1 |
|\ \ | |/ |/| | introduce inApps[] filter for search via ajax query | ||||
| * | introduce inApps[] filter for search via ajax query, make file results show ↵ | Jörn Friedrich Dreyer | 2014-12-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | up in files app only use more flexible return type check array with !empty instead of count | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-15 | 18 | -0/+18 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-14 | 128 | -128/+128 |
| | | |||||
* | | Merge pull request #12639 from owncloud/bad_mtime_format | Morris Jobke | 2014-12-13 | 2 | -3/+29 |
|\ \ | | | | | | | Fix formatting of bad dates from external storages | ||||
| * | | Return ? if mtime is 0 or -1 | Robin McCorkell | 2014-12-12 | 2 | -3/+29 |
| | | | | | | | | | | | | Tooltip contains 'Unable to determine date'. Fixes #6395 | ||||
* | | | Merge pull request #12795 from owncloud/files-layoutchanges | Morris Jobke | 2014-12-13 | 3 | -39/+59 |
|\ \ \ | | | | | | | | | Move file thumbnail element into the label tag | ||||
| * | | | Replace input checkbox CSS selector with .electCheckBox | Vincent Petry | 2014-12-11 | 2 | -22/+18 |
| | | | | |||||
| * | | | Move file thumbnail into the label element | Vincent Petry | 2014-12-11 | 3 | -18/+42 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-13 | 2 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #12527 from owncloud/js-pluginsystem | Robin Appelman | 2014-12-12 | 1 | -0/+6 |
|\ \ \ \ | | | | | | | | | | | Simple Plugin system for Javascript | ||||
| * | | | | Simple Plugin system for Javascript | Vincent Petry | 2014-12-01 | 1 | -0/+6 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #12698 from owncloud/handle_readonly_shared_files | Morris Jobke | 2014-12-12 | 4 | -8/+54 |
|\ \ \ \ | |_|/ / |/| | | | Handle readonly shared files | ||||
| * | | | show readonly message in file conflict dialog, make it always selected | Jörn Friedrich Dreyer | 2014-12-11 | 4 | -8/+54 |
| | |/ | |/| | |||||
* | | | Merge pull request #11892 from owncloud/remove_triggerupdate | Thomas Müller | 2014-12-10 | 2 | -34/+32 |
|\ \ \ | | | | | | | | | Remove triggerupdate.php & add quiet option for CLI scanner | ||||
| * | | | make path absolute | Jörn Friedrich Dreyer | 2014-12-10 | 1 | -7/+11 |
| | | | | |||||
| * | | | add quiet option, ref #8794 | Jörn Friedrich Dreyer | 2014-12-04 | 1 | -9/+18 |
| | | | | |||||
| * | | | remove triggerupdate, ref #11872 | Jörn Friedrich Dreyer | 2014-12-04 | 2 | -26/+11 |
| |/ / | |||||
* | | | Merge pull request #11214 from owncloud/issue/10836 | Morris Jobke | 2014-12-09 | 2 | -0/+2 |
|\ \ \ | | | | | | | | | Add an option to disallow sending sharing emails to non-owncloud users | ||||
| * | | | Add an option to disallow sending sharing emails to non-owncloud users | Joas Schilling | 2014-12-09 | 2 | -0/+2 |
| | | | | | | | | | | | | | | | | Fix #10836 | ||||
* | | | | Merge pull request #12568 from owncloud/autoload-encryption-classes | Joas Schilling | 2014-12-09 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Fix namespaces of encryption classes and encryption tests | ||||
| * | | | | Fix namespace of Files_Encryption outside of the app | Joas Schilling | 2014-12-09 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #12688 from owncloud/rename-alt | Lukas Reschke | 2014-12-09 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | introduce alt text for rename icon - fixes #12067 | ||||
| * | | | | introduce alt text for rename icon - fixes #12067 | Morris Jobke | 2014-12-08 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Merge pull request #12709 from owncloud/fix-11955 | Morris Jobke | 2014-12-09 | 1 | -0/+3 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Skip headers that can not be split | ||||
| * | | | | Skip headers that can not be split | Victor Dubiniuk | 2014-12-08 | 1 | -0/+3 |
| |/ / / | |||||
* / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-09 | 148 | -254/+0 |
|/ / / | |||||
* | | | Merge pull request #12394 from owncloud/files-fileactionsimprovements | Lukas Reschke | 2014-12-08 | 2 | -113/+286 |
|\ \ \ | | | | | | | | | Improve FileActions JS to allow for custom rendering | ||||
| * | | | Improve FileActions JS to allow for custom rendering | Vincent Petry | 2014-11-24 | 2 | -113/+286 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves the OCA.Files.FileActions class to support passing a "render" function in the action object. The default function "_defaultRenderFunction" is used by default and renders actions in the usual actions container. Moved "Rename" and "Delete" to custom render functions. | ||||
* | | | | Merge pull request #11485 from brumsoel/master | Lukas Reschke | 2014-12-05 | 2 | -3/+3 |
|\ \ \ \ | |_|/ / |/| | | | Fix timestamp comparator return value | ||||
| * | | | Modified filesort test cases to test for large sizes & timestamps | brumsel | 2014-12-03 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'upstream/master' | brumsel | 2014-12-03 | 385 | -5520/+11283 |
| |\ \ \ | |||||
| * | | | | Fix timestamp comparator return value | brumsoel | 2014-10-08 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-04 | 2 | -0/+2 |
| |/ / / |/| | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-03 | 2 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #12333 from owncloud/delete-selected-files | Morris Jobke | 2014-12-02 | 3 | -10/+42 |
|\ \ \ \ | |_|_|/ |/| | | | Fix deleting non deletable files by selecting them | ||||
| * | | | Add js unit test | Robin Appelman | 2014-11-26 | 1 | -7/+27 |
| | | | | |||||
| * | | | Dont show the delete button for selected files if one of the selected files ↵ | Robin Appelman | 2014-11-26 | 1 | -2/+12 |
| | | | | | | | | | | | | | | | | is not deletable | ||||
| * | | | Check if files are deletable before trying to delete them | Robin Appelman | 2014-11-26 | 1 | -1/+3 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-28 | 2 | -0/+2 |
| | | | |