##// END OF EJS Templates
svn: Set authentication realm to None in apache config template...
svn: Set authentication realm to None in apache config template Inside of the vcs middlewares we are using the empty string as authentication realm for HTTP basic auth. Because we are proxy the requestst between svn client and mod_dav_svn wen have to use the same authentication relam in mod_dav_svn and vcs middleware. Otherwise auth is impossible because of mismatching realms.

File last commit:

r347:99b6d323 default
r573:7ad65159 default
Show More
mergerly.css
49 lines | 1.8 KiB | text/css | CssLexer
project: added all source files and assets
r1 /* required */
.mergely-column textarea { width: 80px; height: 200px; }
.mergely-column { float: left; }
.mergely-margin { float: left; }
.mergely-canvas { float: left; width: 28px; }
/* resizeable */
.mergely-resizer { width: 100%; height: 100%; }
/* style configuration */
.mergely-column { border: 1px solid #ccc; }
.mergely-active { border: 1px solid #a3d1ff; }
js: updated mergely to 3.4.1
r347 .mergely.a,.mergely.d,.mergely.c { color: #000; }
project: added all source files and assets
r1
js: updated mergely to 3.4.1
r347 .mergely.a.rhs.start { border-top: 1px solid #a3d1ff; }
.mergely.a.lhs.start.end,
.mergely.a.rhs.end { border-bottom: 1px solid #a3d1ff; }
.mergely.a.rhs { background-color: #ddeeff; }
.mergely.a.lhs.start.end.first { border-bottom: 0; border-top: 1px solid #a3d1ff; }
.mergely.d.lhs { background-color: #ffe9e9; }
project: added all source files and assets
r1 .mergely.d.lhs.end,
js: updated mergely to 3.4.1
r347 .mergely.d.rhs.start.end { border-bottom: 1px solid #f8e8e8; }
.mergely.d.rhs.start.end.first { border-bottom: 0; border-top: 1px solid #f8e8e8; }
.mergely.d.lhs.start { border-top: 1px solid #f8e8e8; }
project: added all source files and assets
r1
.mergely.c.lhs,
.mergely.c.rhs { background-color: #fafafa; }
.mergely.c.lhs.start,
.mergely.c.rhs.start { border-top: 1px solid #a3a3a3; }
.mergely.c.lhs.end,
.mergely.c.rhs.end { border-bottom: 1px solid #a3a3a3; }
js: updated mergely to 3.4.1
r347 .mergely.ch.a.rhs { background-color: #ddeeff; }
.mergely.ch.d.lhs { background-color: #ffe9e9; text-decoration: line-through; color: red !important; }
project: added all source files and assets
r1
.mergely-margin #compare-lhs-margin,
.mergely-margin #compare-rhs-margin {
cursor: pointer
}
js: updated mergely to 3.4.1
r347
.mergely.current.start { border-top: 1px solid #000 !important; }
.mergely.current.end { border-bottom: 1px solid #000 !important; }
.mergely.current.lhs.a.start.end,
.mergely.current.rhs.d.start.end { border-top: 0 !important; }
.mergely.current.CodeMirror-linenumber { color: #F9F9F9; font-weight: bold; background-color: #777; }
.CodeMirror-linenumber { cursor: pointer; }
.CodeMirror-code { color: #717171; }