[opensiddur/opensiddur] 9c4ebf: Initial draft of tehillim.css and addition of rese...
8 views
Skip to first unread message
GitHub
Oct 1, 2014, 2:07:03 AM10/1/14
to opensid...@googlegroups.com
Branch: refs/heads/develop
Home: https://github.com/opensiddur/opensiddur
Commit: 9c4ebf74234e4c9e93ecf164b86f60c2d23e5c0f
https://github.com/opensiddur/opensiddur/commit/9c4ebf74234e4c9e93ecf164b86f60c2d23e5c0f
Author: Jordan Rosenfeld <jordan.r...@gmail.com>
Date: 2014-08-16 (Sat, 16 Aug 2014)
Changed paths:
A opensiddur-server/src/data/styles/en/example-pages/Tehillim/reset.css
A opensiddur-server/src/data/styles/en/example-pages/Tehillim/tehillim.css
Log Message:
-----------
Initial draft of tehillim.css and addition of reset.css.
Commit: 6ecfc8e3751e17e9f0712b416a69cf24cb40c973
https://github.com/opensiddur/opensiddur/commit/6ecfc8e3751e17e9f0712b416a69cf24cb40c973
Author: Jordan Rosenfeld <jordan.r...@gmail.com>
Date: 2014-08-17 (Sun, 17 Aug 2014)
Changed paths:
M opensiddur-server/src/modules/format.xqm
M opensiddur-server/src/schema/annotation.xml
M opensiddur-server/src/transforms/combine.xqm
M opensiddur-server/src/transforms/flatten.xqm
M opensiddur-server/src/transforms/phony-layer.xqm
A opensiddur-tests/src/tests/transforms/flatten/combine-ann-incl.xml
A opensiddur-tests/src/tests/transforms/flatten/combine-ann-notes.xml
A opensiddur-tests/src/tests/transforms/flatten/combine-ann-par.xml
A opensiddur-tests/src/tests/transforms/flatten/combine-ann-parA.xml
A opensiddur-tests/src/tests/transforms/flatten/combine-ann-parB.xml
A opensiddur-tests/src/tests/transforms/flatten/combine-ann1.xml
A opensiddur-tests/src/tests/transforms/flatten/combine-ann2.xml
M opensiddur-tests/src/tests/transforms/flatten/combine.t.xml
Log Message:
-----------
Merge https://github.com/opensiddur/opensiddur into feature/CSS
Commit: aa1aba64364cb197cafe4e8c1ab194954f48eb80
https://github.com/opensiddur/opensiddur/commit/aa1aba64364cb197cafe4e8c1ab194954f48eb80
Author: Jordan Rosenfeld <jordan.r...@gmail.com>
Date: 2014-08-17 (Sun, 17 Aug 2014)
Changed paths:
M opensiddur-server/src/data/styles/en/generic.xml
Log Message:
-----------
Updated generic.xml to reflect CSS written in tehillim.css.
Commit: 497286c12744f8819ca0b00d09fbe7f81f09f278
https://github.com/opensiddur/opensiddur/commit/497286c12744f8819ca0b00d09fbe7f81f09f278
Author: Jordan Rosenfeld <jordan.r...@gmail.com>
Date: 2014-08-24 (Sun, 24 Aug 2014)
Changed paths:
M opensiddur-server/src/data/styles/en/generic.xml
Log Message:
-----------
Added more specificity to CSS rules in generic.xml.
Commit: a209ebd3eff21cccf5043e069e1c239c2329bcfd
https://github.com/opensiddur/opensiddur/commit/a209ebd3eff21cccf5043e069e1c239c2329bcfd
Author: Jordan Rosenfeld <jordan.r...@gmail.com>
Date: 2014-08-24 (Sun, 24 Aug 2014)
Changed paths:
M opensiddur-server/src/api/data/original.xqm
M opensiddur-server/src/api/data/styles.xqm
M opensiddur-server/src/data/styles/en/generic.xml
R opensiddur-server/src/modules/code-tables/languages.xml
R opensiddur-server/src/modules/code-tables/licenses.xml
R opensiddur-server/src/modules/code-tables/non-unicode-combining-classes.xml
M opensiddur-server/src/post-install.xql
M opensiddur-server/src/schema/common-schema-base.xml
R opensiddur-server/src/transforms/concurrent/concurrent.xsl2
R opensiddur-server/src/transforms/concurrent/flatten.xsl2
R opensiddur-server/src/transforms/concurrent/intermediate-links.xsl2
R opensiddur-server/src/transforms/concurrent/parallel.xsl2
R opensiddur-server/src/transforms/concurrent/resolve-internal.xsl2
R opensiddur-server/src/transforms/concurrent/set-priorities.xsl2
R opensiddur-server/src/transforms/concurrent/standoff-views.xsl2
R opensiddur-server/src/transforms/concurrent/tests-with-document-uri/__override__.xml
R opensiddur-server/src/transforms/concurrent/tests-with-document-uri/concurrent-context.xml
R opensiddur-server/src/transforms/concurrent/tests-with-document-uri/external-only-context.xml
R opensiddur-server/src/transforms/concurrent/tests-with-document-uri/external-only-expect.xml
R opensiddur-server/src/transforms/concurrent/tests-with-document-uri/external-resource.xml
R opensiddur-server/src/transforms/concurrent/tests-with-document-uri/parallel-small-reference-original.xml
R opensiddur-server/src/transforms/concurrent/tests-with-document-uri/parallel-small-reference-parallel.xml
R opensiddur-server/src/transforms/concurrent/tests-with-document-uri/parallel-small-reference-translation.xml
R opensiddur-server/src/transforms/concurrent/tests-with-document-uri/parallelGrp-context.xml
R opensiddur-server/src/transforms/concurrent/tests-with-document-uri/parallelGrp-original.xml
R opensiddur-server/src/transforms/concurrent/tests-with-document-uri/parallelGrp-translation.xml
R opensiddur-server/src/transforms/concurrent/tests-with-document-uri/standoff-views-context.xml
R opensiddur-server/src/transforms/concurrent/tests-with-document-uri/standoff-views-external-context.xml
R opensiddur-server/src/transforms/concurrent/tests-with-document-uri/view-and-external-context.xml
R opensiddur-server/src/transforms/concurrent/tests-with-document-uri/view-and-external-expect.xml
R opensiddur-server/src/transforms/concurrent/tests/__override__.xml
R opensiddur-server/src/transforms/concurrent/tests/all-modes.xspec
R opensiddur-server/src/transforms/concurrent/tests/cleanup-unflatten.xspec
R opensiddur-server/src/transforms/concurrent/tests/concurrent-expect.xml
R opensiddur-server/src/transforms/concurrent/tests/concurrent.xspec
R opensiddur-server/src/transforms/concurrent/tests/flatten.xspec
R opensiddur-server/src/transforms/concurrent/tests/intermediate-links-context.xml
R opensiddur-server/src/transforms/concurrent/tests/intermediate-links.xspec
R opensiddur-server/src/transforms/concurrent/tests/merge-concurrent.xspec
R opensiddur-server/src/transforms/concurrent/tests/merge-view-to-selection-context-1.xml
R opensiddur-server/src/transforms/concurrent/tests/merge-view-to-selection-context-2.xml
R opensiddur-server/src/transforms/concurrent/tests/merge-view-to-selection-context-3.xml
R opensiddur-server/src/transforms/concurrent/tests/merge-view-to-selection-expect-1.xml
R opensiddur-server/src/transforms/concurrent/tests/merge-view-to-selection-expect-2.xml
R opensiddur-server/src/transforms/concurrent/tests/merge-view-to-selection-expect-3.xml
R opensiddur-server/src/transforms/concurrent/tests/merge-view-to-selection.xspec
R opensiddur-server/src/transforms/concurrent/tests/one-view-context.xml
R opensiddur-server/src/transforms/concurrent/tests/one-view-expect.xml
R opensiddur-server/src/transforms/concurrent/tests/parallel.xspec
R opensiddur-server/src/transforms/concurrent/tests/parallelGrp.xspec
R opensiddur-server/src/transforms/concurrent/tests/ready-flattened-for-parallel-processing.xspec
R opensiddur-server/src/transforms/concurrent/tests/remove-duplicates.xspec
R opensiddur-server/src/transforms/concurrent/tests/resolve-internal-context.xml
R opensiddur-server/src/transforms/concurrent/tests/resolve-internal-expect.xml
R opensiddur-server/src/transforms/concurrent/tests/resolve-internal.xspec
R opensiddur-server/src/transforms/concurrent/tests/set-priorities.xspec
R opensiddur-server/src/transforms/concurrent/tests/sort-flat-hierarchy-by-priority.xspec
R opensiddur-server/src/transforms/concurrent/tests/standoff-views.xspec
R opensiddur-server/src/transforms/data-compiler/conditionals.xsl2
R opensiddur-server/src/transforms/data-compiler/data-compiler.xsl2
R opensiddur-server/src/transforms/data-compiler/feature-declarations.xsl2
R opensiddur-server/src/transforms/data-compiler/ptr.xsl2
R opensiddur-server/src/transforms/data-compiler/standoff.xsl2
R opensiddur-server/src/transforms/data-compiler/tests-with-document-uri/data-compiler-external-pointers.xml
R opensiddur-server/src/transforms/data-compiler/tests-with-document-uri/data-compiler-internal-pointers.xml
R opensiddur-server/src/transforms/data-compiler/tests-with-document-uri/parallel-file.xspec
R opensiddur-server/src/transforms/data-compiler/tests-with-document-uri/parallel-large-reference.xml
R opensiddur-server/src/transforms/data-compiler/tests-with-document-uri/parallel-self-reference-parallel.xml
R opensiddur-server/src/transforms/data-compiler/tests-with-document-uri/parallel-self-reference-translation.xml
R opensiddur-server/src/transforms/data-compiler/tests-with-document-uri/parallel-self-reference.xml
R opensiddur-server/src/transforms/data-compiler/tests-with-document-uri/parallel-small-reference-original.xml
R opensiddur-server/src/transforms/data-compiler/tests-with-document-uri/parallel-small-reference-parallel.xml
R opensiddur-server/src/transforms/data-compiler/tests-with-document-uri/parallel-small-reference-translation.xml
R opensiddur-server/src/transforms/data-compiler/tests-with-document-uri/parallel-small-reference.xml
R opensiddur-server/src/transforms/data-compiler/tests-with-document-uri/standoff-relationship-context.xml
R opensiddur-server/src/transforms/data-compiler/tests-with-document-uri/standoff-relationship-external-context.xml
R opensiddur-server/src/transforms/data-compiler/tests-with-document-uri/standoff-relationship-notes.xml
R opensiddur-server/src/transforms/data-compiler/tests/all-modes.xspec
R opensiddur-server/src/transforms/data-compiler/tests/conditional-setting-2.xml
R opensiddur-server/src/transforms/data-compiler/tests/conditional-setting.xml
R opensiddur-server/src/transforms/data-compiler/tests/conditional-setting.xspec
R opensiddur-server/src/transforms/data-compiler/tests/conditional-truth-table.xml
R opensiddur-server/src/transforms/data-compiler/tests/conditionals.xspec
R opensiddur-server/src/transforms/data-compiler/tests/data-compiler-external-pointers-expect.xml
R opensiddur-server/src/transforms/data-compiler/tests/data-compiler-no-pointers-expect.xml
R opensiddur-server/src/transforms/data-compiler/tests/data-compiler-no-pointers.xml
R opensiddur-server/src/transforms/data-compiler/tests/data-compiler.xspec
R opensiddur-server/src/transforms/data-compiler/tests/evaluate-conditionals-context.xml
R opensiddur-server/src/transforms/data-compiler/tests/evaluate-conditionals.xspec
R opensiddur-server/src/transforms/data-compiler/tests/fs-1-YES-MAYBE.xml
R opensiddur-server/src/transforms/data-compiler/tests/fs-1-YES-YES.xml
R opensiddur-server/src/transforms/data-compiler/tests/fs-1-f-1-M.xml
R opensiddur-server/src/transforms/data-compiler/tests/fs-1-f-1-N.xml
R opensiddur-server/src/transforms/data-compiler/tests/fs-1-f-1-Y.xml
R opensiddur-server/src/transforms/data-compiler/tests/fs-1-f-3-OFF.xml
R opensiddur-server/src/transforms/data-compiler/tests/fs-1-f-3-ON.xml
R opensiddur-server/src/transforms/data-compiler/tests/get-selection-value-context.xml
R opensiddur-server/src/transforms/data-compiler/tests/incorporate-new-selections-context-1.xml
R opensiddur-server/src/transforms/data-compiler/tests/incorporate-new-selections-context-2.xml
R opensiddur-server/src/transforms/data-compiler/tests/incorporate-new-selections-context-3.xml
R opensiddur-server/src/transforms/data-compiler/tests/incorporate-new-selections.xspec
R opensiddur-server/src/transforms/data-compiler/tests/standardize-features-context.xml
R opensiddur-server/src/transforms/data-compiler/tests/standardize-features.xspec
R opensiddur-server/src/transforms/data-compiler/tests/standoff.xspec
R opensiddur-server/src/transforms/data-compiler/tests/test-conditional-declarations.xml
R opensiddur-server/src/transforms/flatten/intermediate-links.xqm
R opensiddur-server/src/transforms/format/reverse-xhtml/reverse-generic.xsl2
R opensiddur-server/src/transforms/format/reverse-xhtml/reverse.xsl2
R opensiddur-server/src/transforms/format/xhtml/bibliography-xhtml.xsl2
R opensiddur-server/src/transforms/format/xhtml/credits-list.xsl2
R opensiddur-server/src/transforms/format/xhtml/dict.xsl2
R opensiddur-server/src/transforms/format/xhtml/inline.xsl2
R opensiddur-server/src/transforms/format/xhtml/ref.xsl2
R opensiddur-server/src/transforms/format/xhtml/relationship.xsl2
R opensiddur-server/src/transforms/format/xhtml/style.css
R opensiddur-server/src/transforms/format/xhtml/xhtml-generic.xsl2
R opensiddur-server/src/transforms/format/xhtml/xhtml.xsl2
R opensiddur-server/src/transforms/list-compiler/bibliography.xsl2
R opensiddur-server/src/transforms/list-compiler/credits.xsl2
R opensiddur-server/src/transforms/list-compiler/lc-common.xsl2
R opensiddur-server/src/transforms/list-compiler/licensing.xsl2
R opensiddur-server/src/transforms/list-compiler/list-compiler.xsl2
R opensiddur-server/src/transforms/list-compiler/strings.xml
R opensiddur-server/src/transforms/list-compiler/tests/__override__.xml
R opensiddur-server/src/transforms/list-compiler/tests/bibliography-context.xml
R opensiddur-server/src/transforms/list-compiler/tests/credits-context.xml
R opensiddur-server/src/transforms/list-compiler/tests/licensing-cc-by-attribution.xml
R opensiddur-server/src/transforms/list-compiler/tests/licensing-cc-by-sa.xml
R opensiddur-server/src/transforms/list-compiler/tests/licensing-cc-by.xml
R opensiddur-server/src/transforms/list-compiler/tests/licensing-cc0.xml
R opensiddur-server/src/transforms/list-compiler/tests/licensing-context.xml
R opensiddur-server/src/transforms/list-compiler/tests/list-compiler.xspec
R opensiddur-server/src/transforms/translit/translit-main.xsl2
R opensiddur-server/src/transforms/translit/translit.xsl2
M opensiddur-sources/input-conversion/fill-template.xsl2
M opensiddur-tests/src/tests/api/data/conditionals/Existing-After-Put.xml
M opensiddur-tests/src/tests/api/data/conditionals/Existing.xml
M opensiddur-tests/src/tests/api/data/conditionals/Invalid.xml
M opensiddur-tests/src/tests/api/data/conditionals/NoWriteAccess.xml
M opensiddur-tests/src/tests/api/data/conditionals/Valid.xml
M opensiddur-tests/src/tests/api/data/dictionaries/Existing-After-Put.xml
M opensiddur-tests/src/tests/api/data/dictionaries/Existing.xml
M opensiddur-tests/src/tests/api/data/dictionaries/Invalid-After-Put.xml
M opensiddur-tests/src/tests/api/data/dictionaries/Invalid.xml
M opensiddur-tests/src/tests/api/data/dictionaries/NoWriteAccess.xml
M opensiddur-tests/src/tests/api/data/dictionaries/Valid.xml
M opensiddur-tests/src/tests/api/data/linkage/A-he.xml
M opensiddur-tests/src/tests/api/data/linkage/B-en.xml
M opensiddur-tests/src/tests/api/data/linkage/Existing-After-Put-Invalid-RevisionDesc.xml
M opensiddur-tests/src/tests/api/data/linkage/Existing-After-Put.xml
M opensiddur-tests/src/tests/api/data/linkage/Existing.xml
M opensiddur-tests/src/tests/api/data/linkage/Invalid.xml
M opensiddur-tests/src/tests/api/data/linkage/Valid.xml
M opensiddur-tests/src/tests/api/data/notes/Existing-After-Put.xml
M opensiddur-tests/src/tests/api/data/notes/Existing.xml
M opensiddur-tests/src/tests/api/data/notes/Invalid-After-Put-Illegal-RevisionDesc.xml
M opensiddur-tests/src/tests/api/data/notes/Invalid.xml
M opensiddur-tests/src/tests/api/data/notes/Query.xml
M opensiddur-tests/src/tests/api/data/notes/Valid.xml
M opensiddur-tests/src/tests/api/data/original/Existing-After-Put.xml
M opensiddur-tests/src/tests/api/data/original/Existing-Flat.xml
M opensiddur-tests/src/tests/api/data/original/Existing.xml
M opensiddur-tests/src/tests/api/data/original/HasTransclude.xml
M opensiddur-tests/src/tests/api/data/original/Invalid-After-Put-Illegal-RevisionDesc.xml
M opensiddur-tests/src/tests/api/data/original/Invalid-Flat.xml
M opensiddur-tests/src/tests/api/data/original/Invalid.xml
M opensiddur-tests/src/tests/api/data/original/QueryResult.xml
M opensiddur-tests/src/tests/api/data/original/Transcluded.xml
M opensiddur-tests/src/tests/api/data/original/Valid-Flat.xml
M opensiddur-tests/src/tests/api/data/original/Valid.xml
M opensiddur-tests/src/tests/api/data/styles/Existing-After-Put.xml
M opensiddur-tests/src/tests/api/data/styles/Existing.xml
M opensiddur-tests/src/tests/api/data/styles/Invalid.xml
M opensiddur-tests/src/tests/api/data/styles/NoWriteAccess.xml
M opensiddur-tests/src/tests/api/data/styles/Valid.xml
M opensiddur-tests/src/tests/contributors.xml
M opensiddur-tests/src/tests/minimal-invalid.xml
M opensiddur-tests/src/tests/minimal-valid.xml
A opensiddur-tests/src/tests/modules/validation.t.xml
A opensiddur-tests/src/tests/modules/validation/bad-license.xml
A opensiddur-tests/src/tests/modules/validation/good-license.xml
M opensiddur-tests/src/tests/transforms/conditional1.xml
M opensiddur-tests/src/tests/transforms/flatten-par.xml
M opensiddur-tests/src/tests/transforms/flatten-parA.xml
M opensiddur-tests/src/tests/transforms/flatten-parB.xml
M opensiddur-tests/src/tests/transforms/flatten/combine-ann-incl.xml
M opensiddur-tests/src/tests/transforms/flatten/combine-ann-notes.xml
M opensiddur-tests/src/tests/transforms/flatten/combine-ann-par.xml
M opensiddur-tests/src/tests/transforms/flatten/combine-ann-parA.xml
M opensiddur-tests/src/tests/transforms/flatten/combine-ann-parB.xml
M opensiddur-tests/src/tests/transforms/flatten/combine-ann1.xml
M opensiddur-tests/src/tests/transforms/flatten/combine-ann2.xml
M opensiddur-tests/src/tests/transforms/flatten/combine-cond-incl.xml
M opensiddur-tests/src/tests/transforms/flatten/combine-cond-par.xml
M opensiddur-tests/src/tests/transforms/flatten/combine-cond-parA.xml
M opensiddur-tests/src/tests/transforms/flatten/combine-cond-parB.xml
M opensiddur-tests/src/tests/transforms/flatten/combine-cond1.xml
M opensiddur-tests/src/tests/transforms/flatten/combine-cond2.xml
M opensiddur-tests/src/tests/transforms/flatten/combine-cond3.xml
M opensiddur-tests/src/tests/transforms/flatten/combine-repeat.xml
M opensiddur-tests/src/tests/transforms/flatten/combine-settings.xml
M opensiddur-tests/src/tests/transforms/flatten/combine1.xml
M opensiddur-tests/src/tests/transforms/flatten/combine2.xml
M opensiddur-tests/src/tests/transforms/flatten/combine3.xml
M opensiddur-tests/src/tests/transforms/flatten/include-part-1.xml
M opensiddur-tests/src/tests/transforms/flatten/include-part-2.xml
M opensiddur-tests/src/tests/transforms/flatten/include-simple-1.xml
M opensiddur-tests/src/tests/transforms/flatten/linkage-part.xml
M opensiddur-tests/src/tests/transforms/flatten/linkage-same.xml
M opensiddur-tests/src/tests/transforms/flatten/linkage-simple.xml
M opensiddur-tests/src/tests/transforms/flatten/parallel-part-A.xml
M opensiddur-tests/src/tests/transforms/flatten/parallel-part-B.xml
M opensiddur-tests/src/tests/transforms/flatten/parallel-same-A.xml
M opensiddur-tests/src/tests/transforms/flatten/parallel-simple-A.xml
M opensiddur-tests/src/tests/transforms/flatten/parallel-simple-B.xml
M opensiddur-tests/src/tests/transforms/flatten/unflatten-order-bug.xml
M opensiddur-tests/src/tests/transforms/par.xml
M opensiddur-tests/src/tests/transforms/parA.xml
M opensiddur-tests/src/tests/transforms/parB.xml
M opensiddur-tests/src/tests/transforms/phony1.xml
M opensiddur-tests/src/tests/transforms/phony2.xml
M opensiddur-tests/src/tests/transforms/phony3.xml
M opensiddur-tests/src/tests/transforms/phony4.xml
M opensiddur-tests/src/tests/transforms/phony5.xml
M opensiddur-tests/src/tests/transforms/unflatten-par.xml
M opensiddur-tests/src/tests/transforms/unflatten-parA.xml
M opensiddur-tests/src/tests/transforms/unflatten-parB.xml
Log Message:
-----------
Merge branch 'develop' of https://github.com/opensiddur/opensiddur into develop
Commit: 5cebe6a5ecccf05c15b2b4381a68609d1059928b
https://github.com/opensiddur/opensiddur/commit/5cebe6a5ecccf05c15b2b4381a68609d1059928b
Author: Jordan Rosenfeld <jordan.r...@gmail.com>
Date: 2014-08-24 (Sun, 24 Aug 2014)
Changed paths:
R opensiddur-server/src/data/styles/en/example-pages/Tehillim/reset.css
R opensiddur-server/src/data/styles/en/example-pages/Tehillim/tehillim.css
Log Message:
-----------
Removed example-pages folder.
Commit: 76122339b63da3ff1bd238ef25bade37e8c2fe9a
https://github.com/opensiddur/opensiddur/commit/76122339b63da3ff1bd238ef25bade37e8c2fe9a
Author: Jordan Rosenfeld <jordan.r...@gmail.com>
Date: 2014-08-26 (Tue, 26 Aug 2014)
Changed paths:
M opensiddur-server/src/data/styles/en/generic.xml
Log Message:
-----------
Edited generic.xml to remove .id-main as selector.
Commit: 6541ec84c002ee89cd8eea95faf76589e750dd2f
https://github.com/opensiddur/opensiddur/commit/6541ec84c002ee89cd8eea95faf76589e750dd2f
Author: Jordan Rosenfeld <jordan.r...@gmail.com>
Date: 2014-08-26 (Tue, 26 Aug 2014)
Changed paths:
M opensiddur-server/src/data/styles/en/generic.xml
Log Message:
-----------
Reinserted wrapper for generic.xml
Commit: 992de34f0ab30050635a93217d2d9e011327b447
https://github.com/opensiddur/opensiddur/commit/992de34f0ab30050635a93217d2d9e011327b447
Author: Jordan Rosenfeld <jordan.r...@gmail.com>
Date: 2014-08-26 (Tue, 26 Aug 2014)
Changed paths:
M build.xml
M opensiddur-server/src/modules/format.xqm
M opensiddur-server/src/schema/annotation.xml
M opensiddur-server/src/static/cc-by-sa.svg
M opensiddur-server/src/static/cc-by.svg
M opensiddur-server/src/static/cc-publicdomain.svg
M opensiddur-server/src/static/cc-zero.svg
M opensiddur-sources/build.xml
M opensiddur-sources/input-conversion/wlc/wlc2jlptei.xsl2
Log Message:
-----------
Merge https://github.com/opensiddur/opensiddur into develop
Commit: ad9cb76a5e58e5b95eac52dc76095da6820a5cfe
https://github.com/opensiddur/opensiddur/commit/ad9cb76a5e58e5b95eac52dc76095da6820a5cfe
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-01 (Mon, 01 Sep 2014)
Changed paths:
M opensiddur-server/src/data/styles/en/generic.xml
Log Message:
-----------
resolve merge conflicts
Commit: 34d65658079658b7395941130fbd1686a4a82cf6
https://github.com/opensiddur/opensiddur/commit/34d65658079658b7395941130fbd1686a4a82cf6
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-01 (Mon, 01 Sep 2014)
Changed paths:
M opensiddur-server/src/data/styles/en/generic.xml
Log Message:
-----------
Merge branch 'jordan-rosenfeld-develop' into feature/generic-css
Commit: 8708e415e6b432da58394895206a85735ee28e12
https://github.com/opensiddur/opensiddur/commit/8708e415e6b432da58394895206a85735ee28e12
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-06 (Sat, 06 Sep 2014)
Changed paths:
M build.xml
M lib/exist
M opensiddur-demos/src/expath-pkg.xml
M opensiddur-server/src/expath-pkg.xml
M opensiddur-sources/src/expath-pkg.xml
M opensiddur-tests/src/expath-pkg.xml
Log Message:
-----------
Merge branch 'develop' into feature/generic-css
Commit: 8deb3b9853970ee7a0875901d62994acc923ba0c
https://github.com/opensiddur/opensiddur/commit/8deb3b9853970ee7a0875901d62994acc923ba0c
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)
Changed paths:
M opensiddur-server/src/schema/conditional.xml
Log Message:
-----------
conditionals schema: allow a default value for a feature when conditions are specified (align the schema to the transform)
Commit: d0e6e112774d503e32f4e7117aec2764d3ed3321
https://github.com/opensiddur/opensiddur/commit/d0e6e112774d503e32f4e7117aec2764d3ed3321
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)
Changed paths:
M opensiddur-server/src/api/data/conditionals.xqm
M opensiddur-server/src/api/data/dictionaries.xqm
M opensiddur-server/src/api/data/linkage.xqm
M opensiddur-server/src/api/data/notes.xqm
M opensiddur-server/src/api/data/original.xqm
M opensiddur-server/src/api/data/sources.xqm
M opensiddur-server/src/api/data/styles.xqm
M opensiddur-server/src/api/data/transliteration.xqm
M opensiddur-server/src/modules/common.xqm
M opensiddur-server/src/modules/refindex.xqm
M opensiddur-server/src/schema/conditional.xml
R opensiddur-server/src/system/config/db/__target__/grammar-parser/collection.xconf
M opensiddur-server/src/system/config/db/collection.xconf
M opensiddur-server/src/system/config/db/data/conditionals/collection.xconf
M opensiddur-server/src/system/config/db/data/dictionaries/en/collection.xconf
M opensiddur-server/src/system/config/db/data/dictionaries/he/collection.xconf
M opensiddur-server/src/system/config/db/data/linkage/collection.xconf
M opensiddur-server/src/system/config/db/data/linkage/en/collection.xconf
M opensiddur-server/src/system/config/db/data/linkage/he/collection.xconf
M opensiddur-server/src/system/config/db/data/notes/en/collection.xconf
M opensiddur-server/src/system/config/db/data/notes/he/collection.xconf
M opensiddur-server/src/system/config/db/data/original/en/collection.xconf
M opensiddur-server/src/system/config/db/data/original/he/collection.xconf
M opensiddur-server/src/system/config/db/data/sources/collection.xconf
M opensiddur-server/src/system/config/db/data/styles/collection.xconf
M opensiddur-server/src/system/config/db/data/transliteration/collection.xconf
M opensiddur-server/src/system/config/db/data/user/collection.xconf
M opensiddur-server/src/system/config/db/refindex/collection.xconf
M opensiddur-server/src/transforms/combine.xqm
M opensiddur-server/src/transforms/tohtml.xqm
A opensiddur-tests/src/tests/transforms/flatten/combine-style-1.xml
A opensiddur-tests/src/tests/transforms/flatten/combine-style-2.xml
M opensiddur-tests/src/tests/transforms/flatten/combine.t.xml
Log Message:
-----------
Merge branch 'develop' into feature/generic-css
Commit: 506d610beda07e3622169c75aed864fab30063ff
https://github.com/opensiddur/opensiddur/commit/506d610beda07e3622169c75aed864fab30063ff
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)
Changed paths:
M opensiddur-server/src/data/styles/en/generic.xml
Log Message:
-----------
modify and incorporate Jordan Rosenfeld's changes/ideas for the CSS
Commit: 8b401318ff1ff86446269e11be5ca2e453b37eb2
https://github.com/opensiddur/opensiddur/commit/8b401318ff1ff86446269e11be5ca2e453b37eb2
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)
Changed paths:
M opensiddur-server/src/data/styles/en/generic.xml
Log Message:
-----------
Merge branch 'feature/generic-css' into develop
Compare: https://github.com/opensiddur/opensiddur/compare/cde2a64eaf28...8b401318ff1f
Home: https://github.com/opensiddur/opensiddur
Commit: 9c4ebf74234e4c9e93ecf164b86f60c2d23e5c0f
https://github.com/opensiddur/opensiddur/commit/9c4ebf74234e4c9e93ecf164b86f60c2d23e5c0f
Author: Jordan Rosenfeld <jordan.r...@gmail.com>
Date: 2014-08-16 (Sat, 16 Aug 2014)
Changed paths:
A opensiddur-server/src/data/styles/en/example-pages/Tehillim/reset.css
A opensiddur-server/src/data/styles/en/example-pages/Tehillim/tehillim.css
Log Message:
-----------
Initial draft of tehillim.css and addition of reset.css.
Commit: 6ecfc8e3751e17e9f0712b416a69cf24cb40c973
https://github.com/opensiddur/opensiddur/commit/6ecfc8e3751e17e9f0712b416a69cf24cb40c973
Author: Jordan Rosenfeld <jordan.r...@gmail.com>
Date: 2014-08-17 (Sun, 17 Aug 2014)
Changed paths:
M opensiddur-server/src/modules/format.xqm
M opensiddur-server/src/schema/annotation.xml
M opensiddur-server/src/transforms/combine.xqm
M opensiddur-server/src/transforms/flatten.xqm
M opensiddur-server/src/transforms/phony-layer.xqm
A opensiddur-tests/src/tests/transforms/flatten/combine-ann-incl.xml
A opensiddur-tests/src/tests/transforms/flatten/combine-ann-notes.xml
A opensiddur-tests/src/tests/transforms/flatten/combine-ann-par.xml
A opensiddur-tests/src/tests/transforms/flatten/combine-ann-parA.xml
A opensiddur-tests/src/tests/transforms/flatten/combine-ann-parB.xml
A opensiddur-tests/src/tests/transforms/flatten/combine-ann1.xml
A opensiddur-tests/src/tests/transforms/flatten/combine-ann2.xml
M opensiddur-tests/src/tests/transforms/flatten/combine.t.xml
Log Message:
-----------
Merge https://github.com/opensiddur/opensiddur into feature/CSS
Commit: aa1aba64364cb197cafe4e8c1ab194954f48eb80
https://github.com/opensiddur/opensiddur/commit/aa1aba64364cb197cafe4e8c1ab194954f48eb80
Author: Jordan Rosenfeld <jordan.r...@gmail.com>
Date: 2014-08-17 (Sun, 17 Aug 2014)
Changed paths:
M opensiddur-server/src/data/styles/en/generic.xml
Log Message:
-----------
Updated generic.xml to reflect CSS written in tehillim.css.
Commit: 497286c12744f8819ca0b00d09fbe7f81f09f278
https://github.com/opensiddur/opensiddur/commit/497286c12744f8819ca0b00d09fbe7f81f09f278
Author: Jordan Rosenfeld <jordan.r...@gmail.com>
Date: 2014-08-24 (Sun, 24 Aug 2014)
Changed paths:
M opensiddur-server/src/data/styles/en/generic.xml
Log Message:
-----------
Added more specificity to CSS rules in generic.xml.
Commit: a209ebd3eff21cccf5043e069e1c239c2329bcfd
https://github.com/opensiddur/opensiddur/commit/a209ebd3eff21cccf5043e069e1c239c2329bcfd
Author: Jordan Rosenfeld <jordan.r...@gmail.com>
Date: 2014-08-24 (Sun, 24 Aug 2014)
Changed paths:
M opensiddur-server/src/api/data/original.xqm
M opensiddur-server/src/api/data/styles.xqm
M opensiddur-server/src/data/styles/en/generic.xml
R opensiddur-server/src/modules/code-tables/languages.xml
R opensiddur-server/src/modules/code-tables/licenses.xml
R opensiddur-server/src/modules/code-tables/non-unicode-combining-classes.xml
M opensiddur-server/src/post-install.xql
M opensiddur-server/src/schema/common-schema-base.xml
R opensiddur-server/src/transforms/concurrent/concurrent.xsl2
R opensiddur-server/src/transforms/concurrent/flatten.xsl2
R opensiddur-server/src/transforms/concurrent/intermediate-links.xsl2
R opensiddur-server/src/transforms/concurrent/parallel.xsl2
R opensiddur-server/src/transforms/concurrent/resolve-internal.xsl2
R opensiddur-server/src/transforms/concurrent/set-priorities.xsl2
R opensiddur-server/src/transforms/concurrent/standoff-views.xsl2
R opensiddur-server/src/transforms/concurrent/tests-with-document-uri/__override__.xml
R opensiddur-server/src/transforms/concurrent/tests-with-document-uri/concurrent-context.xml
R opensiddur-server/src/transforms/concurrent/tests-with-document-uri/external-only-context.xml
R opensiddur-server/src/transforms/concurrent/tests-with-document-uri/external-only-expect.xml
R opensiddur-server/src/transforms/concurrent/tests-with-document-uri/external-resource.xml
R opensiddur-server/src/transforms/concurrent/tests-with-document-uri/parallel-small-reference-original.xml
R opensiddur-server/src/transforms/concurrent/tests-with-document-uri/parallel-small-reference-parallel.xml
R opensiddur-server/src/transforms/concurrent/tests-with-document-uri/parallel-small-reference-translation.xml
R opensiddur-server/src/transforms/concurrent/tests-with-document-uri/parallelGrp-context.xml
R opensiddur-server/src/transforms/concurrent/tests-with-document-uri/parallelGrp-original.xml
R opensiddur-server/src/transforms/concurrent/tests-with-document-uri/parallelGrp-translation.xml
R opensiddur-server/src/transforms/concurrent/tests-with-document-uri/standoff-views-context.xml
R opensiddur-server/src/transforms/concurrent/tests-with-document-uri/standoff-views-external-context.xml
R opensiddur-server/src/transforms/concurrent/tests-with-document-uri/view-and-external-context.xml
R opensiddur-server/src/transforms/concurrent/tests-with-document-uri/view-and-external-expect.xml
R opensiddur-server/src/transforms/concurrent/tests/__override__.xml
R opensiddur-server/src/transforms/concurrent/tests/all-modes.xspec
R opensiddur-server/src/transforms/concurrent/tests/cleanup-unflatten.xspec
R opensiddur-server/src/transforms/concurrent/tests/concurrent-expect.xml
R opensiddur-server/src/transforms/concurrent/tests/concurrent.xspec
R opensiddur-server/src/transforms/concurrent/tests/flatten.xspec
R opensiddur-server/src/transforms/concurrent/tests/intermediate-links-context.xml
R opensiddur-server/src/transforms/concurrent/tests/intermediate-links.xspec
R opensiddur-server/src/transforms/concurrent/tests/merge-concurrent.xspec
R opensiddur-server/src/transforms/concurrent/tests/merge-view-to-selection-context-1.xml
R opensiddur-server/src/transforms/concurrent/tests/merge-view-to-selection-context-2.xml
R opensiddur-server/src/transforms/concurrent/tests/merge-view-to-selection-context-3.xml
R opensiddur-server/src/transforms/concurrent/tests/merge-view-to-selection-expect-1.xml
R opensiddur-server/src/transforms/concurrent/tests/merge-view-to-selection-expect-2.xml
R opensiddur-server/src/transforms/concurrent/tests/merge-view-to-selection-expect-3.xml
R opensiddur-server/src/transforms/concurrent/tests/merge-view-to-selection.xspec
R opensiddur-server/src/transforms/concurrent/tests/one-view-context.xml
R opensiddur-server/src/transforms/concurrent/tests/one-view-expect.xml
R opensiddur-server/src/transforms/concurrent/tests/parallel.xspec
R opensiddur-server/src/transforms/concurrent/tests/parallelGrp.xspec
R opensiddur-server/src/transforms/concurrent/tests/ready-flattened-for-parallel-processing.xspec
R opensiddur-server/src/transforms/concurrent/tests/remove-duplicates.xspec
R opensiddur-server/src/transforms/concurrent/tests/resolve-internal-context.xml
R opensiddur-server/src/transforms/concurrent/tests/resolve-internal-expect.xml
R opensiddur-server/src/transforms/concurrent/tests/resolve-internal.xspec
R opensiddur-server/src/transforms/concurrent/tests/set-priorities.xspec
R opensiddur-server/src/transforms/concurrent/tests/sort-flat-hierarchy-by-priority.xspec
R opensiddur-server/src/transforms/concurrent/tests/standoff-views.xspec
R opensiddur-server/src/transforms/data-compiler/conditionals.xsl2
R opensiddur-server/src/transforms/data-compiler/data-compiler.xsl2
R opensiddur-server/src/transforms/data-compiler/feature-declarations.xsl2
R opensiddur-server/src/transforms/data-compiler/ptr.xsl2
R opensiddur-server/src/transforms/data-compiler/standoff.xsl2
R opensiddur-server/src/transforms/data-compiler/tests-with-document-uri/data-compiler-external-pointers.xml
R opensiddur-server/src/transforms/data-compiler/tests-with-document-uri/data-compiler-internal-pointers.xml
R opensiddur-server/src/transforms/data-compiler/tests-with-document-uri/parallel-file.xspec
R opensiddur-server/src/transforms/data-compiler/tests-with-document-uri/parallel-large-reference.xml
R opensiddur-server/src/transforms/data-compiler/tests-with-document-uri/parallel-self-reference-parallel.xml
R opensiddur-server/src/transforms/data-compiler/tests-with-document-uri/parallel-self-reference-translation.xml
R opensiddur-server/src/transforms/data-compiler/tests-with-document-uri/parallel-self-reference.xml
R opensiddur-server/src/transforms/data-compiler/tests-with-document-uri/parallel-small-reference-original.xml
R opensiddur-server/src/transforms/data-compiler/tests-with-document-uri/parallel-small-reference-parallel.xml
R opensiddur-server/src/transforms/data-compiler/tests-with-document-uri/parallel-small-reference-translation.xml
R opensiddur-server/src/transforms/data-compiler/tests-with-document-uri/parallel-small-reference.xml
R opensiddur-server/src/transforms/data-compiler/tests-with-document-uri/standoff-relationship-context.xml
R opensiddur-server/src/transforms/data-compiler/tests-with-document-uri/standoff-relationship-external-context.xml
R opensiddur-server/src/transforms/data-compiler/tests-with-document-uri/standoff-relationship-notes.xml
R opensiddur-server/src/transforms/data-compiler/tests/all-modes.xspec
R opensiddur-server/src/transforms/data-compiler/tests/conditional-setting-2.xml
R opensiddur-server/src/transforms/data-compiler/tests/conditional-setting.xml
R opensiddur-server/src/transforms/data-compiler/tests/conditional-setting.xspec
R opensiddur-server/src/transforms/data-compiler/tests/conditional-truth-table.xml
R opensiddur-server/src/transforms/data-compiler/tests/conditionals.xspec
R opensiddur-server/src/transforms/data-compiler/tests/data-compiler-external-pointers-expect.xml
R opensiddur-server/src/transforms/data-compiler/tests/data-compiler-no-pointers-expect.xml
R opensiddur-server/src/transforms/data-compiler/tests/data-compiler-no-pointers.xml
R opensiddur-server/src/transforms/data-compiler/tests/data-compiler.xspec
R opensiddur-server/src/transforms/data-compiler/tests/evaluate-conditionals-context.xml
R opensiddur-server/src/transforms/data-compiler/tests/evaluate-conditionals.xspec
R opensiddur-server/src/transforms/data-compiler/tests/fs-1-YES-MAYBE.xml
R opensiddur-server/src/transforms/data-compiler/tests/fs-1-YES-YES.xml
R opensiddur-server/src/transforms/data-compiler/tests/fs-1-f-1-M.xml
R opensiddur-server/src/transforms/data-compiler/tests/fs-1-f-1-N.xml
R opensiddur-server/src/transforms/data-compiler/tests/fs-1-f-1-Y.xml
R opensiddur-server/src/transforms/data-compiler/tests/fs-1-f-3-OFF.xml
R opensiddur-server/src/transforms/data-compiler/tests/fs-1-f-3-ON.xml
R opensiddur-server/src/transforms/data-compiler/tests/get-selection-value-context.xml
R opensiddur-server/src/transforms/data-compiler/tests/incorporate-new-selections-context-1.xml
R opensiddur-server/src/transforms/data-compiler/tests/incorporate-new-selections-context-2.xml
R opensiddur-server/src/transforms/data-compiler/tests/incorporate-new-selections-context-3.xml
R opensiddur-server/src/transforms/data-compiler/tests/incorporate-new-selections.xspec
R opensiddur-server/src/transforms/data-compiler/tests/standardize-features-context.xml
R opensiddur-server/src/transforms/data-compiler/tests/standardize-features.xspec
R opensiddur-server/src/transforms/data-compiler/tests/standoff.xspec
R opensiddur-server/src/transforms/data-compiler/tests/test-conditional-declarations.xml
R opensiddur-server/src/transforms/flatten/intermediate-links.xqm
R opensiddur-server/src/transforms/format/reverse-xhtml/reverse-generic.xsl2
R opensiddur-server/src/transforms/format/reverse-xhtml/reverse.xsl2
R opensiddur-server/src/transforms/format/xhtml/bibliography-xhtml.xsl2
R opensiddur-server/src/transforms/format/xhtml/credits-list.xsl2
R opensiddur-server/src/transforms/format/xhtml/dict.xsl2
R opensiddur-server/src/transforms/format/xhtml/inline.xsl2
R opensiddur-server/src/transforms/format/xhtml/ref.xsl2
R opensiddur-server/src/transforms/format/xhtml/relationship.xsl2
R opensiddur-server/src/transforms/format/xhtml/style.css
R opensiddur-server/src/transforms/format/xhtml/xhtml-generic.xsl2
R opensiddur-server/src/transforms/format/xhtml/xhtml.xsl2
R opensiddur-server/src/transforms/list-compiler/bibliography.xsl2
R opensiddur-server/src/transforms/list-compiler/credits.xsl2
R opensiddur-server/src/transforms/list-compiler/lc-common.xsl2
R opensiddur-server/src/transforms/list-compiler/licensing.xsl2
R opensiddur-server/src/transforms/list-compiler/list-compiler.xsl2
R opensiddur-server/src/transforms/list-compiler/strings.xml
R opensiddur-server/src/transforms/list-compiler/tests/__override__.xml
R opensiddur-server/src/transforms/list-compiler/tests/bibliography-context.xml
R opensiddur-server/src/transforms/list-compiler/tests/credits-context.xml
R opensiddur-server/src/transforms/list-compiler/tests/licensing-cc-by-attribution.xml
R opensiddur-server/src/transforms/list-compiler/tests/licensing-cc-by-sa.xml
R opensiddur-server/src/transforms/list-compiler/tests/licensing-cc-by.xml
R opensiddur-server/src/transforms/list-compiler/tests/licensing-cc0.xml
R opensiddur-server/src/transforms/list-compiler/tests/licensing-context.xml
R opensiddur-server/src/transforms/list-compiler/tests/list-compiler.xspec
R opensiddur-server/src/transforms/translit/translit-main.xsl2
R opensiddur-server/src/transforms/translit/translit.xsl2
M opensiddur-sources/input-conversion/fill-template.xsl2
M opensiddur-tests/src/tests/api/data/conditionals/Existing-After-Put.xml
M opensiddur-tests/src/tests/api/data/conditionals/Existing.xml
M opensiddur-tests/src/tests/api/data/conditionals/Invalid.xml
M opensiddur-tests/src/tests/api/data/conditionals/NoWriteAccess.xml
M opensiddur-tests/src/tests/api/data/conditionals/Valid.xml
M opensiddur-tests/src/tests/api/data/dictionaries/Existing-After-Put.xml
M opensiddur-tests/src/tests/api/data/dictionaries/Existing.xml
M opensiddur-tests/src/tests/api/data/dictionaries/Invalid-After-Put.xml
M opensiddur-tests/src/tests/api/data/dictionaries/Invalid.xml
M opensiddur-tests/src/tests/api/data/dictionaries/NoWriteAccess.xml
M opensiddur-tests/src/tests/api/data/dictionaries/Valid.xml
M opensiddur-tests/src/tests/api/data/linkage/A-he.xml
M opensiddur-tests/src/tests/api/data/linkage/B-en.xml
M opensiddur-tests/src/tests/api/data/linkage/Existing-After-Put-Invalid-RevisionDesc.xml
M opensiddur-tests/src/tests/api/data/linkage/Existing-After-Put.xml
M opensiddur-tests/src/tests/api/data/linkage/Existing.xml
M opensiddur-tests/src/tests/api/data/linkage/Invalid.xml
M opensiddur-tests/src/tests/api/data/linkage/Valid.xml
M opensiddur-tests/src/tests/api/data/notes/Existing-After-Put.xml
M opensiddur-tests/src/tests/api/data/notes/Existing.xml
M opensiddur-tests/src/tests/api/data/notes/Invalid-After-Put-Illegal-RevisionDesc.xml
M opensiddur-tests/src/tests/api/data/notes/Invalid.xml
M opensiddur-tests/src/tests/api/data/notes/Query.xml
M opensiddur-tests/src/tests/api/data/notes/Valid.xml
M opensiddur-tests/src/tests/api/data/original/Existing-After-Put.xml
M opensiddur-tests/src/tests/api/data/original/Existing-Flat.xml
M opensiddur-tests/src/tests/api/data/original/Existing.xml
M opensiddur-tests/src/tests/api/data/original/HasTransclude.xml
M opensiddur-tests/src/tests/api/data/original/Invalid-After-Put-Illegal-RevisionDesc.xml
M opensiddur-tests/src/tests/api/data/original/Invalid-Flat.xml
M opensiddur-tests/src/tests/api/data/original/Invalid.xml
M opensiddur-tests/src/tests/api/data/original/QueryResult.xml
M opensiddur-tests/src/tests/api/data/original/Transcluded.xml
M opensiddur-tests/src/tests/api/data/original/Valid-Flat.xml
M opensiddur-tests/src/tests/api/data/original/Valid.xml
M opensiddur-tests/src/tests/api/data/styles/Existing-After-Put.xml
M opensiddur-tests/src/tests/api/data/styles/Existing.xml
M opensiddur-tests/src/tests/api/data/styles/Invalid.xml
M opensiddur-tests/src/tests/api/data/styles/NoWriteAccess.xml
M opensiddur-tests/src/tests/api/data/styles/Valid.xml
M opensiddur-tests/src/tests/contributors.xml
M opensiddur-tests/src/tests/minimal-invalid.xml
M opensiddur-tests/src/tests/minimal-valid.xml
A opensiddur-tests/src/tests/modules/validation.t.xml
A opensiddur-tests/src/tests/modules/validation/bad-license.xml
A opensiddur-tests/src/tests/modules/validation/good-license.xml
M opensiddur-tests/src/tests/transforms/conditional1.xml
M opensiddur-tests/src/tests/transforms/flatten-par.xml
M opensiddur-tests/src/tests/transforms/flatten-parA.xml
M opensiddur-tests/src/tests/transforms/flatten-parB.xml
M opensiddur-tests/src/tests/transforms/flatten/combine-ann-incl.xml
M opensiddur-tests/src/tests/transforms/flatten/combine-ann-notes.xml
M opensiddur-tests/src/tests/transforms/flatten/combine-ann-par.xml
M opensiddur-tests/src/tests/transforms/flatten/combine-ann-parA.xml
M opensiddur-tests/src/tests/transforms/flatten/combine-ann-parB.xml
M opensiddur-tests/src/tests/transforms/flatten/combine-ann1.xml
M opensiddur-tests/src/tests/transforms/flatten/combine-ann2.xml
M opensiddur-tests/src/tests/transforms/flatten/combine-cond-incl.xml
M opensiddur-tests/src/tests/transforms/flatten/combine-cond-par.xml
M opensiddur-tests/src/tests/transforms/flatten/combine-cond-parA.xml
M opensiddur-tests/src/tests/transforms/flatten/combine-cond-parB.xml
M opensiddur-tests/src/tests/transforms/flatten/combine-cond1.xml
M opensiddur-tests/src/tests/transforms/flatten/combine-cond2.xml
M opensiddur-tests/src/tests/transforms/flatten/combine-cond3.xml
M opensiddur-tests/src/tests/transforms/flatten/combine-repeat.xml
M opensiddur-tests/src/tests/transforms/flatten/combine-settings.xml
M opensiddur-tests/src/tests/transforms/flatten/combine1.xml
M opensiddur-tests/src/tests/transforms/flatten/combine2.xml
M opensiddur-tests/src/tests/transforms/flatten/combine3.xml
M opensiddur-tests/src/tests/transforms/flatten/include-part-1.xml
M opensiddur-tests/src/tests/transforms/flatten/include-part-2.xml
M opensiddur-tests/src/tests/transforms/flatten/include-simple-1.xml
M opensiddur-tests/src/tests/transforms/flatten/linkage-part.xml
M opensiddur-tests/src/tests/transforms/flatten/linkage-same.xml
M opensiddur-tests/src/tests/transforms/flatten/linkage-simple.xml
M opensiddur-tests/src/tests/transforms/flatten/parallel-part-A.xml
M opensiddur-tests/src/tests/transforms/flatten/parallel-part-B.xml
M opensiddur-tests/src/tests/transforms/flatten/parallel-same-A.xml
M opensiddur-tests/src/tests/transforms/flatten/parallel-simple-A.xml
M opensiddur-tests/src/tests/transforms/flatten/parallel-simple-B.xml
M opensiddur-tests/src/tests/transforms/flatten/unflatten-order-bug.xml
M opensiddur-tests/src/tests/transforms/par.xml
M opensiddur-tests/src/tests/transforms/parA.xml
M opensiddur-tests/src/tests/transforms/parB.xml
M opensiddur-tests/src/tests/transforms/phony1.xml
M opensiddur-tests/src/tests/transforms/phony2.xml
M opensiddur-tests/src/tests/transforms/phony3.xml
M opensiddur-tests/src/tests/transforms/phony4.xml
M opensiddur-tests/src/tests/transforms/phony5.xml
M opensiddur-tests/src/tests/transforms/unflatten-par.xml
M opensiddur-tests/src/tests/transforms/unflatten-parA.xml
M opensiddur-tests/src/tests/transforms/unflatten-parB.xml
Log Message:
-----------
Merge branch 'develop' of https://github.com/opensiddur/opensiddur into develop
Commit: 5cebe6a5ecccf05c15b2b4381a68609d1059928b
https://github.com/opensiddur/opensiddur/commit/5cebe6a5ecccf05c15b2b4381a68609d1059928b
Author: Jordan Rosenfeld <jordan.r...@gmail.com>
Date: 2014-08-24 (Sun, 24 Aug 2014)
Changed paths:
R opensiddur-server/src/data/styles/en/example-pages/Tehillim/reset.css
R opensiddur-server/src/data/styles/en/example-pages/Tehillim/tehillim.css
Log Message:
-----------
Removed example-pages folder.
Commit: 76122339b63da3ff1bd238ef25bade37e8c2fe9a
https://github.com/opensiddur/opensiddur/commit/76122339b63da3ff1bd238ef25bade37e8c2fe9a
Author: Jordan Rosenfeld <jordan.r...@gmail.com>
Date: 2014-08-26 (Tue, 26 Aug 2014)
Changed paths:
M opensiddur-server/src/data/styles/en/generic.xml
Log Message:
-----------
Edited generic.xml to remove .id-main as selector.
Commit: 6541ec84c002ee89cd8eea95faf76589e750dd2f
https://github.com/opensiddur/opensiddur/commit/6541ec84c002ee89cd8eea95faf76589e750dd2f
Author: Jordan Rosenfeld <jordan.r...@gmail.com>
Date: 2014-08-26 (Tue, 26 Aug 2014)
Changed paths:
M opensiddur-server/src/data/styles/en/generic.xml
Log Message:
-----------
Reinserted wrapper for generic.xml
Commit: 992de34f0ab30050635a93217d2d9e011327b447
https://github.com/opensiddur/opensiddur/commit/992de34f0ab30050635a93217d2d9e011327b447
Author: Jordan Rosenfeld <jordan.r...@gmail.com>
Date: 2014-08-26 (Tue, 26 Aug 2014)
Changed paths:
M build.xml
M opensiddur-server/src/modules/format.xqm
M opensiddur-server/src/schema/annotation.xml
M opensiddur-server/src/static/cc-by-sa.svg
M opensiddur-server/src/static/cc-by.svg
M opensiddur-server/src/static/cc-publicdomain.svg
M opensiddur-server/src/static/cc-zero.svg
M opensiddur-sources/build.xml
M opensiddur-sources/input-conversion/wlc/wlc2jlptei.xsl2
Log Message:
-----------
Merge https://github.com/opensiddur/opensiddur into develop
Commit: ad9cb76a5e58e5b95eac52dc76095da6820a5cfe
https://github.com/opensiddur/opensiddur/commit/ad9cb76a5e58e5b95eac52dc76095da6820a5cfe
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-01 (Mon, 01 Sep 2014)
Changed paths:
M opensiddur-server/src/data/styles/en/generic.xml
Log Message:
-----------
resolve merge conflicts
Commit: 34d65658079658b7395941130fbd1686a4a82cf6
https://github.com/opensiddur/opensiddur/commit/34d65658079658b7395941130fbd1686a4a82cf6
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-01 (Mon, 01 Sep 2014)
Changed paths:
M opensiddur-server/src/data/styles/en/generic.xml
Log Message:
-----------
Merge branch 'jordan-rosenfeld-develop' into feature/generic-css
Commit: 8708e415e6b432da58394895206a85735ee28e12
https://github.com/opensiddur/opensiddur/commit/8708e415e6b432da58394895206a85735ee28e12
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-06 (Sat, 06 Sep 2014)
Changed paths:
M build.xml
M lib/exist
M opensiddur-demos/src/expath-pkg.xml
M opensiddur-server/src/expath-pkg.xml
M opensiddur-sources/src/expath-pkg.xml
M opensiddur-tests/src/expath-pkg.xml
Log Message:
-----------
Merge branch 'develop' into feature/generic-css
Commit: 8deb3b9853970ee7a0875901d62994acc923ba0c
https://github.com/opensiddur/opensiddur/commit/8deb3b9853970ee7a0875901d62994acc923ba0c
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)
Changed paths:
M opensiddur-server/src/schema/conditional.xml
Log Message:
-----------
conditionals schema: allow a default value for a feature when conditions are specified (align the schema to the transform)
Commit: d0e6e112774d503e32f4e7117aec2764d3ed3321
https://github.com/opensiddur/opensiddur/commit/d0e6e112774d503e32f4e7117aec2764d3ed3321
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)
Changed paths:
M opensiddur-server/src/api/data/conditionals.xqm
M opensiddur-server/src/api/data/dictionaries.xqm
M opensiddur-server/src/api/data/linkage.xqm
M opensiddur-server/src/api/data/notes.xqm
M opensiddur-server/src/api/data/original.xqm
M opensiddur-server/src/api/data/sources.xqm
M opensiddur-server/src/api/data/styles.xqm
M opensiddur-server/src/api/data/transliteration.xqm
M opensiddur-server/src/modules/common.xqm
M opensiddur-server/src/modules/refindex.xqm
M opensiddur-server/src/schema/conditional.xml
R opensiddur-server/src/system/config/db/__target__/grammar-parser/collection.xconf
M opensiddur-server/src/system/config/db/collection.xconf
M opensiddur-server/src/system/config/db/data/conditionals/collection.xconf
M opensiddur-server/src/system/config/db/data/dictionaries/en/collection.xconf
M opensiddur-server/src/system/config/db/data/dictionaries/he/collection.xconf
M opensiddur-server/src/system/config/db/data/linkage/collection.xconf
M opensiddur-server/src/system/config/db/data/linkage/en/collection.xconf
M opensiddur-server/src/system/config/db/data/linkage/he/collection.xconf
M opensiddur-server/src/system/config/db/data/notes/en/collection.xconf
M opensiddur-server/src/system/config/db/data/notes/he/collection.xconf
M opensiddur-server/src/system/config/db/data/original/en/collection.xconf
M opensiddur-server/src/system/config/db/data/original/he/collection.xconf
M opensiddur-server/src/system/config/db/data/sources/collection.xconf
M opensiddur-server/src/system/config/db/data/styles/collection.xconf
M opensiddur-server/src/system/config/db/data/transliteration/collection.xconf
M opensiddur-server/src/system/config/db/data/user/collection.xconf
M opensiddur-server/src/system/config/db/refindex/collection.xconf
M opensiddur-server/src/transforms/combine.xqm
M opensiddur-server/src/transforms/tohtml.xqm
A opensiddur-tests/src/tests/transforms/flatten/combine-style-1.xml
A opensiddur-tests/src/tests/transforms/flatten/combine-style-2.xml
M opensiddur-tests/src/tests/transforms/flatten/combine.t.xml
Log Message:
-----------
Merge branch 'develop' into feature/generic-css
Commit: 506d610beda07e3622169c75aed864fab30063ff
https://github.com/opensiddur/opensiddur/commit/506d610beda07e3622169c75aed864fab30063ff
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)
Changed paths:
M opensiddur-server/src/data/styles/en/generic.xml
Log Message:
-----------
modify and incorporate Jordan Rosenfeld's changes/ideas for the CSS
Commit: 8b401318ff1ff86446269e11be5ca2e453b37eb2
https://github.com/opensiddur/opensiddur/commit/8b401318ff1ff86446269e11be5ca2e453b37eb2
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-30 (Tue, 30 Sep 2014)
Changed paths:
M opensiddur-server/src/data/styles/en/generic.xml
Log Message:
-----------
Merge branch 'feature/generic-css' into develop
Compare: https://github.com/opensiddur/opensiddur/compare/cde2a64eaf28...8b401318ff1f
Reply all
Reply to author
Forward
0 new messages