Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-Core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-Core
Commits
ff55a75f
Commit
ff55a75f
authored
6 years ago
by
Frank Poetzsch-Heffter
Browse files
Options
Downloads
Patches
Plain Diff
Aktualisierung gitignore und ideas
parent
08aa9c63
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!86
Merge school-apps
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitignore
+1
-1
1 addition, 1 deletion
.gitignore
.idea/dataSources.local.xml
+3
-3
3 additions, 3 deletions
.idea/dataSources.local.xml
.idea/misc.xml
+4
-1
4 additions, 1 deletion
.idea/misc.xml
.idea/school-apps.iml
+2
-1
2 additions, 1 deletion
.idea/school-apps.iml
with
10 additions
and
6 deletions
.gitignore
+
1
−
1
View file @
ff55a75f
__pycache__
env/
v
env/
*.pyc
secure*
.idea/workspace.xml
This diff is collapsed.
Click to expand it.
.idea/dataSources.local.xml
+
3
−
3
View file @
ff55a75f
...
...
@@ -2,7 +2,7 @@
<project
version=
"4"
>
<component
name=
"dataSourceStorageLocal"
>
<data-source
name=
"Django default"
uuid=
"ef6730d6-e849-4772-acac-62469acab4d2"
>
<database-info
product=
"MySQL"
version=
"5.7.20-0ubuntu0.16.04.1"
jdbc-version=
"4.0"
driver-name=
"MySQL Connector Java"
driver-version=
"mysql-connector-java-5.1.44 ( Revision: b3cda4f864902ffdde495b9df93937c3e20009be )"
>
<database-info
product=
"MySQL"
version=
"5.7.20-0ubuntu0.16.04.1"
jdbc-version=
"4.0"
driver-name=
"MySQL Connector Java"
driver-version=
"mysql-connector-java-5.1.44 ( Revision: b3cda4f864902ffdde495b9df93937c3e20009be )"
family=
"MYSQL"
exact-version=
"5.7.20"
>
<extra-name-characters>
#@
</extra-name-characters>
<identifier-quote-string>
`
</identifier-quote-string>
</database-info>
...
...
@@ -11,7 +11,7 @@
<introspection-schemas>
*:schoolapps
</introspection-schemas>
</data-source>
<data-source
name=
"Django default2"
uuid=
"ea4cff78-5949-410f-aa64-d6daa5fb293d"
>
<database-info
product=
"MySQL"
version=
"5.7.21-0ubuntu0.16.04.1"
jdbc-version=
"4.0"
driver-name=
"MySQL Connector Java"
driver-version=
"mysql-connector-java-5.1.44 ( Revision: b3cda4f864902ffdde495b9df93937c3e20009be )"
>
<database-info
product=
"MySQL"
version=
"5.7.21-0ubuntu0.16.04.1"
jdbc-version=
"4.0"
driver-name=
"MySQL Connector Java"
driver-version=
"mysql-connector-java-5.1.44 ( Revision: b3cda4f864902ffdde495b9df93937c3e20009be )"
family=
"MYSQL"
exact-version=
"5.7.21"
>
<extra-name-characters>
#@
</extra-name-characters>
<identifier-quote-string>
`
</identifier-quote-string>
</database-info>
...
...
@@ -20,7 +20,7 @@
<introspection-schemas>
*:schoolapps
</introspection-schemas>
</data-source>
<data-source
name=
"Django untis"
uuid=
"ae145b31-953d-4d55-ad07-b49b3287f618"
>
<database-info
product=
"MySQL"
version=
"5.7.21-0ubuntu0.16.04.1"
jdbc-version=
"4.0"
driver-name=
"MySQL Connector Java"
driver-version=
"mysql-connector-java-5.1.44 ( Revision: b3cda4f864902ffdde495b9df93937c3e20009be )"
>
<database-info
product=
"MySQL"
version=
"5.7.21-0ubuntu0.16.04.1"
jdbc-version=
"4.0"
driver-name=
"MySQL Connector Java"
driver-version=
"mysql-connector-java-5.1.44 ( Revision: b3cda4f864902ffdde495b9df93937c3e20009be )"
family=
"MYSQL"
exact-version=
"5.7.21"
>
<extra-name-characters>
#@
</extra-name-characters>
<identifier-quote-string>
`
</identifier-quote-string>
</database-info>
...
...
This diff is collapsed.
Click to expand it.
.idea/misc.xml
+
4
−
1
View file @
ff55a75f
<?xml version="1.0" encoding="UTF-8"?>
<project
version=
"4"
>
<component
name=
"ProjectRootManager"
version=
"2"
project-jdk-name=
"Python 3.6 (school-apps)"
project-jdk-type=
"Python SDK"
/>
<component
name=
"ProjectRootManager"
version=
"2"
project-jdk-name=
"Python 3.7 (school-apps)"
project-jdk-type=
"Python SDK"
/>
<component
name=
"PyCharmProfessionalAdvertiser"
>
<option
name=
"shown"
value=
"true"
/>
</component>
</project>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
.idea/school-apps.iml
+
2
−
1
View file @
ff55a75f
...
...
@@ -15,8 +15,9 @@
<component
name=
"NewModuleRootManager"
>
<content
url=
"file://$MODULE_DIR$"
>
<sourceFolder
url=
"file://$MODULE_DIR$/schoolapps"
isTestSource=
"false"
/>
<excludeFolder
url=
"file://$MODULE_DIR$/venv"
/>
</content>
<orderEntry
type=
"jdk"
jdkName=
"Python 3.
6
(school-apps)"
jdkType=
"Python SDK"
/>
<orderEntry
type=
"jdk"
jdkName=
"Python 3.
7
(school-apps)"
jdkType=
"Python SDK"
/>
<orderEntry
type=
"sourceFolder"
forTests=
"false"
/>
<orderEntry
type=
"library"
name=
"jquery-3.2.1"
level=
"application"
/>
<orderEntry
type=
"module"
module-name=
"bwinf-36-2"
/>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment