libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
3765 commits 2 branches 0 tags 24 MiB
Commit graph

3765 commits

This branch
This branch
All branches
Author SHA1 Message Date
John McLear
9d2f5e5cca Merge branch 'packaging' of github.com:ether/etherpad-lite into packaging 2013-11-24 02:53:14 +00:00
John McLear
09429be4c9 whoops 2013-11-24 02:52:55 +00:00
John McLear
bb40644856 ignore deb and create user 2013-11-24 02:52:03 +00:00
John McLear
61df1facd2 semi-working build script for deb packages 2013-11-24 02:42:50 +00:00
John McLear
8b821d42a2 Merge pull request #2004 from ether/fix/walking-caret 
Fix walking caret bug
 2013-11-22 08:28:07 -08:00
Marcel Klehr
5d803a0523 Fix walking caret bug 
white-space css prop must be set to pre-wrap to keep trailing spaces
fixes #1766
 2013-11-22 17:18:30 +01:00
Siebrand Mazeland
117a4ab1a8 Localisation updates from http://translatewiki.net. 2013-11-21 06:39:40 +00:00
Siebrand Mazeland
106661712d Localisation updates from http://translatewiki.net. 2013-11-19 06:43:22 +00:00
Marcel Klehr
53bcbfcc07 Don't link to windows build from README 
better link to the website...
 2013-11-18 14:25:47 +01:00
John McLear
47efc1f8d5 Merge pull request #1996 from s1341/add_pad_copy 
add some documentation for move/copy
 2013-11-18 05:02:16 -08:00
s1341
5409cdaa3f add some documentation for move/copy 2013-11-18 14:38:44 +02:00
John McLear
571ef15f62 Merge pull request #1995 from s1341/add_pad_copy 
add pad copy/move API functions
 2013-11-18 03:43:03 -08:00
s1341
52a99eb9e5 fix bugs, add force option to overwrite destination 2013-11-18 08:25:46 +02:00
s1341
93fcab0461 change parameter names 2013-11-17 21:01:02 +02:00
s1341
29d8bb7716 add pad copy/move API functions 2013-11-17 17:02:44 +00:00
John McLear
ccd4300edc Merge pull request #1994 from ether/node11 
support node 0.11
 2013-11-14 14:47:24 -08:00
John McLear
1f68f07083 support node 0.11 2013-11-14 22:46:58 +00:00
Siebrand Mazeland
1ee7c7000f Localisation updates from http://translatewiki.net. 2013-11-12 13:44:57 +00:00
John McLear
fa4ebd602c Update installDeps.sh 2013-11-12 09:58:22 +00:00
John McLear
5c1daa33be Merge pull request #1990 from ether/run-path-available-in-ps-aux 
allow nix file process path to be visible in ps aux
 2013-11-10 10:30:45 -08:00
John McLear
932c9ae406 allow nix file process path to be visible in ps aux 2013-11-10 16:32:33 +00:00
Marcel Klehr
8e5af48f79 en.json: Add keyboard shortcuts for indent and outdent to translations 2013-11-08 15:18:23 +00:00
John McLear
3c4c0de38a Merge pull request #1985 from ldidry/fix/uncomplete-api-doc 
Forgot to bump the API version for API documentation
 2013-11-07 14:31:29 -08:00
Luc Didry
b769acaee0 Forgot to bump the API version 2013-11-07 23:28:07 +01:00
Luc Didry
4a9602cc57 Fix getRevisionChangeset API call making etherpad crash 2013-11-07 22:49:20 +01:00
John McLear
7e6e2501d5 Merge pull request #1983 from ldidry/fix/uncomplete-api-doc 
Fixed #1981 - uncomplete HTTP API documentation
 2013-11-07 13:48:17 -08:00
Luc Didry
5bccfdf060 Forgot a small chunck of documentation for getRevisionChangeset 2013-11-07 22:46:35 +01:00
Luc Didry
a4194efaf1 Fixed #1981 - uncomplete HTTP API documentation 2013-11-07 22:22:37 +01:00
Siebrand Mazeland
c9b80c6120 Localisation updates from http://translatewiki.net. 2013-11-04 16:04:11 +00:00
Marcel Klehr
68caa06eed Merge pull request #1974 from ether/fix/fix-list-all-pads 
Update padList correctly
 2013-11-02 04:28:01 -07:00
Marcel Klehr
8ab2442cc9 Update padList correctly 
fixes #1971
 2013-11-01 14:16:26 +01:00
Marcel Klehr
e72511349d Merge branch 'pr/1789' into develop 
Conflicts:
	.travis.yml
 2013-10-28 12:20:10 +01:00
Marcel Klehr
975eae350e Merge pull request #1963 from eyesonlyhack/allLinksTranslatingToHTTP 
Fix #1776 - All links regardless of protocol translate to http:// links
 2013-10-28 04:15:17 -07:00
Marcel Klehr
7b84e7308b Merge branch 'metrics' into develop 
Conflicts:
	src/node/handler/PadMessageHandler.js
 2013-10-28 12:11:25 +01:00
Marcel Klehr
5bce9bc336 Add docs for stats 2013-10-27 21:59:40 +01:00
Marcel Klehr
3ad4b1b837 stats: Add http500, memoryUsage, pendingEdits gauges 
and turn edits metric into a timer instead of a simple meter
 2013-10-27 21:43:32 +01:00
Siebrand Mazeland
84b19a56d5 Localisation updates from http://translatewiki.net. 2013-10-27 19:17:18 +00:00
Marcel Klehr
387091c5c9 Expose current stats at /stats 2013-10-27 18:11:50 +01:00
Marcel Klehr
940f114a84 Record metrics with 'measured' 2013-10-27 17:42:55 +01:00
Marcel Klehr
f532c1c6fb Merge pull request #1968 from KenanSulayman/patch-1 
Refactors APIHandler:callAPI
 2013-10-25 06:34:23 -07:00
Kenan Sulayman
7ab65d7112 Refactors APIHandler:callAPI 
Refactors and optimizes the APIHandler->callAPI.
 2013-10-25 12:14:22 +02:00
Grant Woodford
c3a58f42e7 Added a better way of detecting when a url does not have a protocol specified 2013-10-21 22:15:46 +02:00
Marcel Klehr
8fffe4777e Merge branch 'release/1.3' 2013-10-21 20:35:29 +02:00
Marcel Klehr
e8c69a5474 Update changelog and bump version 2013-10-21 20:18:16 +02:00
Marcel Klehr
d43945db07 Merge pull request #1950 from eyesonlyhack/disableIPlogging 
Privacy: Add an option to disable IP logging
 2013-10-21 08:05:05 -07:00
Grant Woodford
fbe4e43c3d Privacy: Add an option to disable IP logging 2013-10-19 21:37:11 +02:00
Siebrand Mazeland
b1b801e7c7 Localisation updates from http://translatewiki.net. 2013-10-19 19:37:02 +00:00
John McLear
a120d78b7e Merge pull request #1943 from ether/fix/listAllPads-fix 
Pad list cache: You can't change the cache if it's not initiated
 2013-10-14 09:21:27 -07:00
Marcel Klehr
22b0bafafd Pad list cache: You can't change the cache if it's not initiated 
(as per 200f250717 - doh.)
 2013-10-14 18:20:24 +02:00
Siebrand Mazeland
96c366b1e1 Consistent spelling style 
Spotted by Shirayuki in https://translatewiki.net/wiki/Thread:Support/About_EtherpadLite:Pad.modals.badChangeset.cause/en
 2013-10-14 11:11:31 +00:00