Commit Graph

3875 Commits

Author SHA1 Message Date
Marcel Klehr 362315c638 AttribManager#removeAttribOnLine: Remove Linemarker entirely if there's nothing else left 2014-12-28 12:34:42 +01:00
John McLear 036df30c0e Merge pull request #2402 from ether/fix-attribmanager-removeLineAttrib
Fix removeAttributeOnLine: Only remove a single attrib
2014-12-27 19:23:49 +01:00
John McLear 7df944b3fd Merge pull request #2404 from webzwo0i/sanity-in-atext
block changeset if it deletes more lines than exist in the whole pad
2014-12-27 18:36:13 +01:00
Siebrand Mazeland ddd6a8ebce Localisation updates from https://translatewiki.net. 2014-12-27 17:59:55 +01:00
webzwo0i 07a6702363 Revert "be more strict in checkRep"
This reverts commit 22803da42f.
2014-12-27 17:56:20 +01:00
Stefan a645aeef5c Merge pull request #2400 from Gared/fix/author-not-set
Prevent server crash if author is not set
2014-12-27 16:15:26 +01:00
Marcel Klehr a63880dcb1 Fix AttributeManager#removeAttributeOnLine: Only remove a single attrib 2014-12-27 16:15:20 +01:00
John McLear 5b7ae4bd5f Merge pull request #2399 from ether/remove-dokuwiki
removing dokuwiki
2014-12-27 14:27:02 +01:00
Gared 40c7ee9df9 Prevent server crash if author is not set 2014-12-27 14:26:05 +01:00
John McLear 444bbf4cbc remove trailing enter from apikey 2014-12-27 14:19:31 +01:00
John McLear ae22332f71 removing dokuwiki 2014-12-27 14:08:45 +01:00
John McLear 88ab74b1e9 fix flowing of items in editbar 2014-12-24 17:54:13 +00:00
John McLear c409495b5e test for pad users 2014-12-24 04:01:18 +00:00
John McLear 80fa2c2868 move docs 2014-12-24 02:45:21 +00:00
John McLear 1ab7dfdb7b Merge pull request #2358 from BjarniRunar/develop
Created dirty-db-cleaner.py - prunes old history from dirty.db files
2014-12-23 15:50:59 +00:00
John McLear b71fb3ad20 fix issue with attributes 2014-12-23 02:38:50 +00:00
John McLear 70ba525430 Merge pull request #2368 from ether/hook_for_exportHTMLStyles
Hook for export html styles
2014-12-22 02:32:50 +00:00
John McLear fdc930de3d Merge branch 'develop' of github.com:ether/etherpad-lite into hook_for_exportHTMLStyles 2014-12-21 23:43:21 +00:00
John McLear ee3f3b8060 move clean css back to fix minification on TS 2014-12-21 23:42:56 +00:00
John McLear 4573796166 fix 2014-12-21 23:16:23 +00:00
John McLear 3fe58068c0 more fixes 2014-12-21 23:16:00 +00:00
John McLear 12aac2d0d0 Merge branch 'develop' of github.com:ether/etherpad-lite into hook_for_exportHTMLStyles 2014-12-21 23:12:59 +00:00
John McLear 745ef5db1c fix timeslider socket issue 2014-12-21 23:10:56 +00:00
John McLear ffdce760d5 remove unused long paths from windows build 2014-12-21 22:05:07 +00:00
Marcel Klehr 70dc5e7ed9 Merge pull request #2380 from webzwo0i/fix-add-saved-revision-typo
fix typo in addSavedRevisions
2014-12-18 20:21:42 +01:00
webzwo0i 69bad8b30c fix typo in addSavedRevisions 2014-12-17 01:10:20 +01:00
John McLear a2d22a5764 Merge pull request #2377 from webzwo0i/avoid-global-vairables
declare var outside of loop
2014-12-16 16:18:01 +00:00
webzwo0i 0263d30b37 declare var outside of loop 2014-12-16 17:00:35 +01:00
John McLear cfa3f15f94 Merge pull request #2373 from webzwo0i/avoid-global-vairables
dont make local variables global
2014-12-16 00:41:41 +00:00
webzwo0i 5d15f655f0 dont make local variables global 2014-12-14 22:01:28 +01:00
John McLear a2dbf8761f allow for timeslider custom messages 2014-12-10 01:23:24 +00:00
John McLear 197a41627d allow plugins to add multiple styles 2014-12-09 17:34:52 +00:00
John McLear fccfc3bd41 docs 2014-12-09 16:16:19 +00:00
John McLear 3a2669b704 additional tag support hook 2014-12-09 16:13:52 +00:00
John McLear e57c8fa763 Merge pull request #2370 from simong/shardable-socket-io
Don't hardcode /socket.io
2014-12-09 15:58:51 +00:00
Simon Gaeremynck 45c1ad078b Allow for shardable Etherpad 2014-12-09 14:59:18 +00:00
John McLear 653cc6c87f this class was in before, it is used to show when a style is applied to a piece of content 2014-12-09 14:57:18 +00:00
John McLear b94a525e07 docs 2014-12-09 01:35:59 +00:00
John McLear f11bdc1b44 also logic to add attributes for properties 2014-12-09 01:31:40 +00:00
John McLear ce004f9c59 docs 2014-12-08 19:48:02 +00:00
John McLear f2c155ee1a blah use async 2014-12-08 19:44:40 +00:00
John McLear 7cf0e4a9ae allow padId to be passed into the hook 2014-12-08 19:11:45 +00:00
John McLear 2218cbd252 docs 2014-12-08 19:08:12 +00:00
John McLear 6080de9d79 Merge pull request #2348 from ether/sanitizer
sanitizer change
2014-12-04 17:31:42 +00:00
webzwo0i 22803da42f be more strict in checkRep 2014-12-04 16:12:13 +01:00
webzwo0i 5306f0c98a wrap appendRevision in try-catch block 2014-12-04 16:05:02 +01:00
webzwo0i 10c2f72720 dont remove more lines than exist in the whole text 2014-12-04 16:01:39 +01:00
John McLear 89adbb9f12 Merge pull request #2329 from timrchavez/rebuild-pad-script
Restore pad to new location at a given revision
2014-12-04 02:34:21 +00:00
John McLear 08097975ed Merge pull request #2361 from seanhussey/patch-1
Fix typo
2014-12-04 02:33:15 +00:00
Timothy Chavez c7b1aebfe8 Make changes based on code review
Simplified the cloning process, added validation checks to ensure the
new pad ID is valid and that a pad doesn't already exist with that ID.
Also fixed a bug in the chatHead cloning loop and added the ability to
specify a pad ID on the command the line (defaulting to the original
"-rebuilt" pad ID formula)
2014-12-03 20:11:39 -06:00