Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #18286 from owncloud/stable8-backport-17785 | Morris Jobke | 2015-08-19 | 1 | -1/+2 |
|\ | | | | | [stable8] fix mobile scrolling, lower sidebar sensitivity, fix #11193 | ||||
| * | fix mobile scrolling, lower sidebar sensitivity, fix #11193 | Jan-Christoph Borchardt | 2015-08-13 | 1 | -1/+2 |
| | | |||||
* | | tests for _parseTime with hex and empty strings | Morris Jobke | 2015-07-29 | 2 | -0/+6 |
| | | |||||
* | | Fix parsing of sharetime as string | Morris Jobke | 2015-07-29 | 2 | -0/+31 |
|/ | | | | | | | In some cases the ajax/share.php will return the share time as string. If this is the case it would get parsed completely wrong and cause the share dropdown to not work anymore. This change will properly cast the string to an interger and also fallback if this is not possible. | ||||
* | Added unit test for reshare by share owner | Vincent Petry | 2015-06-25 | 1 | -0/+26 |
| | | | | | Conflicts: core/js/tests/specs/shareSpec.js | ||||
* | Do not restrict permissions for the original owner | Joas Schilling | 2015-06-25 | 1 | -1/+1 |
| | | | | | Conflicts: core/js/share.js | ||||
* | Merge pull request #16744 from owncloud/backport-15260 | Vincent Petry | 2015-06-16 | 1 | -0/+55 |
|\ | | | | | [stable8] Backport scrollbar fixes | ||||
| * | fix scrutinizer issues | Jan-Christoph Borchardt | 2015-06-04 | 1 | -6/+9 |
| | | |||||
| * | adjust controls bar width to not overlay scrollbar | Jan-Christoph Borchardt | 2015-06-04 | 1 | -0/+52 |
| | | |||||
* | | Merge pull request #16596 from owncloud/backport-16565 | Joas Schilling | 2015-06-09 | 1 | -0/+5 |
|\ \ | | | | | | | Add check for availability of /dev/urandom | ||||
| * | | Add check for availability of /dev/urandom | Lukas Reschke | 2015-05-27 | 1 | -0/+5 |
| | | | | | | | | | | | | Backport of https://github.com/owncloud/core/pull/16565 to stable8 | ||||
* | | | Upgrade jquery-migrate to 1.2.1 | Morris Jobke | 2015-06-09 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Fix to make sure expiration date is properly set | Roeland Jago Douma | 2015-05-18 | 2 | -10/+53 |
|/ | | | | | | | | This did not happen correctly when the password was enforced since a different code path was taken. * moved generation of the default date string to separate function * added unit test | ||||
* | Merge pull request #15797 from owncloud/stable8-backport-15489 | Jörn Friedrich Dreyer | 2015-05-13 | 1 | -0/+4 |
|\ | | | | | Stable8 backport 15489 | ||||
| * | more robust share dialog | Morris Jobke | 2015-04-22 | 1 | -0/+4 |
| | | |||||
* | | fix filepicker | Morris Jobke | 2015-04-14 | 1 | -1/+1 |
|/ | | | | | | * add ability to filter for mimetype * fixes #15526 * fixes #11563 | ||||
* | Remove hard dependency on cURL for 8.0 | Lukas Reschke | 2015-03-23 | 1 | -0/+5 |
| | | | | | | This removes the recently introduced hard dependency on cURL for 8.0, for 8.1 it will still stay there. Instead a warning will now be shown to the user asking to install the PHP cURL extension within the administrative interface of ownCloud. | ||||
* | 3rd-party apps are disabled on upgrade - refs #14026 | Thomas Müller | 2015-02-25 | 1 | -0/+3 |
| | | | | | Conflicts: lib/private/app.php | ||||
* | generate valid human readable text for 0 - fixed #9342 | Thomas Müller | 2015-02-12 | 2 | -1/+3 |
| | |||||
* | Indicate that the share owner is remote in the filelist | Joas Schilling | 2015-01-27 | 2 | -3/+6 |
| | |||||
* | Merge pull request #13323 from owncloud/move-search | Lukas Reschke | 2015-01-15 | 2 | -2/+2 |
|\ | | | | | Move search to core/search | ||||
| * | adjust paths for search | Morris Jobke | 2015-01-14 | 2 | -2/+2 |
| | | |||||
* | | Read version and product name from update template | Vincent Petry | 2015-01-14 | 1 | -4/+8 |
|/ | | | | | | During upgrade, the config settings aren't always available due to base.php changes. This fix makes the update info page read the product name and version from the update template, which already had them. | ||||
* | Fix reshare permission issue | Vincent Petry | 2015-01-09 | 2 | -0/+158 |
| | | | | | The actual share permissions sent to the server on reshare are now based on possiblePermissions + permissions inherited from parent share | ||||
* | Add timeout for notifications | Morris Jobke | 2015-01-08 | 2 | -0/+134 |
| | | | | | | | | * options for timeout in seconds and if it contains HTML * if timeout is 0 it will show the message permanently * removes the notification after a given (default: 5 seconds) timeframe * based on work by @brantje * provide JS unit tests for notifications | ||||
* | Merge pull request #12687 from owncloud/auto-escape-t-placeholders | Morris Jobke | 2015-01-07 | 3 | -15/+43 |
|\ | | | | | Auto escape t placeholders | ||||
| * | Autoescape of placeholders in t() and p() - for JS | Morris Jobke | 2015-01-07 | 3 | -15/+43 |
| | | | | | | | | | | | | | | * add disableEscape parameter to disable this functionality * drop usage of escapeHTML() that is now done inside t() * add unit test for escaped and not escaped placeholder * proper JSDoc | ||||
* | | make OCA.Search.Files available in tests and for other apps | Jörn Friedrich Dreyer | 2015-01-02 | 1 | -1/+2 |
| | | |||||
* | | move search results below filelist, show hint when results are off screen, ↵ | Jörn Friedrich Dreyer | 2015-01-02 | 1 | -36/+1 |
| | | | | | | | | use js plugin mechanism | ||||
* | | add paged provider | Jörn Friedrich Dreyer | 2015-01-02 | 1 | -1/+1 |
| | | |||||
* | | move code from js.js to search.js in the search app | Jörn Friedrich Dreyer | 2015-01-02 | 1 | -58/+3 |
| | | |||||
* | | new OC.Search, add search result formatters and handlers, use full content ↵ | Jörn Friedrich Dreyer | 2015-01-02 | 1 | -20/+57 |
|/ | | | | width for results | ||||
* | Next step in server-to-server sharing next generation, see #12285 | Bjoern Schiessle | 2014-12-19 | 1 | -30/+52 |
| | | | | | | | | | | | | | | Beside some small improvements and bug fixes this will probably the final state for OC8. To test this you need to set up two ownCloud instances. Let's say: URL: myPC/firstOwnCloud user: user1 URL: myPC/secondOwnCloud user: user2 Now user1 can share a file with user2 by entering the username and the URL to the second ownCloud to the share-drop-down, in this case "user2@myPC/secondOwnCloud". The next time user2 login he will get a notification that he received a server-to-server share with the option to accept/decline it. If he accept it the share will be mounted. In both cases a event will be send back to user1 and add a notification to the activity stream that the share was accepted/declined. If user1 decides to unshare the file again from user2 the share will automatically be removed from the second ownCloud server and user2 will see a notification in his activity stream that user1@myPC/firstOwnCloud has unshared the file/folder from him. | ||||
* | Merge pull request #12948 from owncloud/wording | Jörn Friedrich Dreyer | 2014-12-19 | 1 | -2/+2 |
|\ | | | | | Wording fixes for sharing dialog | ||||
| * | change 'Allow Public Upload' to more understandable 'Allow editing', fix #10438 | Jan-Christoph Borchardt | 2014-12-18 | 1 | -1/+1 |
| | | |||||
| * | change 'update' to more understandable 'change', fix #10408 | Jan-Christoph Borchardt | 2014-12-18 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #12941 from owncloud/wave-accessibility-compliance | Morris Jobke | 2014-12-19 | 1 | -1/+5 |
|\ \ | | | | | | | Wave accessibility compliance | ||||
| * | | get rid of unnecessary alt and title attributes | Jan-Christoph Borchardt | 2014-12-18 | 1 | -1/+1 |
| | | | |||||
| * | | add missing input labels for Share dialog | Jan-Christoph Borchardt | 2014-12-18 | 1 | -0/+4 |
| |/ | |||||
* / | load showpassord.js conditionally in the template only if needed | Thomas Müller | 2014-12-16 | 2 | -29/+5 |
|/ | |||||
* | Merge pull request #12360 from owncloud/files-tags | Lukas Reschke | 2014-12-15 | 2 | -1/+21 |
|\ | | | | | Add favorites to files app | ||||
| * | Load handlebars in core | Vincent Petry | 2014-12-15 | 1 | -1/+2 |
| | | |||||
| * | Added favorites feature to the files app | Vincent Petry | 2014-12-15 | 1 | -0/+19 |
| | | |||||
* | | Merge pull request #12555 from owncloud/app_specific_search | Jörn Friedrich Dreyer | 2014-12-15 | 1 | -1/+8 |
|\ \ | | | | | | | 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/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | up in files app only use more flexible return type check array with !empty instead of count | ||||
* | | | bower jquery-ui - exported changes to a separate css file | Morris Jobke | 2014-12-13 | 2 | -14851/+1 |
| |/ |/| | |||||
* | | Merge pull request #12795 from owncloud/files-layoutchanges | Morris Jobke | 2014-12-13 | 2 | -5/+5 |
|\ \ | | | | | | | Move file thumbnail element into the label tag | ||||
| * | | Move file thumbnail into the label element | Vincent Petry | 2014-12-11 | 2 | -5/+5 |
| | | | |||||
* | | | Merge pull request #12527 from owncloud/js-pluginsystem | Robin Appelman | 2014-12-12 | 3 | -0/+115 |
|\ \ \ | | | | | | | | | Simple Plugin system for Javascript | ||||
| * | | | Simple Plugin system for Javascript | Vincent Petry | 2014-12-01 | 3 | -0/+115 |
| | |/ | |/| |