Skip to content

Commit

Permalink
Merge branch 'release/2.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
ktekinay committed Jul 3, 2020
2 parents 0f4d0a9 + 43a3003 commit 819ef15
Show file tree
Hide file tree
Showing 53 changed files with 3,824 additions and 1,466 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@ Kaju Admin App/Builds - Kaju Admin.xojo_project
Kaju Admin CLI/kaju.debug
Kaju Admin CLI/Builds - Kaju Admin CLI.xojo_project
*.gz
Update Test App/Builds - Kaju Update Test
Kaju Admin App/Builds - Kaju Admin
Kaju Admin CLI/Builds - Kaju Admin CLI
11 changes: 9 additions & 2 deletions Admin Classes/KajuFile.xojo_code
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Protected Class KajuFile
data.EscapeSlashes = false

//
// Perform $VERSION$ substitutions
// Perform $VERSION$ substitutions and add security token
//
dim keys() as string = Kaju.UpdateInformation.BinaryNames

Expand Down Expand Up @@ -97,7 +97,7 @@ Protected Class KajuFile
#tag EndMethod

#tag Method, Flags = &h0
Shared Function InsertVersion(originalURL As String, version As String) As String
Shared Function InsertVersion(originalURL As String, version As String) As String
return originalURL.ReplaceAllB( "$VERSION$", version )
End Function
#tag EndMethod
Expand Down Expand Up @@ -261,32 +261,39 @@ Protected Class KajuFile
Group="ID"
InitialValue="-2147483648"
Type="Integer"
EditorType=""
#tag EndViewProperty
#tag ViewProperty
Name="Left"
Visible=true
Group="Position"
InitialValue="0"
Type="Integer"
EditorType=""
#tag EndViewProperty
#tag ViewProperty
Name="Name"
Visible=true
Group="ID"
InitialValue=""
Type="String"
EditorType=""
#tag EndViewProperty
#tag ViewProperty
Name="Super"
Visible=true
Group="ID"
InitialValue=""
Type="String"
EditorType=""
#tag EndViewProperty
#tag ViewProperty
Name="Top"
Visible=true
Group="Position"
InitialValue="0"
Type="Integer"
EditorType=""
#tag EndViewProperty
#tag EndViewBehavior
End Class
Expand Down
11 changes: 11 additions & 0 deletions Custom Plist/Info.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
</dict>
</dict>
</plist>
Binary file removed External Images/Some_Image.png
Binary file not shown.
Binary file added External Images/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added External Images/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added External Images/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added External Images/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 819ef15

Please sign in to comment.