Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #13771 from owncloud/fix-humanfileSize | Lukas Reschke | 2015-02-12 | 2 | -1/+3 |
|\ | | | | | generate valid human readable text for 0 | ||||
| * | generate valid human readable text for 0 - fixed #9342 | Thomas Müller | 2015-01-29 | 2 | -1/+3 |
| | | |||||
* | | Second parameter is optional | Lukas Reschke | 2015-02-11 | 1 | -1/+1 |
|/ | | | | Makes my IDE happier. | ||||
* | 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 |
| | |/ | |/| | |||||
* | | | Merge pull request #12698 from owncloud/handle_readonly_shared_files | Morris Jobke | 2014-12-12 | 1 | -30/+43 |
|\ \ \ | |_|/ |/| | | Handle readonly shared files | ||||
| * | | show readonly message in file conflict dialog, make it always selected | Jörn Friedrich Dreyer | 2014-12-11 | 1 | -30/+43 |
| | | | |||||
* | | | improve update error page: remove box, make link visible, insert missing ↵ | Jan-Christoph Borchardt | 2014-12-10 | 1 | -3/+2 |
| | | | | | | | | | | | | space, remove line break | ||||
* | | | Add an option to disallow sending sharing emails to non-owncloud users | Joas Schilling | 2014-12-09 | 2 | -5/+20 |
| | | | | | | | | | | | | Fix #10836 | ||||
* | | | Check for working .htaccess via AJAX | Lukas Reschke | 2014-12-06 | 1 | -1/+6 |
|/ / | | | | | | | Fixes https://github.com/owncloud/core/issues/12650 | ||||
* | | Forward port of #12493 | Arthur Schiwon | 2014-12-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add ldap-search command to occ Conflicts: apps/user_ldap/appinfo/register_command.php LDAP search filter creation changes: 1. do not prepend * wildcard to search terms. Will result in faster search, but you don't find "foobar" when looking for "bar" 2. advanced behaviour when search string contains a space and multiple search attributes are present. The search string is split into single words. The resulting filter requires that each word at least appears once in any search attribute. This is supposed to return better results in big LDAPs. trim search string before passing it on | ||||
* | | move jstz to bower management | Morris Jobke | 2014-12-01 | 1 | -358/+0 |
|/ | |||||
* | Merge pull request #12359 from owncloud/fix-redirect-url-for-password-change | Thomas Müller | 2014-11-24 | 1 | -1/+5 |
|\ | | | | | Use `/` as redirect location if webroot is set to an empty value | ||||
| * | Use `/` as redirect location if webroot is set to an empty value | Lukas Reschke | 2014-11-21 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | If the webroot has been set to an empty value or ownCloud has been installed at the root location (`/``) there is a fair chance that the redirect for password resets does not work at all. This means that while the password is getting resetted the user is not redirected to the login page. I'm aware that it might be better to just set the webroot to `/` in those cases but this patch is better in the regard that it cannot break stuff. Thanks to @PVince81 for helping me debugging this. (I'm a moron and assumed it couldn't be THAT easy) Reported by @cdamken | ||||
* | | Add OCS API header per default | Lukas Reschke | 2014-11-21 | 1 | -1/+2 |
|/ | | | | Relieve @PVince from having to write it all the time ;-) | ||||
* | Merge pull request #12257 from owncloud/l10n-loadtranslationsfromjs | Vincent Petry | 2014-11-20 | 3 | -2/+106 |
|\ | | | | | Added function to load translations from JS | ||||
| * | Fix l10n promises | Vincent Petry | 2014-11-19 | 2 | -6/+11 |
| | | |||||
| * | Better use of promise in OC.L10N.load() | Vincent Petry | 2014-11-19 | 1 | -13/+8 |
| | | |||||
| * | Remove stray generateUrl | Vincent Petry | 2014-11-19 | 1 | -5/+0 |
| | | |||||
| * | Added function to load translations from JS | Vincent Petry | 2014-11-18 | 3 | -2/+111 |
| | | | | | | | | | | | | For apps that support async translation loading, a new function OC.L10N.load() can be used to asynchronously load the translations for a given app. | ||||
* | | Show spinner | Lukas Reschke | 2014-11-17 | 1 | -0/+1 |
| | |