Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | change 'update' to more understandable 'change', fix #10408 | Jan-Christoph Borchardt | 2014-12-18 | 1 | -1/+1 |
| | |||||
* | 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 |
| | | |||||
* | | Hide submit button after password change | Lukas Reschke | 2014-11-17 | 1 | -0/+3 |
| | | | | | | | | Creating a new key pair can take 1-2 seconds. So it could happen that the user click the "Reset password" button again which can lead to many nasty things, e.g. we could create two new key pairs in parallel. | ||||
* | | Warn for password reset when files_encryption is enabled | Lukas Reschke | 2014-11-17 | 1 | -13/+6 |
|/ | | | | | | | | This patch wil warn the user of the consequences when resetting the password and requires checking a checkbox (as we had in the past) to reset a password. Furthermore I updated the code to use our new classes and added some unit tests for it :dancers: Fixes https://github.com/owncloud/core/issues/11438 | ||||
* | Merge pull request #12158 from owncloud/drop-snapjs | Morris Jobke | 2014-11-13 | 1 | -785/+0 |
|\ | | | | | remove unneeded snap.js - followup to #11985 - ref #12156 | ||||
| * | remove unneeded snap.js - followup to #11985 - ref #12156 | Morris Jobke | 2014-11-13 | 1 | -785/+0 |
| | | |||||
* | | Merge pull request #12005 from owncloud/bower-multiselect | blizzz | 2014-11-13 | 1 | -705/+0 |
|\ \ | |/ |/| | Move multiselect to user_ldap | ||||
| * | Migrate multiselect to user_ldap | Morris Jobke | 2014-11-13 | 1 | -705/+0 |
| | | |||||
* | | Merge pull request #9177 from owncloud/jsdocexperiment | Vincent Petry | 2014-11-13 | 4 | -7/+60 |
|\ \ | |/ |/| | Improved JS Docs + added build script for JS Docs | ||||
| * | Improved Javascript docs for JSDoc | Vincent Petry | 2014-10-31 | 4 | -7/+60 |
| | | | | | | | | | | | | Added namespaces so that JSDoc can find them. Fixed a few warnings. Improved some comments. | ||||
* | | Merge pull request #11929 from owncloud/fix-db-center | Jan-Christoph Borchardt | 2014-11-11 | 1 | -0/+14 |
|\ \ | | | | | | | fixes not centered database chooser on setup page | ||||
| * | | fixes not centered database chooser on setup page | Morris Jobke | 2014-11-03 | 1 | -0/+14 |
| |/ | | | | | | | * fixes #11927 | ||||
* | | bower zxcvbn | Morris Jobke | 2014-11-06 | 1 | -1/+1 |
| | | |||||
* | | manage select2 via bower | Morris Jobke | 2014-11-06 | 54 | -4761/+0 |
| | | |||||
* | | bower underscore | Morris Jobke | 2014-11-05 | 2 | -1346/+2 |
| | | |||||
* | | bower handlebars | Morris Jobke | 2014-11-05 | 1 | -2746/+0 |
| | | |||||
* | | Merge pull request #11936 from owncloud/bower-jquery | Lukas Reschke | 2014-11-05 | 5 | -10331/+2 |
|\ \ | | | | | | | Bower jquery | ||||
| * | | migrate jQuery to bower | Morris Jobke | 2014-11-04 | 5 | -10331/+2 |
| | | | |||||
* | | | drop unused jquery.placeholder | Morris Jobke | 2014-11-05 | 2 | -217/+0 |
| | | | |||||
* | | | drop jquery.inview as it is unused | Morris Jobke | 2014-11-05 | 3 | -190/+0 |
| | | | |||||
* | | | drop listview.js | Morris Jobke | 2014-11-04 | 1 | -71/+0 |
|/ / | | | | | | | * isn't used in core and isn't mentioned in documentation | ||||
* / | replace moment.js with bower version | Morris Jobke | 2014-11-03 | 2 | -9085/+4 |
|/ | | | | * fix JS unit tests | ||||
* | Include core translations | Vincent Petry | 2014-10-29 | 1 | -9/+0 |
| | | | | | | | | | | | | | Moved search result type translations to search.js Load JS translations earlier Translations need to be loaded earlier to make sure that some JS files like search.js get access to translations at this time. This requires the template initialization to be moved to after session initialization, because only after the session we have access to the current language. | ||||
* | Added OC.L10N namespace with translation functions | Vincent Petry | 2014-10-29 | 5 | -128/+286 |
| | | | | | | | | | | | Added addTranslations and fixed de.js file Fixed de.js to use OC.L10N.register() and use to correct expected format. Added JS unit tests for OC.L10N class Include translations JS script for all apps | ||||
* | Merge pull request #11708 from owncloud/fix-momentjs | Vincent Petry | 2014-10-27 | 1 | -0/+6 |
|\ | | | | | Setting moment locale based on user selection |