Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixing the Lost Password Screen | Julian Müller | 2013-10-29 | 2 | -5/+34 |
| | |||||
* | Merge pull request #5587 from owncloud/trashbin-homecrumb | Julian Müller | 2013-10-28 | 1 | -5/+0 |
|\ | | | | | Fixed clicking on the "Home" breadcrumb in the trash app | ||||
| * | Fixed clicking on the "Home" breadcrumb in the trash app | Vincent Petry | 2013-10-28 | 1 | -5/+0 |
|/ | | | | | Clicking on the "home" breadcrumb now correctly brings the user back to the files app. | ||||
* | Merge pull request #5550 from owncloud/fix-4716-master | Morris Jobke | 2013-10-28 | 1 | -3/+3 |
|\ | | | | | 'Update to' is shown when there is no update | ||||
| * | update documentation for app update | Morris Jobke | 2013-10-28 | 1 | -1/+1 |
| | | |||||
| * | 'Update to' is shown when there is no update | Bart Visscher | 2013-10-25 | 1 | -2/+2 |
| | | | | | | | | See #4716 | ||||
* | | Merge pull request #3889 from owncloud/apps_preload | Morris Jobke | 2013-10-28 | 1 | -1/+1 |
|\ \ | | | | | | | Don't load the apps when we need to upgrade | ||||
| * | | Don't load the apps when we need to upgrade | Bart Visscher | 2013-06-28 | 1 | -1/+1 |
| | | | | | | | | | | | | The loading can call functions that require new tables, like oc_jobs | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-27 | 246 | -1273/+1092 |
| | | | |||||
* | | | Merge pull request #5566 from owncloud/fix-double-not | Lukas Reschke | 2013-10-27 | 2 | -2/+2 |
|\ \ \ | | | | | | | | | Fix double not in newfile/newfolder language. | ||||
| * | | | Fix double not in newfile/newfolder language. | Andreas Fischer | 2013-10-27 | 2 | -2/+2 |
|/ / / | |||||
* | | | Merge pull request #5552 from owncloud/admin-warninghomeexistsfix | Thomas Müller | 2013-10-27 | 1 | -4/+4 |
|\ \ \ | | | | | | | | | Fixed user dir existence check when creating new user | ||||
| * | | | Fixed user dir existence check when creating new user | Vincent Petry | 2013-10-25 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | The check was done too later. It turns out that createUser() had already created the dir, which caused the warning message to be shown every time. | ||||
* | | | | Merge pull request #5537 from owncloud/autotest-syntaxhelp | Thomas Müller | 2013-10-27 | 1 | -4/+30 |
|\ \ \ \ | | | | | | | | | | | Added syntax help for autotest.sh | ||||
| * | | | | Added syntax help for autotest.sh | Vincent Petry | 2013-10-25 | 1 | -4/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | autotest.sh now checks for the validity of the db config name argument. If the db config name is not known, it show syntax info. This should save some time to people to understand how to use this script. Before this fix, an invalid argument would return a big HTML page in the output. | ||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-27 | 774 | -25383/+43641 |
| | | | | | |||||
* | | | | | Merge pull request #5561 from owncloud/fix5401 | Thomas Müller | 2013-10-26 | 1 | -14/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | local user backend shall search for both username and displayname, fixes... | ||||
| * | | | | | local user backend shall search for both username and displayname, fixes #5401 | Arthur Schiwon | 2013-10-25 | 1 | -14/+3 |
| | | | | | | |||||
* | | | | | | Merge pull request #5562 from owncloud/fix5560 | Thomas Müller | 2013-10-26 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Fix broken users page when a username consists of digits only, fixes #55... | ||||
| * | | | | | Fix broken users page when a username consists of digits only, fixes #5560 | Arthur Schiwon | 2013-10-25 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #5542 from owncloud/quotastream-fseektoendfix | Björn Schießle | 2013-10-25 | 4 | -3/+109 |
|\ \ \ \ \ | | | | | | | | | | | | | Fixes for quota stream fseek | ||||
| * | | | | | Added comment for clarification about fseek() call in quota.php | Vincent Petry | 2013-10-25 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | Fixed quota stream to not wrap read-only fopen calls | Vincent Petry | 2013-10-25 | 2 | -1/+23 |
| | | | | | | |||||
| * | | | | | Fixed quota stream's fseek method | Vincent Petry | 2013-10-25 | 2 | -2/+84 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | - Added missing return statement - Added missing support for SEEK_END - Fixes #5524 | ||||
* | / / / | Port PR #5457 to master | Arthur Schiwon | 2013-10-25 | 1 | -4/+11 |
| |/ / / |/| | | | |||||
* | | | | make sure the shared ldap connection is rebound to the configured user after ↵ | Donald Buczek | 2013-10-25 | 1 | -1/+3 |
|/ / / | | | | | | | | | | being used for password checking. | ||||
* | | | Merge pull request #5532 from owncloud/ldap_fixes | Thomas Müller | 2013-10-24 | 3 | -12/+45 |
|\ \ \ | | | | | | | | | Ldap fixes | ||||
| * | | | LDAP: don't validate unconfigured (new) LDAP server configs, fixes #5518 | Arthur Schiwon | 2013-10-24 | 1 | -0/+15 |
| | | | | |||||
| * | | | LDAP Wizard: always show correct Back+Continue Buttons, fixes #5520 | Arthur Schiwon | 2013-10-24 | 1 | -10/+28 |
| | | | | |||||
| * | | | LDAP: when multiline values are passed as array, do not try to preg_split ↵ | Arthur Schiwon | 2013-10-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | them. Fixes #5521 | ||||
| * | | | typo, fixes #5517 | Arthur Schiwon | 2013-10-24 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #5528 from frisco82/changeUpadateNotification | Thomas Müller | 2013-10-24 | 4 | -2/+17 |
|\ \ \ \ | | | | | | | | | | | Changed update message to be more instructive | ||||
| * | | | | Changed update message to be more instructive, changed update style to be ↵ | Ramiro Aparicio | 2013-10-24 | 4 | -2/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | less aggresive Fix br tags Improve english messages | ||||
* | | | | | Merge pull request #5507 from owncloud/webdav-removeredirectfromindex | Thomas Müller | 2013-10-24 | 2 | -31/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | Remove WebDAV redirect from the root path | ||||
| * | | | | | Removed old webdav endpoint | Vincent Petry | 2013-10-24 | 1 | -30/+0 |
| | | | | | | |||||
| * | | | | | Remove WebDAV redirect from the root path | Vincent Petry | 2013-10-24 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will prevent people mounting the root path. They should use the full webdav path instead. Fixes #4923 | ||||
* | | | | | | Merge pull request #5494 from owncloud/fixing-3593-master | Thomas Müller | 2013-10-24 | 3 | -1/+96 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | introducing new dav property {xmlns:oc="http://owncloud.org/ns}id | ||||
| * | | | | | - fixing namespace | Thomas Müller | 2013-10-24 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | - remove property only if present | ||||
| * | | | | | handle case where fileid is not set | Thomas Müller | 2013-10-23 | 2 | -4/+12 |
| | | | | | | |||||
| * | | | | | introducing new dav property {xmlns:oc="http://owncloud.org/ns}id | Thomas Müller | 2013-10-23 | 3 | -1/+86 |
| |/ / / / | |||||
* | | | | | Merge pull request #5512 from owncloud/css-fixleftcontentrightcontent | Vincent Petry | 2013-10-24 | 2 | -6/+6 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Fix leftcontent/right content, fixes contacts app | ||||
| * | | | | Fix leftcontent/right content, fixes tasks app | Vincent Petry | 2013-10-24 | 2 | -6/+6 |
|/ / / / | | | | | | | | | | | | | | | | | Tasks app layout was broken since the controls bar is higher now. This change should hopefully fix other apps using the same layout. | ||||
* | | | | Merge pull request #5402 from owncloud/fixing-5367-master | Thomas Müller | 2013-10-24 | 2 | -1/+11 |
|\ \ \ \ | |_|/ / |/| | | | fixes chunked upload | ||||
| * | | | fixes #5367 | Thomas Müller | 2013-10-17 | 2 | -1/+11 |
| | | | | |||||
* | | | | Merge pull request #5496 from owncloud/prefer_png_from_theme_over_core_svg | Thomas Müller | 2013-10-23 | 1 | -0/+18 |
|\ \ \ \ | | | | | | | | | | | prefer logo png from theme over svg from core | ||||
| * | | | | prefer logo png from theme over svg from core | Jörn Friedrich Dreyer | 2013-10-23 | 1 | -0/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logo images are specified in the php templates with eg `image_path('', 'logo-wide.svg')`. If that file exists the correct path will be served to the client in the html template. Then the `SVGSupport()` is checked in https://github.com/owncloud/core/blob/master/core/js/js.js#L701 which will replace `svg` with `png` in img tags and css background definitions. fixes #5074 partially solves #5421, but not when an svg has been specified in css and is then 'fixed' by js to point to a png which does not exist in the theme but is then might be resolved to an image from core .... well theoretical problem ... might not even be a problem @karlitschek @jancborchardt please review | ||||
* | | | | | Merge pull request #5477 from ↵ | Thomas Müller | 2013-10-23 | 10 | -460/+582 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/prevent_user_from_creating_or_renaming_to_an_existing_filename prevent user from creating or renaming sth. to an existing filename | ||||
| * | | | | | fix translations | Jörn Friedrich Dreyer | 2013-10-23 | 2 | -10/+10 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into ↵ | Jörn Friedrich Dreyer | 2013-10-23 | 27 | -33/+111 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | prevent_user_from_creating_or_renaming_to_an_existing_filename Conflicts: apps/files/js/filelist.js | ||||
| * | | | | | use a more descriptive error message when the user tries to create '/Shared' | Jörn Friedrich Dreyer | 2013-10-23 | 2 | -3/+3 |
| | | | | | |