server
/
etherpad
master
fork of etherpad for spline
spline
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
etherpad
/
src
Commit message (
Expand
)
Author
Age
Files
Lines
*
Merge remote branch 'upstream/master'
Alexander Sulfrian
2010-06-08
339
-0
/
+49307
|
\
|
*
Change executable bit of two files to much the intent of the files.
Mikko Rantalainen
2010-05-06
1
-0
/
+0
|
*
Merge commit 'mainline/master'
Simon B @piratpartiet
2010-04-21
57
-1100
/
+1514
|
|
\
|
|
*
Home & pad/url search buttons
Egil Moeller
2010-04-20
5
-4
/
+28
|
|
*
Cleaned up the docbar hook code a bit
Egil Moeller
2010-04-20
1
-1
/
+1
|
|
*
Bugfixes to the docbar css for buttons w/o image
Egil Moeller
2010-04-20
1
-9
/
+9
|
|
*
Merge branch 'master' of git://github.com/shomeya/pad
Egil Moeller
2010-04-17
4
-10
/
+15
|
|
|
\
|
|
|
*
Merge commit 'cd2bbd0e602244403ca379f9f4d9d15bbde545a7'
Michael Prasuhn
2010-04-16
2
-2
/
+2
|
|
|
|
\
|
|
|
*
\
Merge branch 'master' of http://github.com/redhog/pad
Peter Martischka
2010-04-15
8
-230
/
+477
|
|
|
|
\
\
|
|
|
*
\
\
Merge branch 'master' of http://github.com/ether/pad
Peter Martischka
2010-04-15
2
-8
/
+13
|
|
|
|
\
\
\
|
|
*
|
|
|
|
Fixed so that parts of a URL query can be modified w/o affecting the rest of ...
Egil Moeller
2010-04-17
5
-11
/
+37
|
|
|
|
_
|
/
/
|
|
|
/
|
|
|
|
|
*
|
|
|
Git the urlIndexer to nearly work (the links for tags / queries are all wrong)
Egil Moeller
2010-04-14
5
-25
/
+220
|
|
*
|
|
|
Bugfix for inheritance and override
Egil Moeller
2010-04-14
1
-1
/
+2
|
|
*
|
|
|
Added inheritance between templates for different plugins
Egil Moeller
2010-04-13
1
-5
/
+15
|
|
*
|
|
|
Moved some more stuff to the model
Egil Moeller
2010-04-12
2
-19
/
+25
|
|
*
|
|
|
Moved some more stuff to the model
Egil Moeller
2010-04-12
2
-18
/
+30
|
|
*
|
|
|
Separated the twitterStyleTags model stuff out in a separate file
Egil Moeller
2010-04-12
3
-170
/
+193
|
|
|
/
/
/
|
|
*
|
|
Merge branch 'master' of git://github.com/redhog/pad
Peter Martischka
2010-04-11
13
-279
/
+254
|
|
|
\
\
\
|
|
|
*
|
|
Removed some slow debug printing
Egil Moeller
2010-04-11
2
-4
/
+4
|
|
|
*
|
|
Added an URL indexer, it currently only greps out URLs from pads and stores t...
Egil Moeller
2010-04-11
2
-0
/
+71
|
|
|
*
|
|
CSS bugfix
Egil Moeller
2010-04-11
1
-1
/
+1
|
|
|
*
|
|
Made twitterStyleTags use page.ejs
Egil Moeller
2010-04-11
2
-120
/
+73
|
|
|
*
|
|
Made the plugin manager use page.ejs
Egil Moeller
2010-04-10
2
-118
/
+52
|
|
|
*
|
|
Generalized the page.ejs a bit more so that it can be used by all pages for real
Egil Moeller
2010-04-10
5
-38
/
+55
|
|
*
|
|
|
Fixed a a serious Security Bug, HTML injection!
Peter Martischka
2010-04-11
1
-1
/
+1
|
|
*
|
|
|
Fixed a little design bug of the save button
Peter Martischka
2010-04-10
1
-2
/
+2
|
|
*
|
|
|
Merge branch 'master' of http://github.com/redhog/pad
Peter Martischka
2010-04-10
39
-589
/
+723
|
|
|
\
|
|
|
|
|
|
*
|
|
Oups, wrong path used before
Egil Moeller
2010-04-10
35
-2
/
+2
|
|
|
*
|
|
Added theme support
Egil Moeller
2010-04-10
35
-2
/
+6
|
|
|
*
|
|
Template fallback from plugin to /templates
Egil Moeller
2010-04-10
1
-3
/
+16
|
|
|
*
|
|
Separated the padpage into a common part (page.ejs) and an inheriting part ad...
Egil Moeller
2010-04-10
3
-530
/
+594
|
|
|
*
|
|
Added example usage of template.use/define/inherit
Egil Moeller
2010-04-09
3
-10
/
+38
|
|
|
*
|
|
Added a default templatye.use('body') at the end of each template
Egil Moeller
2010-04-09
1
-1
/
+2
|
|
|
*
|
|
Added template.use, template.define and template.inherit to templates
Egil Moeller
2010-04-09
1
-0
/
+24
|
|
*
|
|
|
Revert "Can't really use SSL when checking for it always returns false, right?"
Peter Martischka
2010-04-09
1
-0
/
+8
|
*
|
|
|
|
Remove unused file
Simon Bohlin
2010-04-21
1
-1984
/
+0
|
*
|
|
|
|
Drive-by optimization. Motivation: every keypress invokes callHooks()
Simon Bohlin
2010-04-21
1
-4
/
+5
|
*
|
|
|
|
Add code origin comments
Simon Bohlin
2010-04-21
1
-0
/
+3
|
|
|
_
|
_
|
/
|
|
/
|
|
|
|
*
|
|
|
Replacing 'etherpad.com' with 'main site' in some code comments
Simon Bohlin
2010-04-15
2
-2
/
+2
|
|
|
_
|
/
|
|
/
|
|
|
*
|
|
Add clarifying comments
Simon Bohlin
2010-04-14
1
-8
/
+12
|
*
|
|
Add forgotten static file robots.txt
Simon Bohlin
2010-04-14
1
-0
/
+1
|
|
/
/
|
*
|
Another "unneeded" file that's actually needed...
Jeff Mitchell
2010-04-08
1
-0
/
+28
|
*
|
Remove unneeded parts of the configuration block, since no need to check lice...
Jeff Mitchell
2010-04-08
3
-46
/
+3
|
*
|
Can't really use SSL when checking for it always returns false, right?
Jeff Mitchell
2010-04-08
1
-8
/
+0
|
*
|
Add back pro-config.js, which was mistakenly thought of as "unneeded" -- not ...
Jeff Mitchell
2010-04-08
1
-0
/
+55
|
|
/
|
*
Merge branch 'jefferai' of git://github.com/jefferai/pad
Egil Moeller
2010-04-08
1
-1
/
+1
|
|
\
|
|
*
Fix typo in previous conversion from SUPERDOMAINS
Jeff Mitchell
2010-04-08
1
-1
/
+1
|
*
|
Revert "Fix typo in previous conversion from SUPERDOMAINS"
Egil Moeller
2010-04-08
1
-1
/
+1
|
*
|
Fix typo in previous conversion from SUPERDOMAINS
Jeff Mitchell
2010-04-08
1
-1
/
+1
|
*
|
Merge branch 'jefferai' of git://github.com/jefferai/pad
Peter Martischka
2010-04-08
5
-13
/
+34
|
|
\
|
[next]