Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion developer_manual/app_development/translation_setup.rst
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ empty folder which later holds the translations.
Branch selection ``.tx/backport``
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

The bot will run every night and only push commits to the following branches branch once there is an update to the translation:
The bot will run every night and only push commits to the following branches once there is an update to the translation:

* main
* master
Expand Down
4 changes: 2 additions & 2 deletions developer_manual/basics/backgroundjobs.rst
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ For example you could add or remove a certain job based on some controller:

class SomeController extends Controller {

private IJobList $jobList
private IJobList $jobList;

public function __construct(string $appName, IRequest $request, IJobList $jobList) {
parent::__construct($appName, $request);
Expand Down Expand Up @@ -183,7 +183,7 @@ Beware that the reliability of the execution time is limited. Systems that do no

class ShareService {

private IJobList $jobList
private IJobList $jobList;

public function __construct(IJobList $jobList) {
$this->jobList = $jobList;
Expand Down
2 changes: 1 addition & 1 deletion developer_manual/basics/events.rst
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ This event is triggered when a user deletes a calendar-subscription.

.. versionadded:: 20

This event is triggered when a user deletes a calendar-subscription.
This event is triggered when a user updates a calendar subscription.

``\OCA\FederatedFileSharing\Events\FederatedShareAddedEvent``
*************************************************************
Expand Down
2 changes: 1 addition & 1 deletion developer_manual/basics/storage/filesystem.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ From the root folder you can either access a user's home folder or access a file
private IUserSession $userSession;
private IRootFolder $rootFolder;

public function __constructor(IUserSession $userSession, IRootFolder $rootFolder) {
public function __construct(IUserSession $userSession, IRootFolder $rootFolder) {
$this->userSession = $userSession;
$this->rootFolder = $rootFolder;
}
Expand Down
4 changes: 2 additions & 2 deletions developer_manual/digging_deeper/reference.rst
Original file line number Diff line number Diff line change
Expand Up @@ -658,15 +658,15 @@ in a custom fashion:
<div v-if="richObject">
<div>
<label>
{{ t('myapp', 'Title' }}
{{ t('myapp', 'Title') }}
</label>
<span>
{{ richObject.title }}
</span>
<div>
<div>
<label>
{{ t('myapp', 'Extra info' }}
{{ t('myapp', 'Extra info') }}
</label>
<span>
{{ richObject.extra_info }}
Expand Down
2 changes: 1 addition & 1 deletion developer_manual/getting_started/coding_standards/php.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Use *UpperCamelCase* for Objects, *lowerCamelCase* for functions and variables.
a default function/method parameter, do not use spaces. Do not prepend private
class members with underscores.

.. code-block:: javascript
.. code-block:: php

class MyClass {

Expand Down
2 changes: 1 addition & 1 deletion developer_manual/getting_started/development_process.rst
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Here are some things to consider:

- Any major release that has not reached end-of-life status usually receives these backported fixes.
- Backporting even the simplest changes has some level of risk.
- Differences among stable branches - including of shipped and third-pary apps - means there are additional variables outside of the main branch (or even versus the latest stable).
- Differences among stable branches - including of shipped and third-party apps - means there are additional variables outside of the main branch (or even versus the latest stable).
- Fixes often do not have a lot of time in the field (< 4 weeks and it's possible no one has directly interacted with the new code outside of the original developer).

Showstoppers (never backport things that cause these):
Expand Down
2 changes: 1 addition & 1 deletion developer_manual/prologue/security.rst
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ An even better way to make your app safer is to use the jQuery built-in function

messageTd.text(username);

It may also be wise to choose a proper JavaScript framework like AngularJS which automatically handles the JavaScript escaping for you.
It may also be wise to choose a proper JavaScript framework like Vue.js which automatically handles the JavaScript escaping for you.

Clickjacking
------------
Expand Down
Loading