Branch: refs/heads/develop
Commit: 84e02353494751b1add986f89c2cd560cdfc31e0
https://github.com/opensiddur/opensiddur-client/commit/84e02353494751b1add986f89c2cd560cdfc31e0
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: 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
Compare:
https://github.com/opensiddur/opensiddur-client/compare/7ff68638b73a...2c234569541f