summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #12305 from owncloud/sharelist-nodeleteMorris Jobke2014-11-202-12/+30
|\ | | | | Remove delete button in shared with others list
| * JSHint fixes in sharedfilelistSpec unit test fileVincent Petry2014-11-191-1/+3
| |
| * Remove delete button in shared with others listVincent Petry2014-11-192-11/+27
| | | | | | | | | | | | | | | | | | Whenever a file is shared with others or with link, a delete button used to be visible that triggered a direct deletion. This button has been removed to avoid accidental deletion from people who might believe it was an unshare button. Unsharing is still possible inside the share dropdown.
* | Merge pull request #12253 from owncloud/port-12154Vincent Petry2014-11-206-14/+54
|\ \ | | | | | | Port 12154
| * | Add repair steps for legacy config filesLukas Reschke2014-11-182-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | Remove all ports from the trusted domains Conflicts: lib/private/repair.php lib/repair/repairconfig.php
| * | Ignore port for trusted domainsLukas Reschke2014-11-184-13/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | This lead to a lot of confusion in the past and did not really offer any value. Let's remove the port check therefore. (it's anyways not really a part of the domain) Fixes https://github.com/owncloud/core/issues/12150 and https://github.com/owncloud/core/issues/12123 and also a problem reported by @DeepDiver1975. Conflicts: lib/private/request.php
* | | Merge pull request #12257 from owncloud/l10n-loadtranslationsfromjsVincent Petry2014-11-203-2/+106
|\ \ \ | | | | | | | | Added function to load translations from JS
| * | | Fix l10n promisesVincent Petry2014-11-192-6/+11
| | | |
| * | | Better use of promise in OC.L10N.load()Vincent Petry2014-11-191-13/+8
| | | |
| * | | Remove stray generateUrlVincent Petry2014-11-191-5/+0
| | | |
| * | | Added function to load translations from JSVincent Petry2014-11-183-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.
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-20174-774/+406
| | | |
* | | | Merge pull request #12290 from owncloud/ext-preventbreakageduetobugs2Lukas Reschke2014-11-191-0/+8
|\ \ \ \ | | | | | | | | | | Show warning when invalid user was passed
| * | | | Show warning when invalid user was passedVincent Petry2014-11-141-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes there are bugs that cause setupFS() to be called for non-existing users. Instead of failing hard and breaking the instance, this fix simply logs a warning.
* | | | | Merge pull request #11696 from owncloud/addWarningToEncryptionLostPasswordLukas Reschke2014-11-1915-150/+388
|\ \ \ \ \ | |_|_|_|/ |/| | | | Warn for password reset when files_encryption is enabled
| * | | | center spinnerMorris Jobke2014-11-182-1/+7
| | | | |
| * | | | Show spinnerLukas Reschke2014-11-172-0/+2
| | | | |
| * | | | fix unreadable label in warning boxMorris Jobke2014-11-171-0/+6
| | | | |
| * | | | Hide submit button after password changeLukas Reschke2014-11-171-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.
| * | | | listen to the post_passwordReset hook, backup the old keys and create a new ↵Bjoern Schiessle2014-11-173-0/+26
| | | | | | | | | | | | | | | | | | | | key pair for the user
| * | | | add password as parameter to the signal so that the encryption can create a ↵Bjoern Schiessle2014-11-171-1/+1
| | | | | | | | | | | | | | | | | | | | new key-pair
| * | | | Add "postPasswordReset" hookLukas Reschke2014-11-171-4/+8
| | | | |
| * | | | Use correct route insteadLukas Reschke2014-11-172-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | THX @schiesbn (I should setup a mail server on my local system...)
| * | | | Remove uneeded importLukas Reschke2014-11-171-1/+0
| | | | |
| * | | | Fix scrutinizer issuesLukas Reschke2014-11-171-1/+1
| | | | |
| * | | | Warn for password reset when files_encryption is enabledLukas Reschke2014-11-1710-149/+341
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 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 #12276 from ↵Morris Jobke2014-11-193-1/+36
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/undelete-only-if-files-trashin-is-enabled Only show undelete capability if files_trashbin is enabled
| * | | | Only show undelete capability if files_trashbin is enabledLukas Reschke2014-11-183-1/+36
| | | | | | | | | | | | | | | | | | | | Fixes the OCS capability API at /ocs/v1.php/cloud/capabilities
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-1984-90/+20
| | | | |
* | | | | Merge pull request #12270 from owncloud/fix-search-labelThomas Müller2014-11-181-1/+1
|\ \ \ \ \ | | | | | | | | | | | | User management search just searches users - adjust label of input field...
| * | | | | User management search just searches users - adjust label of input field - ↵Morris Jobke2014-11-181-1/+1
| |/ / / / | | | | | | | | | | | | | | | fixes #10229
* | | | | Merge pull request #12272 from owncloud/drop-var_dumpThomas Müller2014-11-181-1/+0
|\ \ \ \ \ | |/ / / / |/| | | | drop unneeded var_dump - fixes #9997
| * | | | drop unneeded var_dump - fixes #9997Morris Jobke2014-11-181-1/+0
|/ / / /
* | | | Merge pull request #12261 from oparoz/patch-1Morris Jobke2014-11-181-1/+1
|\ \ \ \ | | | | | | | | | | Replace deprecated switches
| * | | | Replace deprecated switchesOlivier Paroz2014-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | Warning: -convert-to is deprecated. Use --convert-to instead. Warning: -outdir is deprecated. Use --outdir instead.
* | | | | Merge pull request #12264 from owncloud/use-full-path-for-filesize-calculationLukas Reschke2014-11-181-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Use full path instead of only the filename
| * | | | | $file only contains the filename and not the absolute path, that means that ↵Lukas Reschke2014-11-181-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | files in a subdirectory will not get properly resolved and an empty filesize is returned. This feature only exists on master.
* | | | | Merge pull request #12224 from owncloud/fix_12211Björn Schießle2014-11-182-18/+74
|\ \ \ \ \ | |/ / / / |/| | | | make sure that we don't find the wrong shares if a user and a group have the same ID
| * | | | only users can have a display name different from the idBjoern Schiessle2014-11-181-1/+4
| | | | |
| * | | | use the new base class for unit testsBjoern Schiessle2014-11-181-10/+12
| | | | |
| * | | | make sure that we only find the shares from the correct share type if users ↵Bjoern Schiessle2014-11-181-2/+8
| | | | | | | | | | | | | | | | | | | | and groups with the same ID exists
| * | | | make sure that we don't find the wrong shares if a user and a group have the ↵Bjoern Schiessle2014-11-182-6/+51
| | |_|/ | |/| | | | | | | | | | same ID
* | | | Merge pull request #12259 from owncloud/app-enabled-plugin-appmanagerLukas Reschke2014-11-181-4/+4
|\ \ \ \ | | | | | | | | | | Fix type hinting for app manager
| * | | | Fix type hinting for app managerRobin Appelman2014-11-181-4/+4
| |/ / /
* | | | Merge pull request #12242 from owncloud/fix-undefined-sizeLukas Reschke2014-11-181-1/+1
|\ \ \ \ | |/ / / |/| | | Check if the size field is available
| * | | Check if the size field is availableLukas Reschke2014-11-171-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases the 'size' field is not available resulting in some PHP errors such as: ```json {"reqId":"03548fd9e3d3aca15a5796b3b35d7b9d","remoteAddr":"::1","app":"PHP","message":"Undefined index: size at \/Users\/lreschke\/Programming\/core\/lib\/private\/files\/fileinfo.php#125","level":3,"time":"2014-11-17T21:38:57+00:00"} ``` This can be experienced when creating a new empty file and deleting it right away, then when going to the trash bin this error is thrown.
* | | Merge pull request #12220 from owncloud/remove-unused-codeMorris Jobke2014-11-183-373/+0
|\ \ \ | | | | | | | | Remove unused code
| * | | Remove unused codeLukas Reschke2014-11-173-373/+0
| | | | | | | | | | | | | | | | We don't support direct updates from older ownCloud versions except the previous one therefore this code is unused and can be removed.
* | | | Merge pull request #12237 from owncloud/fix-12236Morris Jobke2014-11-181-5/+5
|\ \ \ \ | | | | | | | | | | Make declaration compatible
| * | | | Make declaration compatibleLukas Reschke2014-11-171-5/+5
| | |/ / | |/| | | | | | | | | | Fixes #12236
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-09 04:29:34 +0000