summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-1712-14/+76
|
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-166-0/+24
|
* Merge pull request #12360 from owncloud/files-tagsLukas Reschke2014-12-152-1/+21
|\ | | | | Add favorites to files app
| * Load handlebars in coreVincent Petry2014-12-151-1/+2
| |
| * Added favorites feature to the files appVincent Petry2014-12-151-0/+19
| |
* | Merge pull request #12555 from owncloud/app_specific_searchJörn Friedrich Dreyer2014-12-151-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 Dreyer2014-12-101-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | up in files app only use more flexible return type check array with !empty instead of count
* | | Merge pull request #11991 from owncloud/bower-jquery-uiMorris Jobke2014-12-159-134/+349
|\ \ \ | |_|/ |/| | bower jquery-ui - exported changes to a separate css file
| * | bower jquery-ui - exported changes to a separate css fileMorris Jobke2014-12-139-134/+349
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-152-0/+28
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-146-0/+20
|/ /
* | Merge pull request #12795 from owncloud/files-layoutchangesMorris Jobke2014-12-132-5/+5
|\ \ | | | | | | Move file thumbnail element into the label tag
| * | Move file thumbnail into the label elementVincent Petry2014-12-112-5/+5
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-1318-44/+106
| | |
* | | Merge pull request #12527 from owncloud/js-pluginsystemRobin Appelman2014-12-123-0/+115
|\ \ \ | | | | | | | | Simple Plugin system for Javascript
| * | | Simple Plugin system for JavascriptVincent Petry2014-12-013-0/+115
| | |/ | |/|
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-126-0/+26
| | |
* | | Merge pull request #12698 from owncloud/handle_readonly_shared_filesMorris Jobke2014-12-121-30/+43
|\ \ \ | | | | | | | | Handle readonly shared files
| * | | show readonly message in file conflict dialog, make it always selectedJörn Friedrich Dreyer2014-12-111-30/+43
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-1220-2/+22
| | | |
* | | | Merge pull request #12781 from owncloud/jenkins-curl-open-basedirMorris Jobke2014-12-111-6/+46
|\ \ \ \ | |_|_|/ |/| | | [Jenkins only] curl open basedir
| * | | Check if open_basedir is setLukas Reschke2014-12-111-6/+46
| | | | | | | | | | | | | | | | | | | | | | | | The file:// protocol does not work with curl when an open_basedir is set. This fixes https://github.com/owncloud/core/issues/12016
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-1174-74/+0
|/ / /
* | | improve update error page: adjust line height of h2Jan-Christoph Borchardt2014-12-101-0/+1
| | |
* | | improve update error page: remove box, make link visible, insert missing ↵Jan-Christoph Borchardt2014-12-102-3/+7
| | | | | | | | | | | | space, remove line break
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-1084-0/+84
| | |
* | | Merge pull request #12664 from owncloud/fix-12164Thomas Müller2014-12-102-2/+6
|\ \ \ | | | | | | | | Use httphelper and cache response even when it is empty
| * | | Inject configVictor Dubiniuk2014-12-102-2/+3
| | | |
| * | | Use httphelper and cache response even when it emptyVictor Dubiniuk2014-12-062-2/+5
| | | |
* | | | Merge pull request #11214 from owncloud/issue/10836Morris Jobke2014-12-092-5/+20
|\ \ \ \ | | | | | | | | | | Add an option to disallow sending sharing emails to non-owncloud users
| * | | | Add an option to disallow sending sharing emails to non-owncloud usersJoas Schilling2014-12-092-5/+20
| | | | | | | | | | | | | | | | | | | | Fix #10836
* | | | | Merge pull request #12651 from owncloud/add-requesttoken-to-base-templateThomas Müller2014-12-091-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Add requesttoken to base template
| * | | | Add requesttoken to base templateLukas Reschke2014-12-051-1/+1
| |/ / / | | | | | | | | | | | | Potentially fixes https://github.com/owncloud/core/issues/12580
* / / / Check for working .htaccess via AJAXLukas Reschke2014-12-061-1/+6
|/ / / | | | | | | | | | Fixes https://github.com/owncloud/core/issues/12650
* | | Merge pull request #12561 from oparoz/vectoriconMorris Jobke2014-12-054-42/+24
|\ \ \ | |/ / |/| | Improve the bitmap and vector mime icons
| * | PNG and SVG have been compressedOlivier Paroz2014-12-052-167/+37
| | |
| * | Improve the bitmap and vector mime iconsOlivier Paroz2014-12-024-55/+167
| |/ | | | | | | | | | | | | | | | | | | * Vector files such as Illustrator files currently show the "image" icon. I propose to add a new type to mimetypeIcon() called "image/vector" and which would be used by SVG as well * We can use the current image-svg+xml icon, but would simply rename it to image-vector * The black and white "image" icon looks too much like a settings icon. A simple picture representation pasted over the file icon should work
* | Forward port of #12493Arthur Schiwon2014-12-041-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
* | Merge pull request #12522 from owncloud/bower-jstzMorris Jobke2014-12-0416-360/+669
|\ \ | | | | | | Bower jstz
| * | move jstz to bower managementMorris Jobke2014-12-016-359/+408
| | |
| * | include lock files of bower to be able to use "bower install"Morris Jobke2014-12-0111-1/+261
| |/
* | Merge pull request #12563 from owncloud/usermenu-remove-borderVolkan Gezer2014-12-031-2/+2
|\ \ | |/ |/| remove border from user menu, adjust to apps menu
| * remove border from user menu, adjust to apps menuJan-Christoph Borchardt2014-11-281-2/+2
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-11-292-2/+2
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-11-282-14/+14
|/
* Merge pull request #12414 from owncloud/delay-autoconfig-kill-2Morris Jobke2014-11-261-7/+14
|\ | | | | autoconfig.php only to be deleted on successful installation
| * autoconfig.php only to be deleted on successful installationThomas Müller2014-11-251-7/+14
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2014-11-262-2/+2
|/
* Merge pull request #12359 from owncloud/fix-redirect-url-for-password-changeThomas Müller2014-11-241-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 valueLukas Reschke2014-11-211-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
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-31 01:55:22 +0000