summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Escape error messagesLukas Reschke2014-08-281-4/+4
| | | |
* | | | Merge pull request #10660 from ↵Jörn Friedrich Dreyer2014-08-271-1/+5
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | owncloud/use_notification_to_show_error_on_new_via_web_stable6 use notification to show error on new via web
| * | | use notification to shw error on new via webJörn Friedrich Dreyer2014-08-271-1/+5
|/ / /
* | | 6.0.5v6.0.5Frank Karlitschek2014-08-261-2/+2
| | |
* | | Merge pull request #10448 from owncloud/check_quota_on_new_via_web_stable6Jörn Friedrich Dreyer2014-08-252-3/+39
|\ \ \ | | | | | | | | check quota when trying to download a file via new -> web
| * | | check quota when trying to download a file via new -> webJörn Friedrich Dreyer2014-08-152-3/+39
| | | |
* | | | 6.0.5 RC1v6.0.5RC1Frank Karlitschek2014-08-211-2/+2
| | | |
* | | | Also encode > and 'Lukas Reschke2014-08-201-1/+1
| | | |
* | | | properly encode groups as json, not ',' separatedJörn Friedrich Dreyer2014-08-191-3/+3
| | | |
* | | | set incognitoMode to true, getUser should always return false during public ↵Bjoern Schiessle2014-08-191-1/+4
| | | | | | | | | | | | | | | | upload
* | | | Merge pull request #10146 from owncloud/fix-8578-stable6Lukas Reschke2014-08-171-0/+0
|\ \ \ \ | |/ / / |/| | | Update 3rdparty to replace fpassthru() in Sabre.
| * | | Update 3rdparty to replace fpassthru() in Sabre.Andreas Fischer2014-08-041-0/+0
| | |/ | |/|
* | | Merge pull request #10440 from owncloud/enforce-debugClark Tomlinson2014-08-151-7/+0
| | | | | | | | | | | | Remove ability to trigger DEBUG mode via cookie
* | | Merge pull request #10034 from owncloud/remove-es_MX-from-stable6Lukas Reschke2014-08-151066-304572/+0
|\ \ \ | | | | | | | | Remove es mx from stable6
| * | | remove l10n folder - sync script and transifex config are no longer required ↵Thomas Müller2014-07-291050-301309/+0
| | | | | | | | | | | | | | | | on a stable branch
| * | | remove language es_MXThomas Müller2014-07-2916-3263/+0
| | | |
* | | | we need the recipient as a additional parameter to know for which share the ↵Bjoern Schiessle2014-08-142-6/+7
| | | | | | | | | | | | | | | | notification was send
* | | | Fix Upload button does not disappearVincent Petry2014-08-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tipsy tooltip must be hidden when the upload starts. Otherwise it covers the progress bar and stays in DOM. Backport of fa28c089fa3ffb72e97ca0f89cbfade3d0a8a8a5 and 90839b784f748b18a2a5fae4cc3f80bd1df7b355 from master
* | | | Minor changes in config.sampleVolkan Gezer2014-08-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * appcodechecker accepts boolean. * using different ports in trusted domains Partially fixes #330
* | | | fix broken variable name, recoveryPasswordSupported is now ↵Bjoern Schiessle2014-08-121-3/+3
| | | | | | | | | | | | | | | | recoveryEnabledForUser
* | | | add unit testsBjoern Schiessle2014-08-121-1/+48
| | | |
* | | | fix detection of system wide mount pointsBjoern Schiessle2014-08-121-9/+34
| | | |
* | | | Merge pull request #10344 from owncloud/backport-10096-stable6Lukas Reschke2014-08-111-1/+2
|\ \ \ \ | |_|_|/ |/| | | in case $_POST['itemSourceName'] does not exist we simply default it to...
| * | | in case $_POST['itemSourceName'] does not exist we simply default it to nullThomas Müller2014-08-111-1/+2
|/ / /
* | | backport of #9848Jean-Louis Dupond2014-08-111-13/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix memberOf detection. Fixes: #9835 Conflicts: apps/user_ldap/lib/wizard.php Fix remarks in #9848 Conflicts: apps/user_ldap/lib/wizard.php Fix initializing in #9848 do not change var names here
* | | Merge pull request #10315 from owncloud/clarify-encryption-descriptiFrank Karlitschek2014-08-101-1/+1
|\ \ \ | | | | | | | | clearify the use-case of this app
| * | | clearify the use-case of this appLukas Reschke2014-08-091-1/+1
|/ / / | | | | | | Backport of https://github.com/owncloud/core/commit/8a24e1eb9624 to stable7
* | | Merge pull request #9675 from owncloud/stable6-9647Jörn Friedrich Dreyer2014-08-091-0/+37
|\ \ \ | |_|/ |/| | [stable6] Add unit test for multi-user configuration loading
| * | Add unit test for multi-user configuration loadingRobin McCorkell2014-08-081-0/+37
|/ /
* | don't preload videos on public sharing, fixes #10042Georg Ehrke2014-07-301-1/+1
| |
* | Fix template rendering for 'blank' templatesMorris Jobke2014-07-301-1/+3
|/
* Merge pull request #9575 from owncloud/fix-7038Vincent Petry2014-07-222-2/+14
|\ | | | | Hack to avoid Agent DN + Password being overwritten by some ugly browser...
| * Hack to avoid Agent DN + Password being overwritten by some ugly browsers ↵Arthur Schiwon2014-07-162-2/+14
| | | | | | | | with stored site credentials
* | Merge pull request #9776 from owncloud/backport-9738-stable6Thomas Müller2014-07-221-22/+21
|\ \ | | | | | | Backport 9738 stable6
| * | Remove uneeded `strip_tags`Lukas Reschke2014-07-221-2/+2
| | | | | | | | | | | | | | | | | | This `strip_tags` seems to be completely unneeded and will cause problems with passwords containing stripped characters. (e.g. `<` or `>`) Needs https://github.com/owncloud/core/pull/9735 to be merged first.
| * | Extract Auth Header logic into new function handleAuthHeaders().Andreas Fischer2014-07-221-20/+21
| | | | | | | | | | | | | | | Conflicts: lib/base.php
| * | Deduplicate user/password extraction from alternative HTTP headers.Andreas Fischer2014-07-221-16/+14
|/ /
* | Merge pull request #9109 from ↵Vincent Petry2014-07-223-51/+242
|\ \ | | | | | | | | | | | | owncloud/stable6-extstorage-multiplemountpointconfig [6.0.5] Fix merging of external storage configurations
| * | Fix merging of external storage configurationsVincent Petry2014-06-193-51/+242
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merging of configurations is whenever the same config is available for multiple users/groups, in which case the config is considered as a single one by the UI, and shows multiple users/groups selected. Fixed merging logic to make sure that class, mount point and options are the same before merging them. Fixed merging to work correctly when the same mount point path is used for separate users and configs. These are now correctly shows in the UI as separate entries. Backport of e002b72 from master
* | | Merge pull request #9717 from owncloud/backport_9668Vincent Petry2014-07-184-30/+98
|\ \ \ | | | | | | | | [encryption] update keys recursively if a folder was moved (oc6 backport)
| * | | make sure that we don't connect hooks multiple timesBjoern Schiessle2014-07-181-1/+1
| | | |
| * | | check that the file proxies are enabled after each testBjoern Schiessle2014-07-181-4/+5
| | | |
| * | | update keys recursively if a folder was movedBjoern Schiessle2014-07-183-25/+92
| | | |
* | | | login() must be called after getServerPublicHostKey().Andreas Fischer2014-07-181-5/+5
|/ / /
* | | Merge pull request #9511 from owncloud/stable6-download-button-public-folderVincent Petry2014-07-154-6/+32
|\ \ \ | | | | | | | | [stable6] Bring back the download button public folder
| * | | disable download button if zip download is disabledThomas Müller2014-07-082-0/+4
| | | | | | | | | | | | | | | | Backport of 6e75b37
| * | | fix position and look of public download buttonJan-Christoph Borchardt2014-07-082-7/+7
| | | | | | | | | | | | | | | | Backport of 899c7c0 from master
| * | | remove unneeded header-right details stylesJan-Christoph Borchardt2014-07-081-0/+15
| | | | | | | | | | | | | | | | Backport a280a69
| * | | remove file name from upper right buttonThomas Müller2014-07-081-1/+1
| | | | | | | | | | | | | | | | Backport of 003049e from master
| * | | reintroduce download button on public sharesThomas Müller2014-07-081-3/+10
| | | | | | | | | | | | | | | | Backport of df32254 from master
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-09 23:20:54 +0000