[opensiddur/opensiddur-client] cc00c9: Merge tag 'client-v0.0.5' into develop
1 view
Skip to first unread message
GitHub
Sep 17, 2014, 2:14:13 AM9/17/14
to opensid...@googlegroups.com
Branch: refs/heads/master
Home: https://github.com/opensiddur/opensiddur-client
Commit: cc00c95848698d0b6e4a358315c2d36112492701
https://github.com/opensiddur/opensiddur-client/commit/cc00c95848698d0b6e4a358315c2d36112492701
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-08-10 (Sun, 10 Aug 2014)
Log Message:
-----------
Merge tag 'client-v0.0.5' into develop
Tag for client v0.0.5
Commit: f9a40be57bfceb7b1728533b807da9e9e3f71a3f
https://github.com/opensiddur/opensiddur-client/commit/f9a40be57bfceb7b1728533b807da9e9e3f71a3f
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-08-20 (Wed, 20 Aug 2014)
Changed paths:
M templates/conditionals.xml
M templates/linkage.xml
M templates/original.xml
Log Message:
-----------
remove @status in templates
Commit: 49de3e3933584446cd7757773e39ab0999d7e429
https://github.com/opensiddur/opensiddur-client/commit/49de3e3933584446cd7757773e39ab0999d7e429
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-08-20 (Wed, 20 Aug 2014)
Changed paths:
M expath-pkg.xml
Log Message:
-----------
bump min required dependency version
Commit: 2d39f78ca9151d5f4ef0cd66b4032505dc58f292
https://github.com/opensiddur/opensiddur-client/commit/2d39f78ca9151d5f4ef0cd66b4032505dc58f292
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-08-20 (Wed, 20 Aug 2014)
Changed paths:
M expath-pkg.xml
M templates/conditionals.xml
M templates/linkage.xml
M templates/original.xml
Log Message:
-----------
Merge branch 'feature/templates-no-status' into develop
Commit: aa684aeda496dbbe2eff3f8cec48d99ddd58c790
https://github.com/opensiddur/opensiddur-client/commit/aa684aeda496dbbe2eff3f8cec48d99ddd58c790
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-08-23 (Sat, 23 Aug 2014)
Changed paths:
M index.html
M js/app.js
M js/controllers/TextsCtrl.js
M js/services/RestApi.js
A templates/annotations.xml
Log Message:
-----------
annotation support added to texts partial
Commit: 80a6aed2eacfe530442e90c2d3be9e1e7faeb282
https://github.com/opensiddur/opensiddur-client/commit/80a6aed2eacfe530442e90c2d3be9e1e7faeb282
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-08-27 (Wed, 27 Aug 2014)
Changed paths:
M templates/annotations.xml
M templates/conditionals.xml
M templates/linkage.xml
M templates/original.xml
Log Message:
-----------
templates for sourceDesc schema change
Commit: 8d0343c4db8bd7b2fdb430f038a189030e6a2646
https://github.com/opensiddur/opensiddur-client/commit/8d0343c4db8bd7b2fdb430f038a189030e6a2646
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-08-31 (Sun, 31 Aug 2014)
Changed paths:
M js/bower_components/angular-ui-codemirror/.bower.json
M js/bower_components/angular-ui-codemirror/bower.json
M js/bower_components/angular-ui-codemirror/ui-codemirror.js
M js/bower_components/angular-ui-codemirror/ui-codemirror.min.js
Log Message:
-----------
update angular-ui-codemirror
Commit: 377e7ba400f12abb8e6bc9eb0de76b01b1f7a6f6
https://github.com/opensiddur/opensiddur-client/commit/377e7ba400f12abb8e6bc9eb0de76b01b1f7a6f6
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-08-31 (Sun, 31 Aug 2014)
Changed paths:
M index.html
M js/controllers/TextsCtrl.js
A js/directives/osNewDialog.html
A js/directives/osNewDialog.js
M js/services/XsltService.js
A js/vkbeautify/vkbeautify.js
M partials/texts.html
R templates/annotations.xml
A templates/annotations.xsl
R templates/conditionals.xml
A templates/conditionals.xsl
R templates/original.xml
A templates/original.xsl
Log Message:
-----------
use a dialog box to fill in the initial required values in the editor
Commit: 06bf850f1ff01ba96546a9d693817e6c492f32f4
https://github.com/opensiddur/opensiddur-client/commit/06bf850f1ff01ba96546a9d693817e6c492f32f4
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-08-31 (Sun, 31 Aug 2014)
Changed paths:
M js/directives/osNewDialog.html
Log Message:
-----------
form validation for the OK button
Commit: 965e846630c813da837a1c1c577557e22a0ac84f
https://github.com/opensiddur/opensiddur-client/commit/965e846630c813da837a1c1c577557e22a0ac84f
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-08-31 (Sun, 31 Aug 2014)
Changed paths:
A js/sarissa/META-INF/MANIFEST.MF
A js/sarissa/META-INF/maven/gr.abiss.js/sarissa/pom.properties
A js/sarissa/META-INF/maven/gr.abiss.js/sarissa/pom.xml
A js/sarissa/compressed-js-header.txt
A js/sarissa/gr/abiss/js/sarissa/sarissa-compressed.js
A js/sarissa/gr/abiss/js/sarissa/sarissa-mediawiki-compressed.js
A js/sarissa/gr/abiss/js/sarissa/sarissa-mediawiki.js
A js/sarissa/gr/abiss/js/sarissa/sarissa-table-utils-compressed.js
A js/sarissa/gr/abiss/js/sarissa/sarissa-table-utils.js
A js/sarissa/gr/abiss/js/sarissa/sarissa.js
A js/sarissa/gr/abiss/js/sarissa/sarissa_ieemu_xpath-compressed.js
A js/sarissa/gr/abiss/js/sarissa/sarissa_ieemu_xpath.js
Log Message:
-----------
bring back sarissa for XSLT 1.0 xsl:output
Commit: 02ff02f9e2d4b9974ed36c8930a6c6c65055acd5
https://github.com/opensiddur/opensiddur-client/commit/02ff02f9e2d4b9974ed36c8930a6c6c65055acd5
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-08-31 (Sun, 31 Aug 2014)
Changed paths:
M index.html
M js/controllers/TextsCtrl.js
M js/services/XsltService.js
R js/vkbeautify/vkbeautify.js
Log Message:
-----------
use XSLT 1.0 to ident the XML
Commit: 3b03dbf63dd80fb82c3058a611f8105fdd8590be
https://github.com/opensiddur/opensiddur-client/commit/3b03dbf63dd80fb82c3058a611f8105fdd8590be
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-08-31 (Sun, 31 Aug 2014)
Changed paths:
M js/controllers/TextsCtrl.js
Log Message:
-----------
add a load timeout to all loads
Commit: e49d46ea9c26db15d1016dade8d5aa1ea87ac84f
https://github.com/opensiddur/opensiddur-client/commit/e49d46ea9c26db15d1016dade8d5aa1ea87ac84f
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-01 (Mon, 01 Sep 2014)
Changed paths:
M index.html
Log Message:
-----------
remove sarissa again
Commit: df39cac3c935c8478eca676dd5a606e30a3609e4
https://github.com/opensiddur/opensiddur-client/commit/df39cac3c935c8478eca676dd5a606e30a3609e4
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-01 (Mon, 01 Sep 2014)
Changed paths:
M js/services/XsltService.js
A js/vkbeautify/vkbeautify.js
Log Message:
-----------
use vkbeautify for indent
Commit: 9463159f8e91cc8a8e590bd5a24ea55f75d9766b
https://github.com/opensiddur/opensiddur-client/commit/9463159f8e91cc8a8e590bd5a24ea55f75d9766b
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-01 (Mon, 01 Sep 2014)
Changed paths:
M js/controllers/TextsCtrl.js
M xsl/OriginalBeforeSave.xsl
Log Message:
-----------
no more new dialog on startup, fix indent issues in commit messages
Commit: a621f2a87453a0105b683099a33989c57d540a43
https://github.com/opensiddur/opensiddur-client/commit/a621f2a87453a0105b683099a33989c57d540a43
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-01 (Mon, 01 Sep 2014)
Changed paths:
M css/app.css
M partials/texts.html
Log Message:
-----------
make the beginning message bigger
Commit: 7ff68638b73ae0711fb2440e416173567d2b8ef2
https://github.com/opensiddur/opensiddur-client/commit/7ff68638b73ae0711fb2440e416173567d2b8ef2
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-01 (Mon, 01 Sep 2014)
Changed paths:
M css/app.css
M index.html
M js/bower_components/angular-ui-codemirror/.bower.json
M js/bower_components/angular-ui-codemirror/bower.json
M js/bower_components/angular-ui-codemirror/ui-codemirror.js
M js/bower_components/angular-ui-codemirror/ui-codemirror.min.js
M js/controllers/TextsCtrl.js
A js/directives/osNewDialog.html
A js/directives/osNewDialog.js
A js/sarissa/META-INF/MANIFEST.MF
A js/sarissa/META-INF/maven/gr.abiss.js/sarissa/pom.properties
A js/sarissa/META-INF/maven/gr.abiss.js/sarissa/pom.xml
A js/sarissa/compressed-js-header.txt
A js/sarissa/gr/abiss/js/sarissa/sarissa-compressed.js
A js/sarissa/gr/abiss/js/sarissa/sarissa-mediawiki-compressed.js
A js/sarissa/gr/abiss/js/sarissa/sarissa-mediawiki.js
A js/sarissa/gr/abiss/js/sarissa/sarissa-table-utils-compressed.js
A js/sarissa/gr/abiss/js/sarissa/sarissa-table-utils.js
A js/sarissa/gr/abiss/js/sarissa/sarissa.js
A js/sarissa/gr/abiss/js/sarissa/sarissa_ieemu_xpath-compressed.js
A js/sarissa/gr/abiss/js/sarissa/sarissa_ieemu_xpath.js
M js/services/XsltService.js
A js/vkbeautify/vkbeautify.js
M partials/texts.html
R templates/annotations.xml
A templates/annotations.xsl
R templates/conditionals.xml
A templates/conditionals.xsl
R templates/original.xml
A templates/original.xsl
M xsl/OriginalBeforeSave.xsl
Log Message:
-----------
Merge branch 'feature/new-dialog' into develop
Commit: 3818b2c455fca957f8cdd29304ec08c079dcf2e8
https://github.com/opensiddur/opensiddur-client/commit/3818b2c455fca957f8cdd29304ec08c079dcf2e8
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-02 (Tue, 02 Sep 2014)
Changed paths:
M xsl/OriginalBeforeSave.xsl
Log Message:
-----------
trim whitespace in tei:idno
Commit: 7b5d81116bf81e91ebd91661880d965b0469d425
https://github.com/opensiddur/opensiddur-client/commit/7b5d81116bf81e91ebd91661880d965b0469d425
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-02 (Tue, 02 Sep 2014)
Changed paths:
M expath-pkg.xml
M partials/about.html
Log Message:
-----------
bump the version number
Commit: 84e02353494751b1add986f89c2cd560cdfc31e0
https://github.com/opensiddur/opensiddur-client/commit/84e02353494751b1add986f89c2cd560cdfc31e0
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-03 (Wed, 03 Sep 2014)
Changed paths:
M css/app.css
M expath-pkg.xml
M index.html
M js/app.js
M js/bower_components/angular-ui-codemirror/.bower.json
M js/bower_components/angular-ui-codemirror/bower.json
M js/bower_components/angular-ui-codemirror/ui-codemirror.js
M js/bower_components/angular-ui-codemirror/ui-codemirror.min.js
M js/controllers/TextsCtrl.js
A js/directives/osNewDialog.html
A js/directives/osNewDialog.js
A js/sarissa/META-INF/MANIFEST.MF
A js/sarissa/META-INF/maven/gr.abiss.js/sarissa/pom.properties
A js/sarissa/META-INF/maven/gr.abiss.js/sarissa/pom.xml
A js/sarissa/compressed-js-header.txt
A js/sarissa/gr/abiss/js/sarissa/sarissa-compressed.js
A js/sarissa/gr/abiss/js/sarissa/sarissa-mediawiki-compressed.js
A js/sarissa/gr/abiss/js/sarissa/sarissa-mediawiki.js
A js/sarissa/gr/abiss/js/sarissa/sarissa-table-utils-compressed.js
A js/sarissa/gr/abiss/js/sarissa/sarissa-table-utils.js
A js/sarissa/gr/abiss/js/sarissa/sarissa.js
A js/sarissa/gr/abiss/js/sarissa/sarissa_ieemu_xpath-compressed.js
A js/sarissa/gr/abiss/js/sarissa/sarissa_ieemu_xpath.js
M js/services/RestApi.js
M js/services/XsltService.js
A js/vkbeautify/vkbeautify.js
M partials/about.html
M partials/texts.html
A templates/annotations.xsl
R templates/conditionals.xml
A templates/conditionals.xsl
M templates/linkage.xml
R templates/original.xml
A templates/original.xsl
M xsl/OriginalBeforeSave.xsl
Log Message:
-----------
Merge branch 'release/client-v0.0.6'
Commit: 7ee58c06e132b26fb49551fd554fa1e07df84f23
https://github.com/opensiddur/opensiddur-client/commit/7ee58c06e132b26fb49551fd554fa1e07df84f23
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-03 (Wed, 03 Sep 2014)
Changed paths:
M expath-pkg.xml
M partials/about.html
Log Message:
-----------
Merge tag 'client-vclient-v0.0.6' into develop
Tag client v0.0.6
Commit: 146dc98e8dbc9a30710dae5ef3901040ede8c2a9
https://github.com/opensiddur/opensiddur-client/commit/146dc98e8dbc9a30710dae5ef3901040ede8c2a9
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-06 (Sat, 06 Sep 2014)
Log Message:
-----------
Merge branch 'master' into develop
Commit: 2c234569541fa89fc122b39933b7ccd53ba8109d
https://github.com/opensiddur/opensiddur-client/commit/2c234569541fa89fc122b39933b7ccd53ba8109d
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-06 (Sat, 06 Sep 2014)
Changed paths:
M README.md
Log Message:
-----------
update readme to reflect preference for feature branches
Commit: a74cf9925d11f4a9c60aa9e21376d5e747624727
https://github.com/opensiddur/opensiddur-client/commit/a74cf9925d11f4a9c60aa9e21376d5e747624727
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-07 (Sun, 07 Sep 2014)
Changed paths:
M js/controllers/TextsCtrl.js
Log Message:
-----------
reset cursor position after running XSLT
Commit: 986f3f783907a4023c524dc1f4cd48773507b435
https://github.com/opensiddur/opensiddur-client/commit/986f3f783907a4023c524dc1f4cd48773507b435
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-07 (Sun, 07 Sep 2014)
Changed paths:
M partials/texts.html
Log Message:
-----------
move the XML helper to a menu
Commit: 9dab18b9d7dd6f90d664671e0cd6ed1c27041ac1
https://github.com/opensiddur/opensiddur-client/commit/9dab18b9d7dd6f90d664671e0cd6ed1c27041ac1
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-07 (Sun, 07 Sep 2014)
Changed paths:
M partials/texts.html
Log Message:
-----------
do not show sharing status when no file is loaded
Commit: c1de0a54d0df7156b6eabdf57a91268839b69992
https://github.com/opensiddur/opensiddur-client/commit/c1de0a54d0df7156b6eabdf57a91268839b69992
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-07 (Sun, 07 Sep 2014)
Changed paths:
M index.html
M js/controllers/TextsCtrl.js
A js/directives/osInsertLinkDialog.html
A js/directives/osInsertLinkDialog.js
M partials/texts.html
Log Message:
-----------
insert link moved to dialog, remove the helper tabs
Commit: 69a386c7c07141fd7a2c8daaee600af054524c3a
https://github.com/opensiddur/opensiddur-client/commit/69a386c7c07141fd7a2c8daaee600af054524c3a
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-11 (Thu, 11 Sep 2014)
Changed paths:
M index.html
M js/controllers/TextsCtrl.js
A js/directives/osIdList.html
A js/directives/osIdList.js
A js/directives/osInsertInternalLinkDialog.html
A js/directives/osInsertInternalLinkDialog.js
M js/services/XsltService.js
M partials/texts.html
A xsl/ListXmlId.xsl
Log Message:
-----------
id list and internal id insertion dialog
Commit: ea7567b77a8ea670344cb13acb788b45a6f81327
https://github.com/opensiddur/opensiddur-client/commit/ea7567b77a8ea670344cb13acb788b45a6f81327
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-13 (Sat, 13 Sep 2014)
Changed paths:
M js/directives/osIdList.html
M js/directives/osIdList.js
Log Message:
-----------
range index checking
Commit: 85d93899ab1b9897706ea5222f5162448b797a42
https://github.com/opensiddur/opensiddur-client/commit/85d93899ab1b9897706ea5222f5162448b797a42
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-13 (Sat, 13 Sep 2014)
Changed paths:
M xsl/ListXmlId.xsl
Log Message:
-----------
make sure that all text strings are a single text node
Commit: 5b48e91693b9962244ed948daddcbbf5a1b3b1c2
https://github.com/opensiddur/opensiddur-client/commit/5b48e91693b9962244ed948daddcbbf5a1b3b1c2
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-13 (Sat, 13 Sep 2014)
Changed paths:
M js/services/RestApi.js
Log Message:
-----------
add a quasi-XML-as-string endpoint
Commit: 5ecd7d4e643f018990c8cd63cc5a72b8d464e748
https://github.com/opensiddur/opensiddur-client/commit/5ecd7d4e643f018990c8cd63cc5a72b8d464e748
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-13 (Sat, 13 Sep 2014)
Changed paths:
M js/directives/osInsertLinkDialog.html
M js/directives/osInsertLinkDialog.js
Log Message:
-----------
insert external link dialog
Commit: 8b55e27a520438b3c018ffeb661dd48202bf9e94
https://github.com/opensiddur/opensiddur-client/commit/8b55e27a520438b3c018ffeb661dd48202bf9e94
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-13 (Sat, 13 Sep 2014)
Changed paths:
M index.html
M js/controllers/TextsCtrl.js
A js/directives/osIdList.html
A js/directives/osIdList.js
A js/directives/osInsertInternalLinkDialog.html
A js/directives/osInsertInternalLinkDialog.js
A js/directives/osInsertLinkDialog.html
A js/directives/osInsertLinkDialog.js
M js/services/RestApi.js
M js/services/XsltService.js
M partials/texts.html
A xsl/ListXmlId.xsl
Log Message:
-----------
Merge branch 'feature/remove-helper-tabs' into develop, closes #14
Commit: 8d85655e6c4cce5484a66666a1570b2ee70069f2
https://github.com/opensiddur/opensiddur-client/commit/8d85655e6c4cce5484a66666a1570b2ee70069f2
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-14 (Sun, 14 Sep 2014)
Changed paths:
M partials/sources.html
Log Message:
-----------
fix typo-too many brackets
Commit: a7c4cf0e4e805abe5bcaae1071fd3c8f5a2b7352
https://github.com/opensiddur/opensiddur-client/commit/a7c4cf0e4e805abe5bcaae1071fd3c8f5a2b7352
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-15 (Mon, 15 Sep 2014)
Changed paths:
M xsl/sourceformtemplate.xsl
Log Message:
-----------
bugfix: transcription links were not being preserved
Commit: 0468dd1de580dc0629062cfab6a9844757ed93a4
https://github.com/opensiddur/opensiddur-client/commit/0468dd1de580dc0629062cfab6a9844757ed93a4
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-16 (Tue, 16 Sep 2014)
Changed paths:
M css/app.css
M index.html
M js/app.js
M js/controllers/TextsCtrl.js
A js/directives/osTranscriptionWindow.html
A js/directives/osTranscriptionWindow.js
M js/services/RestApi.js
M js/services/XsltService.js
M partials/texts.html
A xsl/ExtractTranscriptionLinks.xsl
Log Message:
-----------
basic transcription window (still needs a lot of styling work)
Commit: 5cf47c1e8eea7c7c15437b717db1c753d5da7fc9
https://github.com/opensiddur/opensiddur-client/commit/5cf47c1e8eea7c7c15437b717db1c753d5da7fc9
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-16 (Tue, 16 Sep 2014)
Changed paths:
M css/app.css
M index.html
M js/app.js
M js/controllers/TextsCtrl.js
A js/directives/osTranscriptionWindow.html
A js/directives/osTranscriptionWindow.js
M js/services/RestApi.js
M js/services/XsltService.js
M partials/sources.html
M partials/texts.html
A xsl/ExtractTranscriptionLinks.xsl
M xsl/sourceformtemplate.xsl
Log Message:
-----------
Merge branch 'feature/transcription-window' into develop, closes #13
Commit: d4795e3a4af5f1579d04bb2a306fe836adc692a1
https://github.com/opensiddur/opensiddur-client/commit/d4795e3a4af5f1579d04bb2a306fe836adc692a1
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-16 (Tue, 16 Sep 2014)
Changed paths:
M expath-pkg.xml
M partials/about.html
Log Message:
-----------
bump the version number
Commit: cec2391b90251f9a16470523a934443156a39593
https://github.com/opensiddur/opensiddur-client/commit/cec2391b90251f9a16470523a934443156a39593
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-16 (Tue, 16 Sep 2014)
Changed paths:
M partials/profile.html
M partials/sources.html
M partials/texts.html
M partials/translations.html
Log Message:
-----------
collapse the toolbars when the navbar collapses
Commit: ec2217f4ed7b2d9578bca543a3eebc8bf911cbc4
https://github.com/opensiddur/opensiddur-client/commit/ec2217f4ed7b2d9578bca543a3eebc8bf911cbc4
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-16 (Tue, 16 Sep 2014)
Changed paths:
M README.md
Log Message:
-----------
Merge branch 'master' of github.com:opensiddur/opensiddur-client
Commit: 07f97251598595144e36c61ecf232f1fcf801a72
https://github.com/opensiddur/opensiddur-client/commit/07f97251598595144e36c61ecf232f1fcf801a72
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-16 (Tue, 16 Sep 2014)
Changed paths:
M README.md
M css/app.css
M expath-pkg.xml
M index.html
M js/app.js
M js/controllers/TextsCtrl.js
A js/directives/osIdList.html
A js/directives/osIdList.js
A js/directives/osInsertInternalLinkDialog.html
A js/directives/osInsertInternalLinkDialog.js
A js/directives/osInsertLinkDialog.html
A js/directives/osInsertLinkDialog.js
A js/directives/osTranscriptionWindow.html
A js/directives/osTranscriptionWindow.js
M js/services/RestApi.js
M js/services/XsltService.js
M partials/about.html
M partials/profile.html
M partials/sources.html
M partials/texts.html
M partials/translations.html
A xsl/ExtractTranscriptionLinks.xsl
A xsl/ListXmlId.xsl
M xsl/sourceformtemplate.xsl
Log Message:
-----------
resolve merge conflict
Compare: https://github.com/opensiddur/opensiddur-client/compare/8f8884f6b3fa...07f972515985
Home: https://github.com/opensiddur/opensiddur-client
Commit: cc00c95848698d0b6e4a358315c2d36112492701
https://github.com/opensiddur/opensiddur-client/commit/cc00c95848698d0b6e4a358315c2d36112492701
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-08-10 (Sun, 10 Aug 2014)
Log Message:
-----------
Merge tag 'client-v0.0.5' into develop
Tag for client v0.0.5
Commit: f9a40be57bfceb7b1728533b807da9e9e3f71a3f
https://github.com/opensiddur/opensiddur-client/commit/f9a40be57bfceb7b1728533b807da9e9e3f71a3f
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-08-20 (Wed, 20 Aug 2014)
Changed paths:
M templates/conditionals.xml
M templates/linkage.xml
M templates/original.xml
Log Message:
-----------
remove @status in templates
Commit: 49de3e3933584446cd7757773e39ab0999d7e429
https://github.com/opensiddur/opensiddur-client/commit/49de3e3933584446cd7757773e39ab0999d7e429
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-08-20 (Wed, 20 Aug 2014)
Changed paths:
M expath-pkg.xml
Log Message:
-----------
bump min required dependency version
Commit: 2d39f78ca9151d5f4ef0cd66b4032505dc58f292
https://github.com/opensiddur/opensiddur-client/commit/2d39f78ca9151d5f4ef0cd66b4032505dc58f292
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-08-20 (Wed, 20 Aug 2014)
Changed paths:
M expath-pkg.xml
M templates/conditionals.xml
M templates/linkage.xml
M templates/original.xml
Log Message:
-----------
Merge branch 'feature/templates-no-status' into develop
Commit: aa684aeda496dbbe2eff3f8cec48d99ddd58c790
https://github.com/opensiddur/opensiddur-client/commit/aa684aeda496dbbe2eff3f8cec48d99ddd58c790
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-08-23 (Sat, 23 Aug 2014)
Changed paths:
M index.html
M js/app.js
M js/controllers/TextsCtrl.js
M js/services/RestApi.js
A templates/annotations.xml
Log Message:
-----------
annotation support added to texts partial
Commit: 80a6aed2eacfe530442e90c2d3be9e1e7faeb282
https://github.com/opensiddur/opensiddur-client/commit/80a6aed2eacfe530442e90c2d3be9e1e7faeb282
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-08-27 (Wed, 27 Aug 2014)
Changed paths:
M templates/annotations.xml
M templates/conditionals.xml
M templates/linkage.xml
M templates/original.xml
Log Message:
-----------
templates for sourceDesc schema change
Commit: 8d0343c4db8bd7b2fdb430f038a189030e6a2646
https://github.com/opensiddur/opensiddur-client/commit/8d0343c4db8bd7b2fdb430f038a189030e6a2646
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-08-31 (Sun, 31 Aug 2014)
Changed paths:
M js/bower_components/angular-ui-codemirror/.bower.json
M js/bower_components/angular-ui-codemirror/bower.json
M js/bower_components/angular-ui-codemirror/ui-codemirror.js
M js/bower_components/angular-ui-codemirror/ui-codemirror.min.js
Log Message:
-----------
update angular-ui-codemirror
Commit: 377e7ba400f12abb8e6bc9eb0de76b01b1f7a6f6
https://github.com/opensiddur/opensiddur-client/commit/377e7ba400f12abb8e6bc9eb0de76b01b1f7a6f6
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-08-31 (Sun, 31 Aug 2014)
Changed paths:
M index.html
M js/controllers/TextsCtrl.js
A js/directives/osNewDialog.html
A js/directives/osNewDialog.js
M js/services/XsltService.js
A js/vkbeautify/vkbeautify.js
M partials/texts.html
R templates/annotations.xml
A templates/annotations.xsl
R templates/conditionals.xml
A templates/conditionals.xsl
R templates/original.xml
A templates/original.xsl
Log Message:
-----------
use a dialog box to fill in the initial required values in the editor
Commit: 06bf850f1ff01ba96546a9d693817e6c492f32f4
https://github.com/opensiddur/opensiddur-client/commit/06bf850f1ff01ba96546a9d693817e6c492f32f4
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-08-31 (Sun, 31 Aug 2014)
Changed paths:
M js/directives/osNewDialog.html
Log Message:
-----------
form validation for the OK button
Commit: 965e846630c813da837a1c1c577557e22a0ac84f
https://github.com/opensiddur/opensiddur-client/commit/965e846630c813da837a1c1c577557e22a0ac84f
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-08-31 (Sun, 31 Aug 2014)
Changed paths:
A js/sarissa/META-INF/MANIFEST.MF
A js/sarissa/META-INF/maven/gr.abiss.js/sarissa/pom.properties
A js/sarissa/META-INF/maven/gr.abiss.js/sarissa/pom.xml
A js/sarissa/compressed-js-header.txt
A js/sarissa/gr/abiss/js/sarissa/sarissa-compressed.js
A js/sarissa/gr/abiss/js/sarissa/sarissa-mediawiki-compressed.js
A js/sarissa/gr/abiss/js/sarissa/sarissa-mediawiki.js
A js/sarissa/gr/abiss/js/sarissa/sarissa-table-utils-compressed.js
A js/sarissa/gr/abiss/js/sarissa/sarissa-table-utils.js
A js/sarissa/gr/abiss/js/sarissa/sarissa.js
A js/sarissa/gr/abiss/js/sarissa/sarissa_ieemu_xpath-compressed.js
A js/sarissa/gr/abiss/js/sarissa/sarissa_ieemu_xpath.js
Log Message:
-----------
bring back sarissa for XSLT 1.0 xsl:output
Commit: 02ff02f9e2d4b9974ed36c8930a6c6c65055acd5
https://github.com/opensiddur/opensiddur-client/commit/02ff02f9e2d4b9974ed36c8930a6c6c65055acd5
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-08-31 (Sun, 31 Aug 2014)
Changed paths:
M index.html
M js/controllers/TextsCtrl.js
M js/services/XsltService.js
R js/vkbeautify/vkbeautify.js
Log Message:
-----------
use XSLT 1.0 to ident the XML
Commit: 3b03dbf63dd80fb82c3058a611f8105fdd8590be
https://github.com/opensiddur/opensiddur-client/commit/3b03dbf63dd80fb82c3058a611f8105fdd8590be
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-08-31 (Sun, 31 Aug 2014)
Changed paths:
M js/controllers/TextsCtrl.js
Log Message:
-----------
add a load timeout to all loads
Commit: e49d46ea9c26db15d1016dade8d5aa1ea87ac84f
https://github.com/opensiddur/opensiddur-client/commit/e49d46ea9c26db15d1016dade8d5aa1ea87ac84f
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-01 (Mon, 01 Sep 2014)
Changed paths:
M index.html
Log Message:
-----------
remove sarissa again
Commit: df39cac3c935c8478eca676dd5a606e30a3609e4
https://github.com/opensiddur/opensiddur-client/commit/df39cac3c935c8478eca676dd5a606e30a3609e4
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-01 (Mon, 01 Sep 2014)
Changed paths:
M js/services/XsltService.js
A js/vkbeautify/vkbeautify.js
Log Message:
-----------
use vkbeautify for indent
Commit: 9463159f8e91cc8a8e590bd5a24ea55f75d9766b
https://github.com/opensiddur/opensiddur-client/commit/9463159f8e91cc8a8e590bd5a24ea55f75d9766b
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-01 (Mon, 01 Sep 2014)
Changed paths:
M js/controllers/TextsCtrl.js
M xsl/OriginalBeforeSave.xsl
Log Message:
-----------
no more new dialog on startup, fix indent issues in commit messages
Commit: a621f2a87453a0105b683099a33989c57d540a43
https://github.com/opensiddur/opensiddur-client/commit/a621f2a87453a0105b683099a33989c57d540a43
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-01 (Mon, 01 Sep 2014)
Changed paths:
M css/app.css
M partials/texts.html
Log Message:
-----------
make the beginning message bigger
Commit: 7ff68638b73ae0711fb2440e416173567d2b8ef2
https://github.com/opensiddur/opensiddur-client/commit/7ff68638b73ae0711fb2440e416173567d2b8ef2
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-01 (Mon, 01 Sep 2014)
Changed paths:
M css/app.css
M index.html
M js/bower_components/angular-ui-codemirror/.bower.json
M js/bower_components/angular-ui-codemirror/bower.json
M js/bower_components/angular-ui-codemirror/ui-codemirror.js
M js/bower_components/angular-ui-codemirror/ui-codemirror.min.js
M js/controllers/TextsCtrl.js
A js/directives/osNewDialog.html
A js/directives/osNewDialog.js
A js/sarissa/META-INF/MANIFEST.MF
A js/sarissa/META-INF/maven/gr.abiss.js/sarissa/pom.properties
A js/sarissa/META-INF/maven/gr.abiss.js/sarissa/pom.xml
A js/sarissa/compressed-js-header.txt
A js/sarissa/gr/abiss/js/sarissa/sarissa-compressed.js
A js/sarissa/gr/abiss/js/sarissa/sarissa-mediawiki-compressed.js
A js/sarissa/gr/abiss/js/sarissa/sarissa-mediawiki.js
A js/sarissa/gr/abiss/js/sarissa/sarissa-table-utils-compressed.js
A js/sarissa/gr/abiss/js/sarissa/sarissa-table-utils.js
A js/sarissa/gr/abiss/js/sarissa/sarissa.js
A js/sarissa/gr/abiss/js/sarissa/sarissa_ieemu_xpath-compressed.js
A js/sarissa/gr/abiss/js/sarissa/sarissa_ieemu_xpath.js
M js/services/XsltService.js
A js/vkbeautify/vkbeautify.js
M partials/texts.html
R templates/annotations.xml
A templates/annotations.xsl
R templates/conditionals.xml
A templates/conditionals.xsl
R templates/original.xml
A templates/original.xsl
M xsl/OriginalBeforeSave.xsl
Log Message:
-----------
Merge branch 'feature/new-dialog' into develop
Commit: 3818b2c455fca957f8cdd29304ec08c079dcf2e8
https://github.com/opensiddur/opensiddur-client/commit/3818b2c455fca957f8cdd29304ec08c079dcf2e8
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-02 (Tue, 02 Sep 2014)
Changed paths:
M xsl/OriginalBeforeSave.xsl
Log Message:
-----------
trim whitespace in tei:idno
Commit: 7b5d81116bf81e91ebd91661880d965b0469d425
https://github.com/opensiddur/opensiddur-client/commit/7b5d81116bf81e91ebd91661880d965b0469d425
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-02 (Tue, 02 Sep 2014)
Changed paths:
M expath-pkg.xml
M partials/about.html
Log Message:
-----------
bump the version number
Commit: 84e02353494751b1add986f89c2cd560cdfc31e0
https://github.com/opensiddur/opensiddur-client/commit/84e02353494751b1add986f89c2cd560cdfc31e0
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-03 (Wed, 03 Sep 2014)
Changed paths:
M css/app.css
M expath-pkg.xml
M index.html
M js/app.js
M js/bower_components/angular-ui-codemirror/.bower.json
M js/bower_components/angular-ui-codemirror/bower.json
M js/bower_components/angular-ui-codemirror/ui-codemirror.js
M js/bower_components/angular-ui-codemirror/ui-codemirror.min.js
M js/controllers/TextsCtrl.js
A js/directives/osNewDialog.html
A js/directives/osNewDialog.js
A js/sarissa/META-INF/MANIFEST.MF
A js/sarissa/META-INF/maven/gr.abiss.js/sarissa/pom.properties
A js/sarissa/META-INF/maven/gr.abiss.js/sarissa/pom.xml
A js/sarissa/compressed-js-header.txt
A js/sarissa/gr/abiss/js/sarissa/sarissa-compressed.js
A js/sarissa/gr/abiss/js/sarissa/sarissa-mediawiki-compressed.js
A js/sarissa/gr/abiss/js/sarissa/sarissa-mediawiki.js
A js/sarissa/gr/abiss/js/sarissa/sarissa-table-utils-compressed.js
A js/sarissa/gr/abiss/js/sarissa/sarissa-table-utils.js
A js/sarissa/gr/abiss/js/sarissa/sarissa.js
A js/sarissa/gr/abiss/js/sarissa/sarissa_ieemu_xpath-compressed.js
A js/sarissa/gr/abiss/js/sarissa/sarissa_ieemu_xpath.js
M js/services/RestApi.js
M js/services/XsltService.js
A js/vkbeautify/vkbeautify.js
M partials/about.html
M partials/texts.html
A templates/annotations.xsl
R templates/conditionals.xml
A templates/conditionals.xsl
M templates/linkage.xml
R templates/original.xml
A templates/original.xsl
M xsl/OriginalBeforeSave.xsl
Log Message:
-----------
Merge branch 'release/client-v0.0.6'
Commit: 7ee58c06e132b26fb49551fd554fa1e07df84f23
https://github.com/opensiddur/opensiddur-client/commit/7ee58c06e132b26fb49551fd554fa1e07df84f23
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-03 (Wed, 03 Sep 2014)
Changed paths:
M expath-pkg.xml
M partials/about.html
Log Message:
-----------
Merge tag 'client-vclient-v0.0.6' into develop
Tag client v0.0.6
Commit: 146dc98e8dbc9a30710dae5ef3901040ede8c2a9
https://github.com/opensiddur/opensiddur-client/commit/146dc98e8dbc9a30710dae5ef3901040ede8c2a9
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-06 (Sat, 06 Sep 2014)
Log Message:
-----------
Merge branch 'master' into develop
Commit: 2c234569541fa89fc122b39933b7ccd53ba8109d
https://github.com/opensiddur/opensiddur-client/commit/2c234569541fa89fc122b39933b7ccd53ba8109d
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-06 (Sat, 06 Sep 2014)
Changed paths:
M README.md
Log Message:
-----------
update readme to reflect preference for feature branches
Commit: a74cf9925d11f4a9c60aa9e21376d5e747624727
https://github.com/opensiddur/opensiddur-client/commit/a74cf9925d11f4a9c60aa9e21376d5e747624727
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-07 (Sun, 07 Sep 2014)
Changed paths:
M js/controllers/TextsCtrl.js
Log Message:
-----------
reset cursor position after running XSLT
Commit: 986f3f783907a4023c524dc1f4cd48773507b435
https://github.com/opensiddur/opensiddur-client/commit/986f3f783907a4023c524dc1f4cd48773507b435
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-07 (Sun, 07 Sep 2014)
Changed paths:
M partials/texts.html
Log Message:
-----------
move the XML helper to a menu
Commit: 9dab18b9d7dd6f90d664671e0cd6ed1c27041ac1
https://github.com/opensiddur/opensiddur-client/commit/9dab18b9d7dd6f90d664671e0cd6ed1c27041ac1
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-07 (Sun, 07 Sep 2014)
Changed paths:
M partials/texts.html
Log Message:
-----------
do not show sharing status when no file is loaded
Commit: c1de0a54d0df7156b6eabdf57a91268839b69992
https://github.com/opensiddur/opensiddur-client/commit/c1de0a54d0df7156b6eabdf57a91268839b69992
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-07 (Sun, 07 Sep 2014)
Changed paths:
M index.html
M js/controllers/TextsCtrl.js
A js/directives/osInsertLinkDialog.html
A js/directives/osInsertLinkDialog.js
M partials/texts.html
Log Message:
-----------
insert link moved to dialog, remove the helper tabs
Commit: 69a386c7c07141fd7a2c8daaee600af054524c3a
https://github.com/opensiddur/opensiddur-client/commit/69a386c7c07141fd7a2c8daaee600af054524c3a
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-11 (Thu, 11 Sep 2014)
Changed paths:
M index.html
M js/controllers/TextsCtrl.js
A js/directives/osIdList.html
A js/directives/osIdList.js
A js/directives/osInsertInternalLinkDialog.html
A js/directives/osInsertInternalLinkDialog.js
M js/services/XsltService.js
M partials/texts.html
A xsl/ListXmlId.xsl
Log Message:
-----------
id list and internal id insertion dialog
Commit: ea7567b77a8ea670344cb13acb788b45a6f81327
https://github.com/opensiddur/opensiddur-client/commit/ea7567b77a8ea670344cb13acb788b45a6f81327
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-13 (Sat, 13 Sep 2014)
Changed paths:
M js/directives/osIdList.html
M js/directives/osIdList.js
Log Message:
-----------
range index checking
Commit: 85d93899ab1b9897706ea5222f5162448b797a42
https://github.com/opensiddur/opensiddur-client/commit/85d93899ab1b9897706ea5222f5162448b797a42
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-13 (Sat, 13 Sep 2014)
Changed paths:
M xsl/ListXmlId.xsl
Log Message:
-----------
make sure that all text strings are a single text node
Commit: 5b48e91693b9962244ed948daddcbbf5a1b3b1c2
https://github.com/opensiddur/opensiddur-client/commit/5b48e91693b9962244ed948daddcbbf5a1b3b1c2
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-13 (Sat, 13 Sep 2014)
Changed paths:
M js/services/RestApi.js
Log Message:
-----------
add a quasi-XML-as-string endpoint
Commit: 5ecd7d4e643f018990c8cd63cc5a72b8d464e748
https://github.com/opensiddur/opensiddur-client/commit/5ecd7d4e643f018990c8cd63cc5a72b8d464e748
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-13 (Sat, 13 Sep 2014)
Changed paths:
M js/directives/osInsertLinkDialog.html
M js/directives/osInsertLinkDialog.js
Log Message:
-----------
insert external link dialog
Commit: 8b55e27a520438b3c018ffeb661dd48202bf9e94
https://github.com/opensiddur/opensiddur-client/commit/8b55e27a520438b3c018ffeb661dd48202bf9e94
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-13 (Sat, 13 Sep 2014)
Changed paths:
M index.html
M js/controllers/TextsCtrl.js
A js/directives/osIdList.html
A js/directives/osIdList.js
A js/directives/osInsertInternalLinkDialog.html
A js/directives/osInsertInternalLinkDialog.js
A js/directives/osInsertLinkDialog.html
A js/directives/osInsertLinkDialog.js
M js/services/RestApi.js
M js/services/XsltService.js
M partials/texts.html
A xsl/ListXmlId.xsl
Log Message:
-----------
Merge branch 'feature/remove-helper-tabs' into develop, closes #14
Commit: 8d85655e6c4cce5484a66666a1570b2ee70069f2
https://github.com/opensiddur/opensiddur-client/commit/8d85655e6c4cce5484a66666a1570b2ee70069f2
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-14 (Sun, 14 Sep 2014)
Changed paths:
M partials/sources.html
Log Message:
-----------
fix typo-too many brackets
Commit: a7c4cf0e4e805abe5bcaae1071fd3c8f5a2b7352
https://github.com/opensiddur/opensiddur-client/commit/a7c4cf0e4e805abe5bcaae1071fd3c8f5a2b7352
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-15 (Mon, 15 Sep 2014)
Changed paths:
M xsl/sourceformtemplate.xsl
Log Message:
-----------
bugfix: transcription links were not being preserved
Commit: 0468dd1de580dc0629062cfab6a9844757ed93a4
https://github.com/opensiddur/opensiddur-client/commit/0468dd1de580dc0629062cfab6a9844757ed93a4
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-16 (Tue, 16 Sep 2014)
Changed paths:
M css/app.css
M index.html
M js/app.js
M js/controllers/TextsCtrl.js
A js/directives/osTranscriptionWindow.html
A js/directives/osTranscriptionWindow.js
M js/services/RestApi.js
M js/services/XsltService.js
M partials/texts.html
A xsl/ExtractTranscriptionLinks.xsl
Log Message:
-----------
basic transcription window (still needs a lot of styling work)
Commit: 5cf47c1e8eea7c7c15437b717db1c753d5da7fc9
https://github.com/opensiddur/opensiddur-client/commit/5cf47c1e8eea7c7c15437b717db1c753d5da7fc9
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-16 (Tue, 16 Sep 2014)
Changed paths:
M css/app.css
M index.html
M js/app.js
M js/controllers/TextsCtrl.js
A js/directives/osTranscriptionWindow.html
A js/directives/osTranscriptionWindow.js
M js/services/RestApi.js
M js/services/XsltService.js
M partials/sources.html
M partials/texts.html
A xsl/ExtractTranscriptionLinks.xsl
M xsl/sourceformtemplate.xsl
Log Message:
-----------
Merge branch 'feature/transcription-window' into develop, closes #13
Commit: d4795e3a4af5f1579d04bb2a306fe836adc692a1
https://github.com/opensiddur/opensiddur-client/commit/d4795e3a4af5f1579d04bb2a306fe836adc692a1
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-16 (Tue, 16 Sep 2014)
Changed paths:
M expath-pkg.xml
M partials/about.html
Log Message:
-----------
bump the version number
Commit: cec2391b90251f9a16470523a934443156a39593
https://github.com/opensiddur/opensiddur-client/commit/cec2391b90251f9a16470523a934443156a39593
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-16 (Tue, 16 Sep 2014)
Changed paths:
M partials/profile.html
M partials/sources.html
M partials/texts.html
M partials/translations.html
Log Message:
-----------
collapse the toolbars when the navbar collapses
Commit: ec2217f4ed7b2d9578bca543a3eebc8bf911cbc4
https://github.com/opensiddur/opensiddur-client/commit/ec2217f4ed7b2d9578bca543a3eebc8bf911cbc4
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-16 (Tue, 16 Sep 2014)
Changed paths:
M README.md
Log Message:
-----------
Merge branch 'master' of github.com:opensiddur/opensiddur-client
Commit: 07f97251598595144e36c61ecf232f1fcf801a72
https://github.com/opensiddur/opensiddur-client/commit/07f97251598595144e36c61ecf232f1fcf801a72
Author: Efraim Feinstein <efraim.f...@gmail.com>
Date: 2014-09-16 (Tue, 16 Sep 2014)
Changed paths:
M README.md
M css/app.css
M expath-pkg.xml
M index.html
M js/app.js
M js/controllers/TextsCtrl.js
A js/directives/osIdList.html
A js/directives/osIdList.js
A js/directives/osInsertInternalLinkDialog.html
A js/directives/osInsertInternalLinkDialog.js
A js/directives/osInsertLinkDialog.html
A js/directives/osInsertLinkDialog.js
A js/directives/osTranscriptionWindow.html
A js/directives/osTranscriptionWindow.js
M js/services/RestApi.js
M js/services/XsltService.js
M partials/about.html
M partials/profile.html
M partials/sources.html
M partials/texts.html
M partials/translations.html
A xsl/ExtractTranscriptionLinks.xsl
A xsl/ListXmlId.xsl
M xsl/sourceformtemplate.xsl
Log Message:
-----------
resolve merge conflict
Compare: https://github.com/opensiddur/opensiddur-client/compare/8f8884f6b3fa...07f972515985
Reply all
Reply to author
Forward
0 new messages