summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2016-02-2864-36/+654
|
* [tx-robot] updated from transifexJenkins for ownCloud2016-02-2768-44/+90
|
* Merge pull request #22669 from owncloud/fix-email-formThomas Müller2016-02-261-3/+3
|\ | | | | Fix email form on personal page
| * Email endpoint is controlled by the username setting, not passwordJoas Schilling2016-02-261-1/+1
| |
| * Correctly indent uneditable email/display name fieldsJoas Schilling2016-02-261-2/+2
| |
* | Merge pull request #22660 from owncloud/fix_22656Thomas Müller2016-02-263-0/+42
|\ \ | | | | | | Do not allow sharing of the users root folder
| * | Do not allow sharing of the root folderRoeland Jago Douma2016-02-253-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sharing of the users root folder should not be allowed as it is very weird UX. Also many of our clients have no proper way of displaying this. Added unit test Also added intergration tests to make sure we won't allow it in the future.
* | | Merge pull request #22671 from owncloud/issue-22670Thomas Müller2016-02-262-26/+26
|\ \ \ | | | | | | | | Move the tag filter at the end for now
| * | | Move the tag filter at the end for nowJoas Schilling2016-02-262-26/+26
| | |/ | |/|
* | | Merge pull request #22646 from owncloud/fix_22642Thomas Müller2016-02-262-22/+43
|\ \ \ | | | | | | | | Set default expiration date if none given on share creation
| * | | Set default expiration date if none given on share creationRoeland Jago Douma2016-02-252-22/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When we create a share for the first time we should set the default expiration date. If none is given. Fixes #22642
* | | | Merge pull request #22640 from owncloud/fix_22587Thomas Müller2016-02-262-0/+129
|\ \ \ \ | | | | | | | | | | Remove delete permissions for read-only federated reshares
| * | | | Remove delete permissions for read-only federated resharesRoeland Jago Douma2016-02-252-0/+129
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An incomming federated share is just a mount point. Therefor if we request the permissions on the mountpoint DELETE permissions will be returned (among others). Since we can always remove a mountpoint, update a mount point. However now when trying to reshare we will try to reshare with DELETE permissions. Which is false. This PR removes the delete permissions if it is a shared storage. Basically a quick hack. Fixes #22587
* | | | Merge pull request #22608 from owncloud/collaborative-tagsThomas Müller2016-02-263-4/+5
|\ \ \ \ | | | | | | | | | | Rename system tags app to collaborative tags
| * | | | Rename system tags app to collaborative tagsJoas Schilling2016-02-263-4/+5
| | |/ / | |/| |
* | | | Merge pull request #22461 from owncloud/fix_6773Thomas Müller2016-02-2616-77/+166
|\ \ \ \ | | | | | | | | | | Allow theming of actions
| * | | | Fix favorite icon unit test for icon imageVincent Petry2016-02-251-2/+4
| | | | |
| * | | | Make more action icons themable + style fixesVincent Petry2016-02-256-24/+25
| | | | | | | | | | | | | | | | | | | | | | | | | Action icons now appear properly in public link page. More actions are now CSS icons.
| * | | | Close classRoeland Jago Douma2016-02-251-1/+1
| | | | |
| * | | | Make file actions use icon CSS classesRoeland Jago Douma2016-02-2510-54/+140
| | | | | | | | | | | | | | | | | | | | This makes theming of file actions possible
* | | | | Merge pull request #22650 from owncloud/fix_hookThomas Müller2016-02-262-3/+4
|\ \ \ \ \ | |_|/ / / |/| | | | Fix verifyExpirationDate passwordSet argument
| * | | | Fix verifyExpirationDate passwordSet argumentRoeland Jago Douma2016-02-252-3/+4
| | |/ / | |/| | | | | | | | | | | | | | | | | | Password set should be false if the password is null. Also updated the unit tests to tests this now.
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-02-2656-34/+210
| |/ / |/| |
* | | Merge pull request #22584 from owncloud/fix-app-load-order-fixes-22508Thomas Müller2016-02-252-4/+4
|\ \ \ | | | | | | | | Before installing new shipped apps we need to load authentication apps
| * | | Fix PHPDoc of OC_App::loadApps()Thomas Müller2016-02-231-1/+1
| | | |
| * | | Install new shipped apps after upgrading all existing appsThomas Müller2016-02-231-4/+4
| | | |
| * | | Before installing new shipped apps we need to load authentication apps - ↵Thomas Müller2016-02-231-1/+1
| | | | | | | | | | | | | | | | fixes #22508
* | | | Merge pull request #22653 from owncloud/integration-tests-for-dav-csrfThomas Müller2016-02-252-2/+127
|\ \ \ \ | | | | | | | | | | Add integration test for CSRF protection on DAV
| * | | | Fix typoLukas Reschke2016-02-251-1/+1
| | | | |
| * | | | Add integration test for CSRF protection on DAVLukas Reschke2016-02-252-2/+127
| | |_|/ | |/| | | | | | | | | | | | | | | | | | This adds the integration tests for the CSRF protection on the DAV backend introduced with 9.0. Fixes https://github.com/owncloud/core/issues/22598
* | | | Merge pull request #22654 from owncloud/icon-fixesThomas Müller2016-02-253-0/+17
|\ \ \ \ | | | | | | | | | | add download icon for image detail view, ref gallery issue 51
| * | | | add download icon for image detail view, ref gallery issue 51Jan-Christoph Borchardt2016-02-253-0/+17
| | | | |
* | | | | Merge pull request #22659 from owncloud/fix-formattingThomas Müller2016-02-252-54/+62
|\ \ \ \ \ | | | | | | | | | | | | Fix formatting of response
| * | | | | Fix formatting of responseLukas Reschke2016-02-252-54/+62
| | |/ / / | |/| | | | | | | | | | | | | The elements are expected to be within a `service` array as per specification.
* | | | | Merge pull request #22658 from owncloud/exclude-ocs-provider-from-rewrite-rulesThomas Müller2016-02-251-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | Exclude ocs-provider from rewrite rule
| * | | | Exclude ocs-provider from rewrite ruleLukas Reschke2016-02-251-0/+1
|/ / / / | | | | | | | | | | | | | | | | Otherwise `localhost/ocs-provider/` cannot be accessed if mod_rewrite is install ed. Only affects master.
* | | | Merge pull request #22644 from owncloud/external-share-managerThomas Müller2016-02-251-3/+4
|\ \ \ \ | | | | | | | | | | inject the correct external share manager into the storage
| * | | | inject the correct external share manager into the storageRobin Appelman2016-02-251-3/+4
| | | | |
* | | | | Merge pull request #21854 from owncloud/fix-share-hook-group-addThomas Müller2016-02-251-0/+17
|\ \ \ \ \ | | | | | | | | | | | | Fix addUserToGroup hook of the share code
| * | | | | Fix addUserToGroup hook of the share codeMorris Jobke2016-01-221-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * sets up the filesystem of the user that is added to a group to properly accept shares * fixes #18499
* | | | | | Merge pull request #22628 from owncloud/fix-thrashbin-cronjobThomas Müller2016-02-251-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Skip users with no trashbin
| * | | | | | Skip users with no trashbinVictor Dubiniuk2016-02-241-0/+6
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #22611 from owncloud/add-uid-on-hoverThomas Müller2016-02-252-3/+12
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Add the uid on hover for sharing autocomplete
| * | | | | Tweak tooltip style for recipientsVincent Petry2016-02-252-2/+10
| | | | | |
| * | | | | Add the uid on hover for sharing autocompleteJoas Schilling2016-02-241-1/+2
| | | | | |
* | | | | | Merge pull request #22636 from owncloud/fix-ssl-on-external-storagesThomas Müller2016-02-254-12/+45
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix HTTPS support on external storages
| * | | | | | Properly cast typeLukas Reschke2016-02-243-11/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current logic is checking whether: 1. The returned value is a boolen 2. The returned value is a string and then matches for "true" Since the config is now written to the database the data is now a string with the value "1" if HTTPS is set to true. Effectively this option was thus always disabled at the moment, falling back to plain HTTP. This change casts the data to a boolean if it is defined as boolean. Fixes https://github.com/owncloud/core/issues/22605 Fixes https://github.com/owncloud/core/issues/22016
| * | | | | | Add proxy support to external storageLukas Reschke2016-02-241-1/+5
| | |/ / / / | |/| | | | | | | | | | | | | | | | Otherwise debugging issues is a PITA
* | | | | | Merge pull request #22604 from owncloud/fix-google-drive-encryptionThomas Müller2016-02-251-5/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | Copy into local file
| * | | | | | More error handlingLukas Reschke2016-02-251-2/+6
| | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-15 06:32:42 +0000