Skip to content
This repository has been archived by the owner on Jun 11, 2024. It is now read-only.

Merge amsl.technology into OntoWiki #411

Open
wants to merge 517 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
517 commits
Select commit Hold shift + click to select a range
5d8542e
add translations
a-nnika Sep 11, 2015
5e08e62
Forward submodule extensions/issnimporter
a-nnika Sep 11, 2015
cb0cfa4
add translations
a-nnika Sep 11, 2015
aae18bb
Forward submodule extensions/counterimporter
a-nnika Sep 23, 2015
89f17ac
* forward submodule libraries/RDFAuthor
BrummbQ Oct 13, 2015
e72f862
* update
BrummbQ Oct 14, 2015
e95f744
* forward submodule RDFauthor
BrummbQ Oct 14, 2015
adaa221
* natural sort properties by title
BrummbQ Oct 14, 2015
09ba40b
* forward module libraries/RDFauthor
BrummbQ Oct 14, 2015
2613bf5
Forward subodule extensions/counterimporter
a-nnika Oct 15, 2015
d3e54d1
* adjust ordering of linking here list and properties of filter module
BrummbQ Oct 15, 2015
0612f09
* increase default batch size of lists to 30
BrummbQ Oct 15, 2015
9361927
* forward submodule extensions/fulltextsearch
BrummbQ Oct 20, 2015
2206a9c
* also sort possible values of property in filter
BrummbQ Oct 21, 2015
6aedf14
Forward submodule extensions/template
ReikMuellerUBL Oct 22, 2015
d820039
forward submodule libraries/RDFauthor
ReikMuellerUBL Oct 22, 2015
04bcd78
Merge branch 'develop' of https://github.com/amsl-project/OntoWiki in…
ReikMuellerUBL Oct 22, 2015
8a0fbb7
support of datatypes in new instances
ReikMuellerUBL Oct 22, 2015
80aae1e
forward submodule libraries/RDFauthor
ReikMuellerUBL Oct 22, 2015
e4d6c16
forward submodule libraries/RDFauthor
ReikMuellerUBL Oct 23, 2015
76a2ad4
* set non-translated values on filter select options
BrummbQ Oct 26, 2015
9176ab4
new extension: meta data source information service
ReikMuellerUBL Oct 27, 2015
5e8282d
* add datatype to current filter value
BrummbQ Oct 27, 2015
0b8e756
* forward submodule Erfurt
BrummbQ Oct 27, 2015
7000db9
* forward Erfurt to branch develop
BrummbQ Oct 28, 2015
02bcf3d
service available for non-registered users
ReikMuellerUBL Oct 28, 2015
4bfc1c9
Meta Data Service: impoved pretty-printing
ReikMuellerUBL Oct 28, 2015
21eaaf2
Meta Data Service: return code 500 on auth-failure
ReikMuellerUBL Oct 28, 2015
e450cc6
* save shown properties for lists in user session
BrummbQ Oct 29, 2015
a0c92c9
Meta data service: without dummy user login.
ReikMuellerUBL Oct 29, 2015
52fc22a
* refactor listsetuphelper and also save sort config to user profile
BrummbQ Oct 30, 2015
94a8e4e
* fix filter dialog for uri based properties
BrummbQ Nov 5, 2015
b122fac
* rework filtering of uri properties
BrummbQ Nov 5, 2015
f77d6ac
* extend uri not equals filter to include also unbound values
BrummbQ Nov 6, 2015
eb545d0
Forward submodule /extensions/counterimporter
ReikMuellerUBL Nov 10, 2015
9109c22
Forward submodule /extensions/issnimporter
ReikMuellerUBL Nov 10, 2015
40ccc3b
Forward submodule /extensions/statements
ReikMuellerUBL Nov 10, 2015
f02bc0a
removed uneccesary module tab.
ReikMuellerUBL Nov 10, 2015
0d02181
new module for inhouse data services
ReikMuellerUBL Nov 10, 2015
2cdb9bc
* make .htaccess compatible with httpd 2.4
BrummbQ Nov 12, 2015
30f2c2d
* match all graphs on clean and export
BrummbQ Nov 12, 2015
f0a0d76
* check for model in config
BrummbQ Nov 16, 2015
1a55b95
* move declaration of var back into case statements, prevents excepti…
BrummbQ Nov 16, 2015
7b86d56
forward submodule libraries/Erfurt
ReikMuellerUBL Nov 17, 2015
2a9b742
forward submodule libraries/RDFauthor
ReikMuellerUBL Nov 17, 2015
e02a209
forward submodule extensions/counterimporter
ReikMuellerUBL Nov 17, 2015
dd6f897
fix: editing resources
ReikMuellerUBL Nov 26, 2015
753c8d8
* don't overwrite config of other models
BrummbQ Nov 26, 2015
7d61158
forward submodule extensions/counterimporter
ReikMuellerUBL Nov 27, 2015
4f1091d
module for exposing arbitrary data to the www
ReikMuellerUBL Nov 27, 2015
945232e
Merge branch 'develop' of https://github.com/amsl-project/OntoWiki in…
ReikMuellerUBL Nov 27, 2015
4a0b205
Forward submodule extensions/counterimporter
ReikMuellerUBL Dec 1, 2015
c92fd74
* use dump_graph function also in export script
BrummbQ Dec 2, 2015
d3fb045
* include dump script
BrummbQ Dec 2, 2015
69dc0bf
Forward submodule libraries/Erfurt
ReikMuellerUBL Dec 3, 2015
8aed36b
Merge branch 'develop' of https://github.com/amsl-project/OntoWiki in…
ReikMuellerUBL Dec 3, 2015
1d95d35
forward submodule extension/deadlinehelper
ReikMuellerUBL Dec 4, 2015
a82cdd1
Forward submodule extensions/deadlinehelper
ReikMuellerUBL Dec 4, 2015
cacd3e5
Forward submodule extensions/statements
ReikMuellerUBL Dec 9, 2015
3eff225
Forward submodule extensions/statements
ReikMuellerUBL Dec 9, 2015
7eb487b
BugFix: comments added to wrong resource
ReikMuellerUBL Dec 10, 2015
3b60ed6
ui adaptations for deadline-helper extension
ReikMuellerUBL Dec 10, 2015
f278065
Forward submodule extensions/deadlinehelper
ReikMuellerUBL Dec 10, 2015
3175233
Forward submodule extesions/linkandcreate
ReikMuellerUBL Dec 10, 2015
1fd156c
Forward submodule libraries/RDFauthor
ReikMuellerUBL Dec 11, 2015
d891f9b
* first working version of reports extension
BrummbQ Dec 14, 2015
e7cb0e0
usability improvements in last changes widget
ReikMuellerUBL Dec 15, 2015
d38fca6
usability improvements in comments widget
ReikMuellerUBL Dec 15, 2015
93faee2
Forward submodule extensions/deadlinehelper.
ReikMuellerUBL Dec 15, 2015
06bad6a
* forward rdfauthor
BrummbQ Dec 15, 2015
8c1e4f8
* drop headline
BrummbQ Dec 15, 2015
2826811
* forward RDFauthor
BrummbQ Dec 15, 2015
16b4c84
Bugfix: test url
ReikMuellerUBL Dec 15, 2015
9654de0
Merge branch 'develop' of https://github.com/amsl-project/OntoWiki in…
ReikMuellerUBL Dec 15, 2015
db7513c
changed remote module location of imagehelper to amsl-project
ReikMuellerUBL Dec 16, 2015
40ec674
Forward submodule extensions/imagehelper.
ReikMuellerUBL Dec 16, 2015
e020aef
* reports: update design
BrummbQ Dec 17, 2015
920f761
Bugfix: system unavailable after config mistake by user
ReikMuellerUBL Dec 17, 2015
f7e6934
Forward submodule libraries/Erfurt.
ReikMuellerUBL Dec 17, 2015
a9fabc4
* forward RDFAuthor
BrummbQ Dec 22, 2015
d99ecdc
Merge branch 'feature/reports' into develop
BrummbQ Jan 4, 2016
5d9ba1d
* implement parameter substitution
BrummbQ Jan 5, 2016
127391d
Forward submodule extensions/statements
ReikMuellerUBL Jan 6, 2016
783873a
* access control for reports extension
BrummbQ Jan 6, 2016
2a0d1e6
* include dump sql script for virtuoso 7 - for real this time!
BrummbQ Jan 6, 2016
3b2c5e5
Forward submodule extensions/statements.
ReikMuellerUBL Jan 6, 2016
9496288
Merge branch 'develop' of https://github.com/amsl-project/OntoWiki in…
ReikMuellerUBL Jan 6, 2016
3272f60
* support html result in reports extension (use standard table format)
BrummbQ Jan 6, 2016
5cf0b86
* don't crash on wrongly configured allowed_users
BrummbQ Jan 7, 2016
5b1dd81
* wrong typecheck
BrummbQ Jan 7, 2016
d335aef
Forward submodule extension/statements.
ReikMuellerUBL Jan 7, 2016
721e415
Merge branch 'develop' of https://github.com/amsl-project/OntoWiki in…
ReikMuellerUBL Jan 7, 2016
c8f4397
Forward submodule extensions/statements.
ReikMuellerUBL Jan 8, 2016
20f5625
Forward submodule extensions/statements.
ReikMuellerUBL Jan 8, 2016
1132242
Forward submodule libraries/RDFauthor.
ReikMuellerUBL Jan 11, 2016
6195fad
* include autocomplete support for reports extension
BrummbQ Jan 11, 2016
0cab812
add multiple attributes for inline-editor
ReikMuellerUBL Jan 12, 2016
f34faa3
Merge branch 'develop' of https://github.com/amsl-project/OntoWiki in…
ReikMuellerUBL Jan 12, 2016
197e79f
Forward submodule extensions/counterimporter.
ReikMuellerUBL Jan 12, 2016
c925fef
* validate report parameters
BrummbQ Jan 12, 2016
7414687
* shorten autocomplete sparql query
BrummbQ Jan 12, 2016
99de550
Forward submodule libraries/RDFauthor.
ReikMuellerUBL Jan 12, 2016
27ebb1b
Merge branch 'develop' of https://github.com/amsl-project/OntoWiki in…
ReikMuellerUBL Jan 12, 2016
4c411c3
Forward submodule libraries/RDFauthor.
ReikMuellerUBL Jan 13, 2016
708e9e6
Fix: disable editing for imported attributes
ReikMuellerUBL Jan 13, 2016
14054ef
* prepend links with url base
BrummbQ Jan 13, 2016
55a2a84
Forward submodule libraries/RDFauthor.
ReikMuellerUBL Jan 14, 2016
42529dc
Merge branch 'develop' of https://github.com/amsl-project/OntoWiki in…
ReikMuellerUBL Jan 14, 2016
f831e7f
Fix: jump to resource fails on leading white space
ReikMuellerUBL Jan 14, 2016
9c9fe1e
Forward submodule /libraries/RDFauthor.
ReikMuellerUBL Jan 14, 2016
8a3da17
Forward submodule libraries/RDFauthor.
ReikMuellerUBL Jan 19, 2016
fdcc322
* update autocomplete query to include alternative labels
BrummbQ Jan 19, 2016
3c39d38
* limit size of html reports and show hint to user, if report has bee…
BrummbQ Jan 19, 2016
0737f69
* complete translations for reports
BrummbQ Jan 21, 2016
b1e82bf
* allow override of query limit in config
BrummbQ Jan 21, 2016
413a7b9
* override overflow to push horizontal scrollbar to the bottom
BrummbQ Jan 25, 2016
2016256
* don't enable autocomplete for untyped parameters or integers
BrummbQ Jan 25, 2016
f81de75
* enable number input for integers
BrummbQ Jan 25, 2016
f4ce30d
enable add-attribute-btn after inline-edditing
ReikMuellerUBL Feb 2, 2016
852b859
Forward submodule libraries/RDFauthor.
ReikMuellerUBL Feb 2, 2016
ce9fae0
Merge branch 'develop' of https://github.com/amsl-project/OntoWiki in…
ReikMuellerUBL Feb 2, 2016
172f6dd
possible Fix for bad translation
ReikMuellerUBL Feb 5, 2016
5f6cdfc
reuse Metadataservice as Chronjob extension
ReikMuellerUBL Feb 25, 2016
051c0bb
enable comments while archive mode is activated
ReikMuellerUBL Feb 25, 2016
f6e465c
new extensions: archive mode
ReikMuellerUBL Feb 25, 2016
0bc251f
disable Add Instance button while in archive mode
ReikMuellerUBL Feb 25, 2016
24158f9
ezb holdings files importer
ReikMuellerUBL Feb 25, 2016
ed6102e
new extension: chronjobs
ReikMuellerUBL Feb 25, 2016
d55e0ae
Forward submodule libraries/Erfurt.
ReikMuellerUBL Feb 25, 2016
e9da62c
fix: show more button in latest changes
ReikMuellerUBL Feb 25, 2016
d5c5ab0
process holdings file from amsl url
ReikMuellerUBL Feb 25, 2016
5154eff
Forward submodule extensions/files.
ReikMuellerUBL Feb 25, 2016
be4d913
extend list of imported ezb-data
ReikMuellerUBL Feb 29, 2016
3bfa8c6
Forward submodule extensions/issnimporter.
ReikMuellerUBL Feb 29, 2016
b0530bc
Forward submodule extensions/issnimporter.
ReikMuellerUBL Feb 29, 2016
04c3b13
Forward submodule extensions/issnimporter.
ReikMuellerUBL Feb 29, 2016
a2f15d7
Forward submodule extensions/issnimporter.
ReikMuellerUBL Mar 1, 2016
e2bf04d
Forward submodule libraries/RDFauthor.
ReikMuellerUBL Mar 1, 2016
f9bf033
Forward submodule extensions/files.
ReikMuellerUBL Mar 1, 2016
4120183
fix: don't display phone numbers like resources
ReikMuellerUBL Mar 2, 2016
fa72b4d
sort instance lists by default
ReikMuellerUBL Mar 3, 2016
1984053
display long lists of literals in own page
ReikMuellerUBL Mar 3, 2016
1937382
Forward submodule extensions/statements.
ReikMuellerUBL Mar 3, 2016
2cadf33
listview: add translation
ReikMuellerUBL Mar 4, 2016
57acd6e
listview: sort results
ReikMuellerUBL Mar 4, 2016
aa292eb
Forward submodule extensions/files.
ReikMuellerUBL Mar 10, 2016
c140668
Forward submodule libraries/Erfurt.
ReikMuellerUBL Mar 10, 2016
1457304
Forward submodule libraries/Erfurt.
ReikMuellerUBL Mar 10, 2016
3863cf2
Forward submodule libraries/Erfurt.
ReikMuellerUBL Mar 11, 2016
76823a0
display all possible properties to filter
ReikMuellerUBL Mar 14, 2016
8b4ae20
FIX: spelling and disabled by default
ReikMuellerUBL Apr 11, 2016
cb68ce8
enable queries for chron
ReikMuellerUBL Apr 11, 2016
a47ccfd
Forward submodule extensions/listexporter.
ReikMuellerUBL Apr 11, 2016
2414401
Forward submodule libraries/Erfurt.
ReikMuellerUBL Apr 11, 2016
59dfc2f
Forward submodule libraries/Erfurt.
ReikMuellerUBL Apr 12, 2016
3d3a65e
Adaptive cache
ReikMuellerUBL Apr 12, 2016
39dffc3
enable update-queries
ReikMuellerUBL Apr 12, 2016
36f9a17
Forward submodule libraries/Erfurt.
ReikMuellerUBL Apr 12, 2016
eb0676b
FIX: standart value for adaptive cache mode
ReikMuellerUBL Apr 12, 2016
3e0a514
exclude cronjobs entry for live update
ReikMuellerUBL Apr 12, 2016
890e26e
Forward submodule extensions/listexporter.
ReikMuellerUBL Apr 13, 2016
ab752b3
disable phone-links in list views
ReikMuellerUBL Apr 14, 2016
2e449f3
providing example config for cronjob extension
ReikMuellerUBL Apr 14, 2016
17ac332
Forward submodule extensions/linkandcreate.
ReikMuellerUBL Apr 15, 2016
64bfe03
Forward submodule extensions/files.
ReikMuellerUBL Apr 19, 2016
f107268
edit all values at once in inline-editor
ReikMuellerUBL Apr 19, 2016
a9ce006
FIX: not always show more-link
ReikMuellerUBL Apr 19, 2016
fb30e93
Add extension to downloaded file
ReikMuellerUBL Apr 19, 2016
fca680f
Forward submodule extensions/files.
ReikMuellerUBL Apr 20, 2016
cc1d80c
Forward submodule libraries/Erfurt.
ReikMuellerUBL Apr 22, 2016
73001e5
Forward submodule extensions/statements.
ReikMuellerUBL Apr 22, 2016
ecad554
Forward submodule extensions/statements.
ReikMuellerUBL Apr 26, 2016
53714ad
Exposing navigationAddElement()
ReikMuellerUBL Apr 29, 2016
1fca8fc
FIX: start RDFauthor only once in clone mode
ReikMuellerUBL May 3, 2016
43c1ec8
Forward submodule extensions/template.
ReikMuellerUBL May 3, 2016
1ba4c1d
performance improvements
ReikMuellerUBL May 18, 2016
3f2b4cc
Forward submodule libraries/Erfurt.
ReikMuellerUBL May 30, 2016
0931d55
Forward submodule libraries/RDFauthor.
ReikMuellerUBL May 30, 2016
fe469e8
speed: No conversions of service result json
ReikMuellerUBL May 30, 2016
9ceb66d
Forward submodule libraries/RDFAuthor.
ReikMuellerUBL May 30, 2016
72f7919
Forward submodule libraries/RDFauthor.
ReikMuellerUBL Jun 7, 2016
ffd5057
speed: providing all info at initial rdfauthor call
ReikMuellerUBL Jun 7, 2016
30d50ea
FIX: handle variable value of non-existing virtuoso-entry
ReikMuellerUBL Jun 8, 2016
3878b23
FIX: handle variable value of non-existing virtuoso-entry
ReikMuellerUBL Jun 8, 2016
061017a
Forward submodule extensions/statements.
ReikMuellerUBL Jun 9, 2016
c80e2c0
Forward submodule extensions/statements.
ReikMuellerUBL Jun 9, 2016
8c01e18
Forward submodule extensions/statements.
ReikMuellerUBL Jun 16, 2016
1c54d4e
Forward submodule libraries/RDFauthor.
ReikMuellerUBL Jun 16, 2016
7754e12
Forward submodule extensions/statements
ReikMuellerUBL Jun 17, 2016
1bf4d1e
Forward submodule libraries/RDFauthor.
ReikMuellerUBL Jun 30, 2016
f1111c7
Fix: don't show widgets on action addProptery
ReikMuellerUBL Jun 30, 2016
4a97e6f
Forward submodule libraries/RDFauthor.
ReikMuellerUBL Jul 4, 2016
7fe1871
Forward submodule extensions/statements
ReikMuellerUBL Jul 5, 2016
0b5366b
Forward submodule libraries/RDFauthor.
ReikMuellerUBL Jul 13, 2016
543c99c
Fix: expand namespaces
ReikMuellerUBL Jul 13, 2016
545945e
FIX: edit single value - select element
ReikMuellerUBL Jul 13, 2016
c1f0b9d
Forward submodule libraries/RDFauthor.
ReikMuellerUBL Jul 13, 2016
97927d8
FIX: typing mistake
ReikMuellerUBL Jul 13, 2016
f2ab991
Forward submodule extensions/statements.
ReikMuellerUBL Jul 19, 2016
440c7d8
Forward submodule libraries/Erfurt.
ReikMuellerUBL Jul 20, 2016
575540e
FIX: Not sorting integers as text
ReikMuellerUBL Jul 20, 2016
a8adf51
FIX: missing range info for dct:creator
ReikMuellerUBL Jul 21, 2016
27b92e7
FIX: resource type is literal
ReikMuellerUBL Jul 21, 2016
a13aa09
Forward submodule libraries/RDFauthor.
ReikMuellerUBL Jul 21, 2016
417b122
Forward submodule libraries/RDFauthor.
ReikMuellerUBL Jul 27, 2016
7b352d3
BugFixes, SpeedUp, CleanUp
ReikMuellerUBL Jul 27, 2016
edaa8c6
Forward submodule libraries/RDFauthor.
ReikMuellerUBL Jul 29, 2016
aad040e
Proceedings in SpeedUp & BugFixing
ReikMuellerUBL Jul 29, 2016
a2b7bc3
Proceedings in SpeedUP
ReikMuellerUBL Aug 1, 2016
d266bfc
Bugfix for SpeedUp
ReikMuellerUBL Aug 2, 2016
b552273
Forward submodule libraries/RDFauthor.
ReikMuellerUBL Aug 2, 2016
10d078a
Forward submodule extensions/linkandcreate
ReikMuellerUBL Aug 2, 2016
14e5f19
don't show create instance in context menu
ReikMuellerUBL Aug 2, 2016
085f466
del list-inst. entry in class-context menu
ReikMuellerUBL Aug 4, 2016
b113cdb
Forward submodule libraries/RDFauthor.
ReikMuellerUBL Aug 4, 2016
fea1876
Forward submodule libraries/RDFauthor.
ReikMuellerUBL Aug 10, 2016
c88a7b7
Forward submodule extensions/template.
ReikMuellerUBL Aug 11, 2016
361193c
Forward submodule libraries/RDFauthor.
ReikMuellerUBL Aug 11, 2016
e90cb9a
Add graph info for imported tripels
ReikMuellerUBL Aug 11, 2016
6c444cd
Forward submodule libraries/RDFauthor.
ReikMuellerUBL Aug 12, 2016
72c01c1
FIX: disable editting of subject type
ReikMuellerUBL Aug 12, 2016
8af048a
Forward submodule libraries/Erfurt.
ReikMuellerUBL Aug 12, 2016
c6ca060
Forward submodule libraries/RDFauthor.
ReikMuellerUBL Aug 15, 2016
9068d3d
Forward submodule extensions/statements.
ReikMuellerUBL Aug 15, 2016
484b6b9
FIX: starting of RDFauthor in popover mode
ReikMuellerUBL Aug 15, 2016
8647755
Correct list-sorting with decimals
ReikMuellerUBL Aug 15, 2016
f2fcb14
FIX: correct typing for added properties.
ReikMuellerUBL Aug 17, 2016
9bbdc63
FIX: correctly display decimals
ReikMuellerUBL Aug 18, 2016
392f169
FIX: linking here list not complete
ReikMuellerUBL Aug 18, 2016
4a293b6
Forward submodule libraries/RDFauthor.
ReikMuellerUBL Aug 18, 2016
5ea14bb
Outboundservice print plain format
ReikMuellerUBL Aug 31, 2016
4614027
Fix: wrong prediacte in update-query
ReikMuellerUBL Sep 9, 2016
2cc559c
FIX: wrong update query in ezb-importer
ReikMuellerUBL Sep 9, 2016
dfa3e57
Fix: delete old holdings
ReikMuellerUBL Sep 9, 2016
cbe163f
EZB-holdings: packages with several anchors
ReikMuellerUBL Sep 29, 2016
bb69e81
EZB-holdings: handle multiple contracts
ReikMuellerUBL Sep 29, 2016
440e6f7
Fix: EZB-importer - wrong separation symbol
ReikMuellerUBL Oct 11, 2016
8591400
FIX: RDFauthor initialisation server error
ReikMuellerUBL Oct 24, 2016
415bf80
FIX: show edit symbol
ReikMuellerUBL Oct 24, 2016
f179ea1
FIX: show edit symbols
ReikMuellerUBL Oct 24, 2016
e034047
Forward submodule libraries/RDFauthor.
ReikMuellerUBL Oct 24, 2016
40f6de6
FIX: ezb-holdings different type
ReikMuellerUBL Oct 24, 2016
66a905b
Forward submodule library/RDFauthor.
ReikMuellerUBL Oct 26, 2016
c83dfdb
Forward submodule libraries/RDFauthor.
ReikMuellerUBL Oct 28, 2016
c7760d0
Fix wrong processing of decimals
ReikMuellerUBL Oct 28, 2016
a39455d
Forward submodule libraries/RDFauthor.
ReikMuellerUBL Nov 2, 2016
27b3296
Fix: error message on stored lists
ReikMuellerUBL Nov 2, 2016
3584599
clean cache after data update
ReikMuellerUBL Nov 2, 2016
4af3f0e
Forward submodule libraries/RDFauthor
ReikMuellerUBL Nov 11, 2016
e69b223
Forward submodule extensions/files
ReikMuellerUBL Dec 13, 2016
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,6 @@ build/
# vagrant stuff
Vagrantfile
.vagrant

# export folder
dumps/
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should work

46 changes: 44 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,48 @@
[submodule "libraries/RDFauthor"]
path = libraries/RDFauthor
url = git://github.com/AKSW/RDFauthor.git
url = https://github.com/amsl-project/RDFauthor.git
[submodule "libraries/Erfurt"]
path = libraries/Erfurt
url = git://github.com/AKSW/Erfurt.git
url = https://github.com/amsl-project/Erfurt.git
[submodule "extensions/contextinfo"]
path = extensions/contextinfo
url = https://github.com/AKSW/contextinfo.ontowiki.git
[submodule "extensions/imagehelper"]
path = extensions/imagehelper
url = https://github.com/amsl-project/imagehelper.ontowiki.git
[submodule "extensions/issnimporter"]
path = extensions/issnimporter
url = https://github.com/amsl-project/issnimporter.ontowiki.git
[submodule "extensions/fulltextsearch"]
path = extensions/fulltextsearch
url = https://github.com/amsl-project/fulltextsearch.ontowiki.git
[submodule "extensions/listexporter"]
path = extensions/listexporter
url = https://github.com/amsl-project/listexporter.ontowiki.git
[submodule "extensions/counterimporter"]
path = extensions/counterimporter
url = https://github.com/amsl-project/counterimporter.ontowiki.git
[submodule "extensions/jsloader"]
path = extensions/jsloader
url = https://github.com/amsl-project/jsloader.ontowiki.git
[submodule "extensions/statements"]
path = extensions/statements
url = https://github.com/amsl-project/statements.ontowiki.git
[submodule "extensions/files"]
path = extensions/files
url = https://github.com/amsl-project/files.ontowiki.git
[submodule "extensions/linkandcreate"]
path = extensions/linkandcreate
url = https://github.com/amsl-project/linkandcreate.ontowiki.git
[submodule "sample-data"]
path = sample-data
url = https://github.com/amsl-project/sample-data.git
[submodule "extensions/jobcenter"]
path = extensions/jobcenter
url = https://github.com/amsl-project/jobcenter.ontowiki.git
[submodule "extensions/template"]
path = extensions/template
url = https://github.com/amsl-project/template.ontowiki.git
[submodule "extensions/deadlinehelper"]
path = extensions/deadlinehelper
url = https://github.com/amsl-project/deadlinehelper.ontowiki.git
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All these dependencies are replaced by composer dependencies in OntoWiki

7 changes: 6 additions & 1 deletion .htaccess
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@
# WARNING: If you do not use the htaccess at all or your htaccess is
# ignored, then your config.ini can be loaded over the web !!!
<Files "*.ini">
Deny from all
<IfModule mod_access.c>
Deny from all
</IfModule>
<IfModule mod_authz_host.c>
Require all denied
</IfModule>
</Files>

# OntoWiki does not requires Apache's rewrite engine to work. However,
Expand Down
37 changes: 29 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ help:
@echo " pull ....................... 'git pull' for all repos"
@echo " fetch ...................... 'git fetch' for all repos"
@echo " fetch-all .................. 'git fetch --all', i.e. fetch all repos on all remotes"
@echo " add-upstream ............... Adds standard AKSW git repo as remote/upstream"
@echo " add-upstream ............... Adds standard amsl-project git repo as remote/upstream"
@echo " status ..................... 'git status' for all repos"
@echo " branch-check ............... 'git rev-parse' for all repos"
@echo " clean ...................... Deletes all log and cache files"
Expand Down Expand Up @@ -108,14 +108,14 @@ libraries: zend submodules-developer

submodules: # read-only
git submodule init
git config submodule.libraries/Erfurt.url "https://github.com/AKSW/Erfurt.git"
git config submodule.libraries/RDFauthor.url "https://github.com/AKSW/RDFauthor.git"
git config submodule.libraries/Erfurt.url "https://github.com/amsl-project/Erfurt.git"
git config submodule.libraries/RDFauthor.url "https://github.com/amsl-project/RDFauthor.git"
git submodule update

submodules-developer: # read-write
git submodule init
git config submodule.libraries/Erfurt.url "[email protected]:AKSW/Erfurt.git"
git config submodule.libraries/RDFauthor.url "[email protected]:AKSW/RDFauthor.git"
git config submodule.libraries/Erfurt.url "[email protected]:amsl-project/Erfurt.git"
git config submodule.libraries/RDFauthor.url "[email protected]:amsl-project/RDFauthor.git"
git submodule update

# developer targets
Expand All @@ -135,7 +135,7 @@ fetch-all:
git submodule foreach git fetch --all

add-upstream:
git remote add upstream git://github.com/AKSW/OntoWiki.git
git remote add upstream git://github.com/amsl-project/OntoWiki.git

info:
@git --no-pager log -1 --oneline --decorate
Expand Down Expand Up @@ -172,7 +172,7 @@ zend2:
rdfauthor:
rm -rf libraries/RDFauthor
@echo 'Cloning RDFauthor into libraries/RDFauthor ...'
git clone [email protected]:AKSW/RDFauthor.git libraries/RDFauthor
git clone [email protected]:amsl-project/RDFauthor.git libraries/RDFauthor

# test stuff

Expand Down Expand Up @@ -229,7 +229,7 @@ install-test-environment:
erfurt@:
rm -rf libraries/Erfurt
@echo 'Cloning Erfurt into libraries/Erfurt ...'
git clone [email protected]:AKSW/Erfurt.git libraries/Erfurt
git clone [email protected]:amsl-project/Erfurt.git libraries/Erfurt

odbctest:
@application/scripts/odbctest.php
Expand Down Expand Up @@ -319,3 +319,24 @@ endif

list-events:
@grep -R "new Erfurt_Event" * 2> /dev/null | sed "s/.*new Erfurt_Event('//;s/');.*//" | sort -u

make amsl-update:
git fetch --all
git checkout origin/develop
git submodule init
git submodule sync
git submodule update

data-init:
sh -c "$(PWD)/application/scripts/clean.sh $(PWD)"
sh -c "$(PWD)/application/scripts/init.sh $(PWD)"
sh -c "$(PWD)/application/scripts/vocab.sh $(PWD)"

clean-virtuoso:
sh -c "$(PWD)/application/scripts/clean.sh $(PWD)"

amsl-vocab:
sh -c "$(PWD)/application/scripts/vocab.sh $(PWD)"

export-virtuoso:
sh -c "$(PWD)/application/scripts/export.sh $(PWD)"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These tasks of the Makefile are also taken over by composer.

Original file line number Diff line number Diff line change
Expand Up @@ -127,13 +127,20 @@ public function addList(
$other = new stdClass();
}

$config = $this->_owApp->config;
$listHeading = '';
if (($config->lists) && $config->lists->showHeading === "true") {
$listHeading = $list->getTitle();
}

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should work

$renderedList = $view->partial(
'partials/list.phtml',
array(
'listName' => $listName,
'instances' => $list,
'mainTemplate' => $mainTemplate,
'other' => $other
'other' => $other,
'heading' => $listHeading
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should work

)
);

Expand Down
5 changes: 4 additions & 1 deletion application/classes/OntoWiki/Controller/Base.php
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,10 @@ public function init()
var themeUrlBase = "' . $this->_config->themeUrlBase . '";
var _OWSESSION = "' . _OWSESSION . '";
var RDFAUTHOR_BASE = "' . $this->_config->staticUrlBase . 'libraries/RDFauthor/";
var RDFAUTHOR_VIEW_MODE = "' . $viewMode . '";' . PHP_EOL;
var RDFAUTHOR_LANGUAGE = "' . $this->_config->languages->locale . '";
var RDFAUTHOR_VIEW_MODE = "' . $viewMode . '";
var RDFAUTHOR_DATATYPES_FIX = {};'
. PHP_EOL;

if (defined('_OWDEBUG')) {
$this->view->jsonVars .= ' var RDFAUTHOR_DEBUG = 1;';
Expand Down
Loading