mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-05 06:37:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
808 commits 219 branches 107 tags 76 MiB
Commit graph

808 commits

This branch
This branch
All branches
Author SHA1 Message Date
GitHub Merge Button
09f5a57106 Merge 95d98f0cd0 into 165f26947d 2012-01-22 06:25:38 -08:00
Peter 'Pita' Martischka
165f26947d Merge pull request #341 from azul/race_condition 
make PadMessageHandler more robust against timing issues
 2012-01-22 06:25:35 -08:00
Peter 'Pita' Martischka
6b19ffeaf6 Merge pull request #348 from 0ip/fixforfixforfix 
Final fix for fix for fix (scope issues)
 2012-01-22 06:22:46 -08:00
booo
7720c312ca README: add notice about jshint 2012-01-22 21:57:44 +08:00
Robin
c0a0687fe9 It was definetely too late 2012-01-22 13:09:10 +01:00
John McLear
d881cefbc9 Merge pull request #347 from 0ip/patch-2 
Typo again
 2012-01-21 18:44:39 -08:00
0ip
3f8b03a900 Typo again 2012-01-22 02:15:02 +01:00
John McLear
a1081d47ba Merge pull request #346 from 0ip/ua_dupl 
Fix for UA-detection duplicates
 2012-01-21 16:11:35 -08:00
Robin
3c85a9cc6c Typo 2012-01-22 00:13:00 +01:00
Robin
300886da34 Removed duplicates 2012-01-22 00:10:06 +01:00
Montana Scott Rowe
95d98f0cd0 forgot to edit other scripts 2012-01-19 17:51:44 -06:00
Montana Scott Rowe
57908fcb16 forgot to modify other scripts 2012-01-19 17:51:26 -06:00
Montana Scott Rowe
2b8af11405 moved server into a module and actual invocation out of it 2012-01-19 17:46:55 -06:00
Montana Scott Rowe
a7d9e6b9a3 checked to make sure init is passed a function 2012-01-19 17:36:56 -06:00
Montana Scott Rowe
7e522eaf85 put POSTs into an object literal 2012-01-19 17:28:45 -06:00
Montana Scott Rowe
c16d3a0f67 moved GETs into an object literal 2012-01-19 17:20:26 -06:00
Montana Scott Rowe
c7d4a5cf33 moved GET functions into an object 2012-01-19 17:04:17 -06:00
Montana Scott Rowe
1b03e1991a placed additionalSetup hook 2012-01-19 16:55:39 -06:00
Montana Scott Rowe
a45dd74b31 factored out goToPad as a combinator 2012-01-19 16:48:24 -06:00
Montana Scott Rowe
772925f285 pulled configure and basic_auth into global scope 2012-01-19 16:29:04 -06:00
Montana Scott Rowe
b0d23cb952 factored out API caller and client feedback combinators 2012-01-19 14:42:40 -06:00
Montana Scott Rowe
e703fd1ba0 factored out pad import 2012-01-19 14:26:05 -06:00
Montana Scott Rowe
b38d88e454 factored out pad export POST combinator in the least interesting way 2012-01-19 14:07:19 -06:00
Montana Scott Rowe
fdcf1d4153 factored out static serve on goToPad 2012-01-19 13:36:50 -06:00
Montana Scott Rowe
a4795eb88d factored out read only pad getter 2012-01-19 13:17:42 -06:00
Montana Scott Rowe
c5c548db11 refactored out readonly pad render combinators 2012-01-19 12:52:52 -06:00
Montana Scott Rowe
b0a58b0b3e finished a step I'd accidentally left half-completed in the refactoring of a higher-order function 2012-01-19 11:56:50 -06:00
Montana Scott Rowe
c109af52e1 for read-only pads, turned async series into waterfall to reduce state and factored out translation combinator 2012-01-19 11:55:59 -06:00
Montana Scott Rowe
7b96bb7f8e factored out static sendfile 2012-01-19 10:44:38 -06:00
Azul
c4f9268cfa make PadMessageHandler more robust against timing issues 2012-01-19 17:38:16 +01:00
Montana Scott Rowe
e1159f0ee0 factored out shutdown setup 2012-01-19 10:14:14 -06:00
Montana Scott Rowe
98f11bea6d factored out socket.io setup 2012-01-19 10:11:51 -06:00
Montana Scott Rowe
08040e7444 factored out static serve and pad name check combinators 2012-01-19 09:46:06 -06:00
Montana Scott Rowe
fcb3b11c0e factored out pad access as a combinator 2012-01-19 09:42:56 -06:00
John McLear
9f0ca7cc44 Remove alt key from Z to stop Polish people feeling sad 2012-01-17 16:50:35 +00:00
Peter 'Pita' Martischka
8f887262b0 Merge pull request #335 from johnyma22/importInstructions 
Added a string to let people know to install abiword to enable import
 2012-01-15 12:50:55 -08:00
Peter 'Pita' Martischka
a313c2570e Merge pull request #331 from cweider/packaging-improvement 
Packaging improvement
 2012-01-15 12:48:41 -08:00
John McLear
eec22c4b70 Added a string to let people know to install abiword to enable import 2012-01-15 20:48:29 +00:00
Chad Weider
71a7c00abc Merge adjacent scripts. 2012-01-15 12:10:29 -08:00
Chad Weider
a7bea30d83 Remove unnecessary quoting approach. 2012-01-15 11:27:08 -08:00
Chad Weider
9c91f16c71 Improve inlining of editor content. 
Instead of replacing substrings, write each included file's content into a shared dictionary for lookup later. This eliminates duplication and arguably improves readability.
 2012-01-15 11:27:04 -08:00
John McLear
5f46ac2b01 Temporary fix that was breaking clicks inside of embedded pads 2012-01-15 18:24:18 +00:00
John McLear
6b49a56e01 Merge branch 'master' of github.com:Pita/etherpad-lite 2012-01-15 17:59:42 +00:00
John McLear
e14fd22284 fix large left padding 2012-01-15 17:59:19 +00:00
John McLear
d392083db3 Merge pull request #334 from 0ip/patch-1 
Fixed dokuwiki "bug"
 2012-01-15 09:57:32 -08:00
0ip
1767e0f6e8 Update static/css/pad.css 2012-01-15 18:55:33 +01:00
John McLear
5b807b4d86 Merge pull request #333 from 0ip/iconfix 
Added icon for ordered lists
 2012-01-15 09:43:27 -08:00
Robin
960a79b77b Added icon for ordered lists 2012-01-15 18:37:33 +01:00
John McLear
f4dca37a93 Ordered list support 2012-01-15 17:20:20 +00:00
Chad Weider
77804673d7 Move packaging info into its own file. 2012-01-15 01:52:58 -08:00