From acb790ad2d69f5dc02771c4a5826ec52afc4a994 Mon Sep 17 00:00:00 2001 From: luzpaz Date: Mon, 30 Dec 2024 02:43:28 +0000 Subject: [PATCH] Fix various typos Found via codespell --- doc/deployment.adoc | 6 ++-- docker/entrypoint.sh | 2 +- .../datatransfer/DataTransferAccessChecker.kt | 2 +- .../projectforge/plugins/ihk/IHKExporter.java | 2 +- .../marketing/AddressCampaignEditPage.java | 2 +- .../AddressCampaignValueEditPage.java | 2 +- .../plugins/merlin/MerlinRunner.kt | 2 +- .../plugins/merlin/MerlinStatistics.kt | 2 +- .../plugins/merlin/MerlinVariable.kt | 2 +- .../plugins/skillmatrix/SkillMatrixPlugin.kt | 2 +- site/_changelogs/changelog-20180717--6-22.md | 2 +- site/_changelogs/changelog-20210525--7-2.adoc | 2 +- site/_data/navigation_boxes.yml | 2 +- site/_docs/adminguide.adoc | 30 +++++++++---------- site/_docs/development.adoc | 2 +- site/_docs/installation.adoc | 10 +++---- site/_docs/quickstart.adoc | 14 ++++----- site/_docs/technologies.adoc | 2 +- site/_docs/userguide.adoc | 26 ++++++++-------- site/_faqs/administration-30.md | 2 +- site/_sass/uikit/components/button.scss | 2 +- site/_sass/uikit/components/form.scss | 2 +- site/_sass/uikit/components/utility.scss | 2 +- 23 files changed, 61 insertions(+), 61 deletions(-) diff --git a/doc/deployment.adoc b/doc/deployment.adoc index 35eb93302a..675698d051 100644 --- a/doc/deployment.adoc +++ b/doc/deployment.adoc @@ -17,10 +17,10 @@ link:index{outfilesuffix}[Top] 3. Define new release variable: + `./build.gradle.kts: version = '8.0'` 4. `./gradlew clean build` -5. If all tests are finished successfully and the test of the ProjectForge-Application works for new and existing databases), proceeed: +5. If all tests are finished successfully and the test of the ProjectForge-Application works for new and existing databases), proceed: 6. Copy executable jar file from `projectforge-application/build/libs/projectforge-application-\*.jar` to SourceForge and tag this file as default for all platforms 7. Building and pushing docker - a. For testing docker images first, please refer `/dokcer/README.adoc`. + a. For testing docker images first, please refer `/docker/README.adoc`. b. `export PF_VERSION=8.0` c. `export DOCKER_USER=micromata` d. `cp projectforge-application/build/libs/projectforge-application*.jar .` @@ -35,7 +35,7 @@ link:index{outfilesuffix}[Top] 11. Create new SNAPSHOT-Release by increasing version number: + `./build.gradle.kts: version = '8.0.1-SNAPSHOT'` 12. Commit everything to master and develop branch and push it to Github -13. Upload the saved jar files to Github (Create release from taged version) and SourceForge (e.g. as zip (see previous versions as example)). +13. Upload the saved jar files to Github (Create release from tagged version) and SourceForge (e.g. as zip (see previous versions as example)). Optional (if not done before): diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 0daed8e644..8b2b9fa92e 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -83,7 +83,7 @@ if [ -f "$CONFIG_FILE" ]; then echo "Normal start" java $START & else - # CONFIG_FILE doesn't exist, so assume intial start: + # CONFIG_FILE doesn't exist, so assume initial start: # java must run in foreground for using the console setup wizard. echo "Initial start" java $START diff --git a/plugins/org.projectforge.plugins.datatransfer/src/main/kotlin/org/projectforge/plugins/datatransfer/DataTransferAccessChecker.kt b/plugins/org.projectforge.plugins.datatransfer/src/main/kotlin/org/projectforge/plugins/datatransfer/DataTransferAccessChecker.kt index 8411a593ca..74c4ce178a 100644 --- a/plugins/org.projectforge.plugins.datatransfer/src/main/kotlin/org/projectforge/plugins/datatransfer/DataTransferAccessChecker.kt +++ b/plugins/org.projectforge.plugins.datatransfer/src/main/kotlin/org/projectforge/plugins/datatransfer/DataTransferAccessChecker.kt @@ -74,7 +74,7 @@ open class DataTransferAccessChecker( } /** - * Checks select/download-access (same). See [checkDownloadAccess] for special handling of perosnal boxes. + * Checks select/download-access (same). See [checkDownloadAccess] for special handling of personal boxes. */ private fun checkAccess(user: PFUserDO?, id: Any) { user!! diff --git a/plugins/org.projectforge.plugins.ihk/src/main/java/org/projectforge/plugins/ihk/IHKExporter.java b/plugins/org.projectforge.plugins.ihk/src/main/java/org/projectforge/plugins/ihk/IHKExporter.java index b7c80ff6c4..cc9b86b514 100644 --- a/plugins/org.projectforge.plugins.ihk/src/main/java/org/projectforge/plugins/ihk/IHKExporter.java +++ b/plugins/org.projectforge.plugins.ihk/src/main/java/org/projectforge/plugins/ihk/IHKExporter.java @@ -192,7 +192,7 @@ private double setNewRows(double hourCounter, final TimesheetDO timesheet, Excel /* - Calculate height of cell from the content lenght and the number of line breaks + Calculate height of cell from the content length and the number of line breaks */ String puffer = description; diff --git a/plugins/org.projectforge.plugins.marketing/src/main/java/org/projectforge/plugins/marketing/AddressCampaignEditPage.java b/plugins/org.projectforge.plugins.marketing/src/main/java/org/projectforge/plugins/marketing/AddressCampaignEditPage.java index f864750c7d..866d00000e 100644 --- a/plugins/org.projectforge.plugins.marketing/src/main/java/org/projectforge/plugins/marketing/AddressCampaignEditPage.java +++ b/plugins/org.projectforge.plugins.marketing/src/main/java/org/projectforge/plugins/marketing/AddressCampaignEditPage.java @@ -31,7 +31,7 @@ import org.slf4j.Logger; /** - * The controler of the edit formular page. Most functionality such as insert, update, delete etc. is done by the super + * The controller of the edit formular page. Most functionality such as insert, update, delete etc. is done by the super * class. * * @author Kai Reinhard (k.reinhard@micromata.de) diff --git a/plugins/org.projectforge.plugins.marketing/src/main/java/org/projectforge/plugins/marketing/AddressCampaignValueEditPage.java b/plugins/org.projectforge.plugins.marketing/src/main/java/org/projectforge/plugins/marketing/AddressCampaignValueEditPage.java index 9d3f85c5a9..6004e4edac 100644 --- a/plugins/org.projectforge.plugins.marketing/src/main/java/org/projectforge/plugins/marketing/AddressCampaignValueEditPage.java +++ b/plugins/org.projectforge.plugins.marketing/src/main/java/org/projectforge/plugins/marketing/AddressCampaignValueEditPage.java @@ -37,7 +37,7 @@ import java.util.Iterator; /** - * The controler of the edit formular page. Most functionality such as insert, update, delete etc. is done by the super + * The controller of the edit formular page. Most functionality such as insert, update, delete etc. is done by the super * class. * * @author Kai Reinhard (k.reinhard@micromata.de) diff --git a/plugins/org.projectforge.plugins.merlin/src/main/kotlin/org/projectforge/plugins/merlin/MerlinRunner.kt b/plugins/org.projectforge.plugins.merlin/src/main/kotlin/org/projectforge/plugins/merlin/MerlinRunner.kt index e1042663e7..962070a1ee 100644 --- a/plugins/org.projectforge.plugins.merlin/src/main/kotlin/org/projectforge/plugins/merlin/MerlinRunner.kt +++ b/plugins/org.projectforge.plugins.merlin/src/main/kotlin/org/projectforge/plugins/merlin/MerlinRunner.kt @@ -421,7 +421,7 @@ open class MerlinRunner { } } if (!validUsernames) { - log.error { "Errors for personal box users occured. No document will be send to any personal user box. Aborting." } + log.error { "Errors for personal box users occurred. No document will be send to any personal user box. Aborting." } return pdfDocuments } var counter = 0 diff --git a/plugins/org.projectforge.plugins.merlin/src/main/kotlin/org/projectforge/plugins/merlin/MerlinStatistics.kt b/plugins/org.projectforge.plugins.merlin/src/main/kotlin/org/projectforge/plugins/merlin/MerlinStatistics.kt index bed92c3160..bede0e34b4 100644 --- a/plugins/org.projectforge.plugins.merlin/src/main/kotlin/org/projectforge/plugins/merlin/MerlinStatistics.kt +++ b/plugins/org.projectforge.plugins.merlin/src/main/kotlin/org/projectforge/plugins/merlin/MerlinStatistics.kt @@ -88,7 +88,7 @@ class MerlinStatistics { } /** - * Updates dto variables: Adds statistics variables not yet included in dto and updates usage info (defined, master variabl etc.) + * Updates dto variables: Adds statistics variables not yet included in dto and updates usage info (defined, master variable etc.) * of dto variables and dependentVariables. */ fun updateDtoVariables(dto: MerlinTemplate) { diff --git a/plugins/org.projectforge.plugins.merlin/src/main/kotlin/org/projectforge/plugins/merlin/MerlinVariable.kt b/plugins/org.projectforge.plugins.merlin/src/main/kotlin/org/projectforge/plugins/merlin/MerlinVariable.kt index cabfedee8c..8afb295be4 100644 --- a/plugins/org.projectforge.plugins.merlin/src/main/kotlin/org/projectforge/plugins/merlin/MerlinVariable.kt +++ b/plugins/org.projectforge.plugins.merlin/src/main/kotlin/org/projectforge/plugins/merlin/MerlinVariable.kt @@ -76,7 +76,7 @@ class MerlinVariable : MerlinVariableBase() { /** * Input variables will be displayed for editing (or given in serial Excel). Input variables are defined and not dependent. - * Equals to definded && !dependent. + * Equals to defined && !dependent. */ val input: Boolean get() = defined && !dependent diff --git a/plugins/org.projectforge.plugins.skillmatrix/src/main/kotlin/org/projectforge/plugins/skillmatrix/SkillMatrixPlugin.kt b/plugins/org.projectforge.plugins.skillmatrix/src/main/kotlin/org/projectforge/plugins/skillmatrix/SkillMatrixPlugin.kt index 911e009905..6ab92f97af 100644 --- a/plugins/org.projectforge.plugins.skillmatrix/src/main/kotlin/org/projectforge/plugins/skillmatrix/SkillMatrixPlugin.kt +++ b/plugins/org.projectforge.plugins.skillmatrix/src/main/kotlin/org/projectforge/plugins/skillmatrix/SkillMatrixPlugin.kt @@ -41,7 +41,7 @@ private val log = KotlinLogging.logger {} class SkillMatrixPlugin : AbstractPlugin( PluginAdminService.PLUGIN_SKILL_MATRIX_ID, "Skill matrix", - "The users skills managed by the users themselve." + "The users skills managed by the users themselves." ) { override fun initialize() { diff --git a/site/_changelogs/changelog-20180717--6-22.md b/site/_changelogs/changelog-20180717--6-22.md index 27878d523d..e5df9fde3b 100644 --- a/site/_changelogs/changelog-20180717--6-22.md +++ b/site/_changelogs/changelog-20180717--6-22.md @@ -8,7 +8,7 @@ The ProjectForge Version 6.22.0 with new Spring Boot version and some bugfixes i __The ProjectForge Launcher is not working anymore. Only the projectforge-application.jar command-line starter is available.__ {% include tag.html tag="added" %} -- BIC for german IBANs optiona +- BIC for german IBANs optional {% include tag.html tag="improved" %} - Update Spring Boot version to 2.0 diff --git a/site/_changelogs/changelog-20210525--7-2.adoc b/site/_changelogs/changelog-20210525--7-2.adoc index b1ffd5a5a6..78b8728b86 100644 --- a/site/_changelogs/changelog-20210525--7-2.adoc +++ b/site/_changelogs/changelog-20210525--7-2.adoc @@ -9,7 +9,7 @@ Security issues of pentests, DataTransfer improved. ++++ {% include tag.html tag="added" %} ++++ -- Word-Templating (Merlin): Word templating for letters, information, contracts etc. with serial execution including variables, if-else-expressions etc. inside docx (like Velocity-Scripting-engine). All users/emloyees may receive letters/contracts etc. (as Word and/or PDF-files) in ther personal boxes via serial execution. + +- Word-Templating (Merlin): Word templating for letters, information, contracts etc. with serial execution including variables, if-else-expressions etc. inside docx (like Velocity-Scripting-engine). All users/emloyees may receive letters/contracts etc. (as Word and/or PDF-files) in their personal boxes via serial execution. + example template files included for a quick start. - Log viewer added (for admins as well as for users for tracking own activity for mass updates of time-sheets, usage of Merlin or Datev-imports) - Gender for users added: Used by Merlin (word templating) for creation of personalized letters, contracts etc. diff --git a/site/_data/navigation_boxes.yml b/site/_data/navigation_boxes.yml index 0628ceb848..21e657c596 100644 --- a/site/_data/navigation_boxes.yml +++ b/site/_data/navigation_boxes.yml @@ -1,7 +1,7 @@ # Boxes include navigation - title: Scalable - desc: A professional project management, financial and adminstrative controlling platform for teams from small to large. + desc: A professional project management, financial and administrative controlling platform for teams from small to large. icon: settings #doc: installation diff --git a/site/_docs/adminguide.adoc b/site/_docs/adminguide.adoc index 784f06e557..ffe6de70ca 100644 --- a/site/_docs/adminguide.adoc +++ b/site/_docs/adminguide.adoc @@ -209,7 +209,7 @@ ProjectForge works with Groovy templates for generating e-mails (as notifications). You'll find the templates inside your web archive of the ProjectForge installation: `plugins/projectforge-business-X.X.X.jar/mail/.` You can -modify any template of this directory if needed by simply copiing the +modify any template of this directory if needed by simply copying the file(s) you want to modify into your ProjectForge application dir, which is also the destination of `application.properties:` @@ -528,10 +528,10 @@ projectforge.phoneLookupKey=*******SECRET******** If you work with accounting records (DATEV) you may be want to have business assessments (BWA in German). The business assessments of DATEV -constist of rows. Each row has a line number (no) and a title (for +consists of rows. Each row has a line number (no) and a title (for displaying). The `accountRange` defines which DATEV accounts matches the row. Please note, that a record is assigned to the first row found. + -If the priorty of a row is not high, the row will not be shown in the +If the priority of a row is not high, the row will not be shown in the short form of business assessments. The value defines row amounts which are calculated (see example below). @@ -585,7 +585,7 @@ password change. ==== 2FA (two-factor-authentication) -2FA (two factor autentication) is supported: +2FA (two factor authentication) is supported: * by using RFC6238, used by e. g. Google or Microsoft Authenticator. * SMS if configured @@ -593,9 +593,9 @@ password change. You may specify the expiry periods of 2FA for different expiry periods URL's by shortcuts for predefined sets of uri matchers and/or own regular expressions (as uri matchers). -A web filter checks for every request, if there is a 2FA is required and -if the last successfull 2FA of the current session is not older than the specified expiry period. -The timestamp of a sucessfull 2FA is stored in the user's session as well as in any user's +A web filter checks for every request, if a 2FA is required and if the last +successful 2FA of the current session is not older than the specified expiry period. +The timestamp of a successful 2FA is stored in the user's session as well as in any user's stay-logged-in-session. Recoomended example configuration: @@ -623,7 +623,7 @@ Rules * If expressions do start with `/` they will be replaced by their regex: `/rs/user` -> `^/rs/user.+++*+++`: Any uri *starting* with `/rs/user` is matching. * Empty entries means: no 2nd factor -* Regular expressions and shortcuts should be seperated by ';'. +* Regular expressions and shortcuts should be separated by ';'. * Supported shortcuts are `ADMIN`, `HR`, `FINANCE`, `ORGA`, `SCRIPTING`, `MY_ACCOUNT`, `PASSWORD` containing a bunch of regex. * You may also use `WRITE:` for specifying only all write access calls of an entity (rest calls of React and @@ -765,7 +765,7 @@ assigned in ProjectForge to the same ProjectForge group. ===== LDAP entries -See figures [.external-link]#3# and [.external-link]#4# for detailled +See figures [.external-link]#3# and [.external-link]#4# for detailed information of how does ProjectForge stores and expect LDAP fields and object classes. @@ -779,7 +779,7 @@ fields `uidNumber, gidNumber, homeDirectory` and `loginShell` are only used and managed if configured). The field `employeeNumber` is used by ProjectForge for storing the primary key of the ProjectForge user entry in LDAP (for a better -syncronization). So the renaming of user names should work. +synchronization). So the renaming of user names should work. |=== image::/uploads/adminguide/LDAP-group-entry.png[image] @@ -789,7 +789,7 @@ image::/uploads/adminguide/LDAP-group-entry.png[image] |Figure 4: |ProjectForge uses the fields and object classes shown in this figure for groups. The field `businessCategory` is used by ProjectForge for storing the primary key of the ProjectForge group entry -in LDAP (for a better syncronization). So the renaming of group names +in LDAP (for a better synchronization). So the renaming of group names should work. |=== @@ -798,7 +798,7 @@ should work. ProjectForge supports the management of POSIX accounts with the data `uidNumber,` `gidNumber,` `homeDirectory,` and `loginShell.` -You can adminster the POSIX account data in the UserEditPage after +You can administer the POSIX account data in the UserEditPage after configuring the *`application.properties`* like the above example. Pleaser refer the tool-tips for further information: @@ -949,7 +949,7 @@ Refer the migration guide for required, manual changes. === Re-indexing the database -Should be done after setup: Use the adminstration menu. +Should be done after setup: Use the administration menu. === Analysing tools @@ -1053,7 +1053,7 @@ ____ If you want to use productive data in your develepment system for testing, it's recommended to set all e-mail addresses of the users to your developers e-mail. Also all passwords can be easily set -to `test123` if you user folliwing sql statement in your test database +to `test123` if you user following sql statement in your test database (not productive!): ____ @@ -1216,7 +1216,7 @@ automatically enabled are described here. The plugins-jar must be in another folder(plugins) next to the ProcetForgeJar. -The plugins are managed under Adminstration --> Plugins in the +The plugins are managed under Administration --> Plugins in the ProjectForge web app. After the activation, they have to restart ProjectForge. diff --git a/site/_docs/development.adoc b/site/_docs/development.adoc index 91f0c219ae..aa706b2d7a 100644 --- a/site/_docs/development.adoc +++ b/site/_docs/development.adoc @@ -71,7 +71,7 @@ With ProjectForge 7.x Kotlin and ReactJS is introduced. ** Smart operations on collections (map, find, sort etc.) ** Immutable objects, classes and functions as default. ** Null safety - ** Compability with JAVA code. + ** Compatibility with JAVA code. * Java and Kotlin will both exist. Only most BaseDO classes were migrated and new functionality will mostly be written in Kotlin. Please note: Kotlin must be compiled with target 1.8 (Java version) but is fully runnable on Java 9, 10 and 11 VMs. diff --git a/site/_docs/installation.adoc b/site/_docs/installation.adoc index a1b02b68d8..29c8fc29b0 100644 --- a/site/_docs/installation.adoc +++ b/site/_docs/installation.adoc @@ -123,7 +123,7 @@ ProjectForge is only available on port 8080 from localhost due to security reaso [NOTE] ==== -Please be aware, that after your first start of ProjectForge, your page might be public and be configured by anybody else! So proceed immediatelyly with the configuration if your new ProjectForge instance is +Please be aware, that after your first start of ProjectForge, your page might be public and be configured by anybody else! So proceed immediately with the configuration if your new ProjectForge instance is public available. ==== @@ -139,7 +139,7 @@ h|User name | The user name of the initial admin user of ProjectForge. h|Password | Admin's password. h|Default time zone | Default time zone for all users, if not configured by an user und MyAccount. h|Calendar domain | ProjectForge provides calendar and events. For having world-wide unique event id's, choose here your personal name. -h|Administrators | ProjectForge sends e-mails to this address(es) in the case of special errors. You can specify one ore more (coma separated) addresses (RFC822). +h|Administrators | ProjectForge sends e-mails to this address(es) in the case of special errors. You can specify one or more (coma separated) addresses (RFC822). h|Feed-back | If this e-mail is given then a feedback panel will be shown if an error occurs. The user has the possibility to send an e-mail feedback (e. g. JIRA-system or help desk). |=== @@ -213,10 +213,10 @@ All of the commands below should be run with `root` privileges. ==== Configure Nginx To use NGINX as a reverse proxy, it's necessary to create a configuration file. The standard path for NGINX configurations is `/etc/nginx/sites-available/`, so let's create the file link:misc/nginx_sites-available_projectforge[`/etc/nginx/sites-available/projectforge`]. -If you want to use `.htaccess` to blok access to the installation, you need to remove the comment character (`#`) in front of the `auth_basic` and `auth_basic_file` parameters. +If you want to use `.htaccess` to block access to the installation, you need to remove the comment character (`#`) in front of the `auth_basic` and `auth_basic_file` parameters. If you want to use HSTS (which makes browsers show an error page when the SSL certificate is invalid and/or nonexistent), remove the comment character (`#`) in front of the `add_header Strict-Transport-Security` parameter. -**Remeber to replace *projectforge.example.com* with the actual domain you'll run ProjectForge on!** +**Remember to replace *projectforge.example.com* with the actual domain you'll run ProjectForge on!** To activate the NGINX configuration, you'll need to symlink the configuration file we just created to `/etc/nginx/sites-enabled`. This can be done by using the following command: @@ -281,7 +281,7 @@ Daily backups (not monthly) will be deleted after 30 days. Refer config file for all options: [https://github.com/micromata/projectforge/blob/develop/projectforge-business/src/main/resources/application.properties] == Supported Java versions -.Java Compability (2021/04/12) +.Java Compatibility (2021/04/12) [cols="1,1,1,3"] |=== |Java version | V7.5+ | V8.0+ | Comments diff --git a/site/_docs/quickstart.adoc b/site/_docs/quickstart.adoc index 9348dd9242..6051c7056f 100644 --- a/site/_docs/quickstart.adoc +++ b/site/_docs/quickstart.adoc @@ -49,7 +49,7 @@ Login as admin user and create a top level structure element with the name of yo === Create a group for all employees -Add a user group (meu item "Administration" -> "Groups") named e. g. "JavaGurus employees". +Add a user group (menu item "Administration" -> "Groups") named e. g. "JavaGurus employees". [cols=2*,options="header"] |=== @@ -79,9 +79,9 @@ Click on the menu entry 'structure tree' and create a structure element named as | ACME web portal | Root (select parent structure element by clicking on the hierarchy icon and simply select Root). |=== -can change the hierarchy and the names of your structure elements (e. g. for organizing your projects per customer) later, so start with your project as top level structure element. Also user names, group names etc. can be changed any time you want without loosing any references in the system. +can change the hierarchy and the names of your structure elements (e. g. for organizing your projects per customer) later, so start with your project as top level structure element. Also user names, group names etc. can be changed any time you want without losing any references in the system. -You can change the hierarchy and the names of your structure elements (e. g. for organizing your projects per customer) later, so start with your project as top level structure element. Also user names, group names etc. can be changed any time you want without loosing any references in the system. +You can change the hierarchy and the names of your structure elements (e. g. for organizing your projects per customer) later, so start with your project as top level structure element. Also user names, group names etc. can be changed any time you want without losing any references in the system. === Assign the required team access @@ -95,7 +95,7 @@ ProjectForge® has an very detailed access management, so you can configure whic | ACME web portal | ACME web portal team | yes | The top-level structure element for the ACME web portal project. | Choose template 'employee'. |=== -If they're are any labels or text fields with italic letters (such as the label 'recursive') you'll get a tool-tip explaning the component when you place your mouse over such elements. +If they're are any labels or text fields with italic letters (such as the label 'recursive') you'll get a tool-tip explaining the component when you place your mouse over such elements. Finish Now your project team members are able to book time sheets on your ACME web portal project. They're also able to give their project a sub structure, explaining in the next chapter: ProjectForge Quickstart Structure of your projects @@ -139,7 +139,7 @@ In the structure tree you can see all consumptions of every displayed structure There are two ways to configure budgets. The easiest way is to enter the budget in hours on every structure element. If a structure element has structure sub elements with given maximum hours and the structure element has itself no budget setting, the budget for this parent structure element is automatically calculated (sum of all structure sub elements budgets). The other way is to define your budgets by assigning orders (described not here). You can mix both approaches. ProjectForge Quickstart Gantt charts -Planning a project and controlling a project to keep the project on track, Gantt charts are a very often used technique. ProjectForge® supports Gantt charts as descriped in this chapter. +Planning a project and controlling a project to keep the project on track, Gantt charts are a very often used technique. ProjectForge® supports Gantt charts as described in this chapter. You can edit all Gantt parameters such as start/stop dates, duration, predecessors etc. by editing the structure element in the structure tree. But it's more convenient to edit the parameters of the structure element in the Gantt tree directly. You'll get the Gantt functionality by choosing the menu entry 'Gantt'. Add a new chart and choose your structure element (project, release of project phase) you like to plan. In this example we choose the project's main structure element 'ACME web portal'. @@ -161,7 +161,7 @@ Following steps are required to enable your ProjectForge installation for having Set the flag "is cost activated" to true (see configuration menu). ==== Access rights and required group of the financial administrative user -Please ensure that the financial adminstrative user is assigned to the group PF_FINANCE and the right "cost *" is set to read/write, same for projects. +Please ensure that the financial administrative user is assigned to the group PF_FINANCE and the right "cost *" is set to read/write, same for projects. ==== Define cost2 types @@ -194,7 +194,7 @@ For project/customer specific cost objectives you'll need to define customers fi ==== Define cost2 -You can define cost2 entries (independant from projects) or project specific cost2 entries by selecting the project first. +You can define cost2 entries (independent from projects) or project specific cost2 entries by selecting the project first. ==== Assign projects or cost2 to structure elements diff --git a/site/_docs/technologies.adoc b/site/_docs/technologies.adoc index 8497e49611..6e1082ebbb 100644 --- a/site/_docs/technologies.adoc +++ b/site/_docs/technologies.adoc @@ -73,7 +73,7 @@ Java 8 might work also with ProjectForge 7, but OpenJDK 11 is recommended (teste |JCR|JackRabbit for document storage (used by data transfer tool and others) |FOP |For the creation of PDFs, e. g. the user time sheets, monthly employee reports etc. |JUnit |Test framework -|GitHub actions|CI - continouos integration system +|GitHub actions|CI - continuous integration system |Groovy/Kotlin Script |Used for scripting ProjectForge for reports (MS Excel exports, charting etc.) as well as for e-mail templating (see AdministrationGuide for further information). |Jasperreports|For generating reports. |JFreeChart|For internal graphics and diagrams as well as for usage in the groovy scriptlets by the users, e. g. for reports. diff --git a/site/_docs/userguide.adoc b/site/_docs/userguide.adoc index 5e2e3eeeb3..8083ddaf94 100644 --- a/site/_docs/userguide.adoc +++ b/site/_docs/userguide.adoc @@ -92,10 +92,10 @@ OR test* + untouched.) |hello AND name:hurzel |hello AND name:hurzel hello AND name:hurzel + -(no substituion because of ':'.) +(no substitution because of ':'.) |+hello and hurzel |+hello and hurzel + -(no substituion because of '+'.) +(no substitution because of '+'.) |=== If in doubt, ProjectForge® displays any substitution of the user's @@ -121,7 +121,7 @@ objects regarding the history of changes, e. g. the user wants to find any object which was changed during the last 10 minutes etc. Click on the plus sign at the right bottom of the search field's label to see the opportunities. + -All other filter criterias will also be used. (see figure 2) +All other filter criteria will also be used. (see figure 2) image::/uploads/userguide/extendedFilter.png[image] @@ -177,7 +177,7 @@ edit pages: . Direct link for displaying an object by id. . Direct link including parameters for calling the edit page with -pre-filled parameters. This is usefull for adding new time-sheets with +pre-filled parameters. This is useful for adding new time-sheets with pre-filled parameters. The second link may be used for creation of new time-sheets with @@ -365,7 +365,7 @@ the contain only a single event which isn't already present. Later an update dialog with differences to accept/deny will be shown and a multi-import should be supported. * *More complex recurrence pattern* -* *Subsciption of external calendars in ProjectForge* + +* *Subscription of external calendars in ProjectForge* + Starting with icloud. An user is able to share his icloud calendars via ProjectForge. @@ -448,7 +448,7 @@ You may import phone numbers to your mobile device or system telephone (e. g. SNOM telephone) if vCard isn't supported. + Via the button 'Export phone list' all' all marked phone numbers will be exported with ISO-8859 encoding as csv file. ProjectForge® extends -the names of the contacs automaticall with "mobile" or "private", if the +the names of the contacts automatically with "mobile" or "private", if the number is not the business phone number. @@ -649,7 +649,7 @@ to a structure element. === Booking of time sheets Time sheets must be assigned to a structure element. For improving the -quality of time sheets different rules may be definied in +quality of time sheets different rules may be defined in ProjectForge®. + Following rules are implemented, if the user doesn't hit the rules he won't be able to book his working time on such structure elements. @@ -685,7 +685,7 @@ the right to do (see user administration of ProjectForge®). All modifications of orders, if not done by the project manager itself will be sent by e-mail including a quick link to the order, see figure -20, a notication is suppressed if the check-box is disabled.. +20, a notification is suppressed if the check-box is disabled.. image::/uploads/userguide/Auftragsbuch-Notification.png[image] @@ -869,7 +869,7 @@ The total amount is: £92.23 === Invoices -ProjectForge® supportes the management of invoices (inbound and +ProjectForge® supports the management of invoices (inbound and outbound, creditors and debitors): * Inovices may contain an unlimited number of positions. @@ -1193,7 +1193,7 @@ return result; You may protect time sheets by date for structure elements (including all descendent structure elements). This protection ensures that no -employee is able to modifiy time sheets with dates before the date where +employee is able to modify time sheets with dates before the date where the protection ends. + This is useful if the time sheets are invoiced or taken over by other accounting systems. Figure 31 shows a structure element with a @@ -1331,7 +1331,7 @@ Examples: * +++"'^5.02.*"+++ -> +++"^5.02.*"+++ (matches all strings starting with "5?02". (This strategy of replacement is for convenience purposes because '.' -means normally any character and '*' means a multiple occurence of the +means normally any character and '*' means a multiple occurrence of the character before the asterisk: for example "3.1*" will match "3x1111" but not "3.120.08.02".) @@ -1442,7 +1442,7 @@ they represent customers, projects, releases, tasks etc. |Beleg |receipt | -|Betrag |ammount | +|Betrag |amount | |Brutto |gross (amount) | @@ -1489,7 +1489,7 @@ ProjectForge®. |Kostenträgerart |type of cost unit |Term used inside the financial module of ProjectForge®. Examples for types of cost units are: 'Travelling', 'Acquisition', 'Meetings' etc. Types are customizable and -used for specifiing different types of costs in projects and/or company +used for specifying different types of costs in projects and/or company wide. |Kostenzuweisung |cost assignment |Term used inside the financial module diff --git a/site/_faqs/administration-30.md b/site/_faqs/administration-30.md index 16480259e9..660098e0c8 100644 --- a/site/_faqs/administration-30.md +++ b/site/_faqs/administration-30.md @@ -4,4 +4,4 @@ categories: [administration,faq] permalink: /misc/faqs.html --- -Please add your logo at the given path as pdf-logo.png. Please refer the AdminstrationGuide. +Please add your logo at the given path as pdf-logo.png. Please refer the AdministrationGuide. diff --git a/site/_sass/uikit/components/button.scss b/site/_sass/uikit/components/button.scss index f65e1c2230..e556b88296 100644 --- a/site/_sass/uikit/components/button.scss +++ b/site/_sass/uikit/components/button.scss @@ -361,7 +361,7 @@ $button-link-disabled-color: $global-muted-color !default; ========================================================================== */ /* - * 1. Using `flex` instead of `inline-block` to prevent whitespace betweent child elements + * 1. Using `flex` instead of `inline-block` to prevent whitespace between child elements * 2. Behave like button * 3. Create position context */ diff --git a/site/_sass/uikit/components/form.scss b/site/_sass/uikit/components/form.scss index e731cffb63..3969f96143 100644 --- a/site/_sass/uikit/components/form.scss +++ b/site/_sass/uikit/components/form.scss @@ -560,7 +560,7 @@ select.uk-form-width-xsmall { width: ($form-width-xsmall + 25px); } * 1. Position and resize the form control to always cover its container * 2. Required for Firefox for positioning to the left * 3. Required for Webkit to make `height` work - * 4. Hide controle and show cursor + * 4. Hide controls and show cursor * 5. Needed for the cursor * 6. Clip height caused by 5. Needed for Webkit only */ diff --git a/site/_sass/uikit/components/utility.scss b/site/_sass/uikit/components/utility.scss index 2ac1777683..79d521feff 100644 --- a/site/_sass/uikit/components/utility.scss +++ b/site/_sass/uikit/components/utility.scss @@ -149,7 +149,7 @@ $dragover-box-shadow: 0 0 20px rgba(100,100,100,0.3) [class*='uk-float-'] { max-width: 100%; } -/* Overfow +/* Overflow ========================================================================== */ .uk-overflow-hidden { overflow: hidden; }