John McLear
|
711dee8f6b
|
Merge pull request #821 from marcelklehr/fix-contributor-api-methods
Fix contributor api methods
|
2012-06-27 12:12:41 -07:00 |
|
Marcel Klehr
|
93b50d4a29
|
Some fixes to the contributor API methods
Mostly these are coding style adjustments
|
2012-06-27 21:02:41 +02:00 |
|
John McLear
|
a717c11ab3
|
Merge pull request #819 from marcelklehr/contributor-api-methods
Contributor api methods (listPadsOfAuthor & listAuthorsOfPad )
|
2012-06-27 11:31:25 -07:00 |
|
Mark Holmquist
|
ab0d3c87cb
|
Add in getLastEdited API call
This new HTTP API call, getLastEdited, will return the time of the
last revision, in UNIX timestamp format.
|
2012-06-27 10:05:17 -07:00 |
|
Marcel Klehr
|
6f9d7a5db7
|
Add 2 new APIs: listPadsOfAuthor and listAuthorsOfPad
Return all pads that a given author has contributed to (not just
created) and return all authors who has contributed to a given pad.
|
2012-06-27 18:23:17 +02:00 |
|
Egil Moeller
|
15a7d24450
|
Merge branch 'master' into timeslider-realtimeupdate+readonly-pads
Conflicts:
src/node/handler/PadMessageHandler.js
src/static/css/pad.css
src/templates/pad.html
|
2012-05-29 21:26:12 +02:00 |
|
Egil Moeller
|
480d0b8e25
|
ReadOnly pad handling
|
2012-04-23 16:18:14 +02:00 |
|
Patrick Rauscher
|
0e7cb78ec2
|
Allow disabling Passwords by setting them to an empty string
|
2012-04-07 13:41:00 +00:00 |
|
John McLear
|
9ecd864ac6
|
Merge pull request #557 from redhog/master
Templating system built on top of EJS and plugin installer
|
2012-04-02 12:42:38 -07:00 |
|
Egil Moeller
|
33c53e61c2
|
Merge branch 'johnyma22'
Conflicts:
node/utils/Minify.js
src/static/js/pad.js
src/static/js/pad_docbar.js
src/static/js/pad_editbar.js
src/static/js/pad_savedrevs.js
static/css/timeslider.css
static/pad.html
|
2012-04-01 13:27:38 +02:00 |
|
John McLear
|
bc76913a6d
|
fix pitas fix
|
2012-03-31 18:16:31 +01:00 |
|
Matthias Bartelmeß
|
8eb43a3ebf
|
replaceing AttributePoolFactory by AttributePool
|
2012-03-18 09:05:46 +01:00 |
|
Egil Moeller
|
ce5d2d8685
|
Merge branch 'pita'
Resolved conflicts:
.gitignore
src/static/js/ace.js
src/static/js/ace2_inner.js
src/static/js/broadcast.js
src/static/js/domline.js
src/static/pad.html
src/static/timeslider.html
Ignored conflicts (please merge manually later):
node/server.js
src/node/utils/Minify.js
|
2012-03-02 22:00:20 +01:00 |
|
Egil Moeller
|
a894fcd4f9
|
Removed CommonCode entierly
|
2012-02-28 21:19:10 +01:00 |
|
Egil Moeller
|
763361a7c9
|
First stab at getting client side require(plugin/..) to work from within etherpad
|
2012-02-26 17:48:17 +01:00 |
|
Egil Moeller
|
1239ce7f28
|
The Big Renaming - etherpad is now an NPM module
|
2012-02-26 13:07:51 +01:00 |
|