Commit Graph

1401 Commits (e9f7583793308b46ec7a58e3c6aea1ec7182b880)

Author SHA1 Message Date
John McLear e9f7583793 some nice css to that reflect when a button is active 2013-11-28 17:44:37 +00:00
John McLear dee2dab7c4 getAttributeOnSelection function 2013-11-28 17:27:52 +00:00
s1341 5181b3e467 add josnminify to package.json 2013-11-26 10:28:33 +02:00
s1341 9b7203d4d2 have the server parse the settings file using minify and strip commas 2013-11-26 10:20:59 +02:00
s1341 7550be0921 strip off trailing commas 2013-11-26 10:11:32 +02:00
John McLear b527ef2bc5 Merge pull request #2010 from ether/sticky-chat-resize
Sticky chat resize
2013-11-25 09:36:44 -08:00
John McLear 3be1ee5967 slightly cleaner 2013-11-25 17:36:24 +00:00
John McLear 252be19885 make sticky chat mroe responsive to changes in top bar 2013-11-25 17:33:33 +00:00
s1341 45e0680484 move copy/move pad into a new api version 2013-11-24 22:34:56 +02: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
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
Siebrand Mazeland 1ee7c7000f Localisation updates from http://translatewiki.net. 2013-11-12 13:44:57 +00:00
Marcel Klehr 8e5af48f79 en.json: Add keyboard shortcuts for indent and outdent to translations 2013-11-08 15:18:23 +00:00
Siebrand Mazeland c9b80c6120 Localisation updates from http://translatewiki.net. 2013-11-04 16:04:11 +00:00
Marcel Klehr 8ab2442cc9 Update padList correctly
fixes #1971
2013-11-01 14:16:26 +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 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
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 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
Siebrand Mazeland e308c265af Localisation updates from http://translatewiki.net. 2013-10-14 08:55:30 +00:00
vileda 77c2313025 pass correct padID to checkAccess if pad is requested via readOnly link 2013-10-13 22:31:41 +02:00
Marcel Klehr 200f250717 You don't need the padList if you want to alter it
Don't query the db for caching a list of pads if you only want to alter the list
2013-10-13 21:20:19 +02:00
John McLear 680d9a2811 Don't try to populate padlist on each req
This is an important fix, prolly wants merging into master ASAP.  

Before this fix each new pad request would re-populate the all pads object, this is a blocking procedure and slows down the loading to a point where it's almost useless :(

Testing didn't find this because our testing stack isn't populated with pad data :|  TLDR.  Our tests still suck, hard.
2013-10-13 16:39:45 +01:00
Marcel Klehr 8c9e543b91 Fix disconnect modals 2013-10-12 22:29:03 +02:00
Marcel Klehr 614ca6bd90 Merge branch 'develop' into release/1.2.12 2013-10-12 20:29:49 +02:00
Marcel Klehr 64392542f9 Merge pull request #1938 from ether/fix/unknown-connection-message
Drop messages from unknown connections
2013-10-12 11:24:51 -07:00
Marcel Klehr aa77a615da Drop messages from unknown connections
fixes #1908
2013-10-12 18:51:04 +02:00
Marcel Klehr 048d55a64c Don't create new pad if a non-existant read-only pad is accessed
fixes #1848
2013-10-12 18:41:48 +02:00
Marcel Klehr 74bc2bd761 Prepare release 2013-10-12 14:16:06 +02:00
Marcel Klehr 7f10b9a42f Add explanations for more disconnect scenarios 2013-10-10 21:11:15 +02:00
Marcel Klehr de50efc71a Merge pull request #1927 from ether/fix/client-side-error-logging-in-server-log
Polish logging of client-side errors on the server
2013-10-10 11:14:54 -07:00
Marcel Klehr 22e9e5fdcd Merge pull request #1926 from ether/fix/no-connect-to-corrupt-pad
Fix a whole range of bugs related to corrupted changesets
2013-10-10 11:07:37 -07:00
Marcel Klehr 46511d6144 Polish the error messages of the easysync lib 2013-10-10 20:02:13 +02:00
Marcel Klehr b7c7685dc7 Polish logging of client-side errors on the server 2013-10-10 18:45:22 +02:00
Marcel Klehr d4c99d40b8 Never keep processing a changeset if it's corrupted 2013-10-10 18:19:25 +02:00