Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
moodle-mod_pdfannotator
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
elc
moodle-mod_pdfannotator
Commits
443aab33
Commit
443aab33
authored
4 years ago
by
anisa kusumadewi
Browse files
Options
Downloads
Patches
Plain Diff
merging version conflict
parent
8fc6a1cb
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
db/upgrade.php
+2
-2
2 additions, 2 deletions
db/upgrade.php
version.php
+1
-1
1 addition, 1 deletion
version.php
with
3 additions
and
3 deletions
db/upgrade.php
+
2
−
2
View file @
443aab33
...
...
@@ -575,7 +575,7 @@ function xmldb_pdfannotator_upgrade($oldversion) {
upgrade_mod_savepoint
(
true
,
2019070100
,
'pdfannotator'
);
}
if
(
$oldversion
<
20210
2
2201
)
{
if
(
$oldversion
<
20210
3
2201
)
{
// Define field useprivatecomments to be added to pdfannotator.
$table
=
new
xmldb_table
(
'pdfannotator'
);
...
...
@@ -596,7 +596,7 @@ function xmldb_pdfannotator_upgrade($oldversion) {
}
// Pdfannotator savepoint reached.
upgrade_mod_savepoint
(
true
,
20210
2
2201
,
'pdfannotator'
);
upgrade_mod_savepoint
(
true
,
20210
3
2201
,
'pdfannotator'
);
}
return
true
;
...
...
This diff is collapsed.
Click to expand it.
version.php
+
1
−
1
View file @
443aab33
...
...
@@ -25,6 +25,6 @@
defined
(
'MOODLE_INTERNAL'
)
||
die
();
$plugin
->
component
=
'mod_pdfannotator'
;
// Full name of the plugin (used for diagnostics).
$plugin
->
version
=
202103
1900
;
// The current module version (Date: YYYYMMDDXX).
$plugin
->
version
=
202103
2201
;
// The current module version (Date: YYYYMMDDXX).
$plugin
->
release
=
'PDF Annotator v1.4 release 5'
;
$plugin
->
requires
=
2016112900
;
// Requires this Moodle version.
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