public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,912 Commits
190 Branches
71 Tags
55 MiB
Commit Graph

1912 Commits (1c847dbde3c36d473a93f06e26ffa97bd82582ba)

Author SHA1 Message Date
johnyma22 1c847dbde3 Merge branch 'develop' of github.com:Pita/etherpad-lite into develop 2012-10-29 22:48:32 +00:00
johnyma22 8d7a02816f remove opacity to fix opera bug #941 2012-10-29 22:47:42 +00:00
John McLear b2446fa61f Merge pull request #1098 from Pita/span-two-lines-on-less-than-400px 
make anything less than 400px span 2 lines on toolbar and make popups ap...
 2012-10-29 15:00:11 -07:00
johnyma22 898331b680 fix rtl sanity 2012-10-29 21:55:57 +00:00
johnyma22 4f04d14cab Merge branch 'develop' of github.com:Pita/etherpad-lite into develop 2012-10-29 19:30:29 +00:00
johnyma22 0e41e9fdfc allow max chat to be 999 chars 2012-10-29 19:29:30 +00:00
johnyma22 4f85bf09cc make anything less than 400px span 2 lines on toolbar and make popups appear below this 2012-10-29 19:20:02 +00:00
John McLear 4afc9ccbdf Merge pull request #1094 from marcelklehr/fix/doc-generator 
Change filename hooks.md -> hooks_overview.md
 2012-10-29 06:36:56 -07:00
John McLear 5646759dc6 Merge pull request #1095 from marcelklehr/docs/improve-doc-generation 
Documentation improvements
 2012-10-29 06:36:38 -07:00
John McLear 05cc7b3fd5 Merge pull request #1096 from marcelklehr/fix/server-startup-npm 
Fix npm
 2012-10-28 11:02:48 -07:00
Marcel Klehr 78e64ffea8 Mimic, replace or work around removed npm utils. 2012-10-28 18:34:20 +01:00
Marcel Klehr e447a6fade Make sure npm is initialized before requiring things (fix #1092) 2012-10-28 18:02:49 +01:00
Marcel Klehr 7a8401c363 Add recipe for doc assets and some basic styling for the generated docs. 2012-10-27 18:47:09 +02:00
Marcel Klehr 3d1fd05085 Insert epl version into template. 2012-10-27 17:28:15 +02:00
Marcel Klehr 94e399e8a9 Change filename hooks.md -> hooks_overview.md 
so it doesn't confuse tools/doc/generator
 2012-10-27 16:30:31 +02:00
John McLear d5ace6c163 Merge pull request #1091 from kingkaeru/feature/iisnode_support 
Feature/iisnode support
 2012-10-25 16:25:00 -07:00
Randy 399080ad73 Add IIS config file 2012-10-25 10:22:28 -07:00
Randy 596e20e123 Add default port of process.env.PORT if port isnt specified in settings.json 2012-10-25 10:21:34 -07:00
John McLear a80eb93f75 Merge branch 'develop' of git://github.com/Pita/etherpad-lite into develop 2012-10-25 09:41:24 -07:00
John McLear ff2e7ead09 add a script to migrate from dirtyDB to MYSQL thanks to http://blog.codeborne.com 2012-10-25 09:40:33 -07:00
John McLear 344ba31c92 fix paths in convert.js so it works 2012-10-25 09:35:33 -07:00
John McLear 2ecd5719fc Merge pull request #1073 from Pita/librejs-header 
Add LibreJS Licensing information to headers of HTML templates
 2012-10-25 06:53:38 -07:00
John McLear 4c72507ff0 Merge pull request #1090 from marcelklehr/docs/add-pluginfw 
Add docs for plugins and plugin framework
 2012-10-25 06:53:14 -07:00
John McLear a01768fc46 Merge pull request #1086 from neurolit/patch_relative_static_links 
Templates: relative links instead of absolute ones for /static directory
 2012-10-25 06:52:16 -07:00
Marcel Klehr 63e4aafae8 Add docs for plugins and plugin framework 
@redhog please elaborate on / improve 'doc/api/pluginfw.md'!
 2012-10-25 15:45:06 +02:00
John McLear 58d559b962 fix marcels trailing , 2012-10-25 05:24:42 -07:00
John McLear 9582881278 Merge pull request #1088 from marcelklehr/fix/update-npm 
Update npm
 2012-10-25 05:21:11 -07:00
John McLear 0e9695bfb0 Merge pull request #1089 from marcelklehr/legal/extend-collaboraters 
Add myself to the list of contributers
 2012-10-25 05:20:49 -07:00
Marcel Klehr ff2824ae7a Add "Marcel Klehr" to contributers list 2012-10-25 13:45:40 +02:00
Marcel Klehr 1bc9d61027 Update npm (fix #1012) 2012-10-25 13:38:28 +02:00
0ip cb760aae52 Fix broken layout (Chrome Mobile) 2012-10-25 14:37:41 +03:00
Matthias Bartelmeß 7f158f697b Merge pull request #1081 from clkao/develop 
Do not assume window object exists
 2012-10-25 01:24:18 -07:00
neurolit 526610e2e7 Templates: relative links instead of absolute ones for /static directory 
…irector

Two links were absolute ("/static/...") instead of relative
("../static"). The image was not loaded with sites behind reverse
proxies and subdirectory.
 2012-10-24 19:48:13 +02:00
Chia-liang Kao 8199bf8377 Do not assume window object exists 2012-10-23 15:21:05 +08:00
johnyma22 a770910a3a Add LibreJS Licensing information to headers of HTML templates 2012-10-17 17:53:28 +01:00
John McLear 429651874f Merge pull request #1072 from marcelklehr/fix/timeslider-links-regexp 
Fix #1067 Corrected exports links regexp
 2012-10-16 13:36:20 -07:00
Marcel Klehr 6c89187f95 Fix #1067 Corrected exports links regexp 2012-10-16 20:46:27 +02:00
John McLear b7d0751b18 couch, level, mongo, postgres, redis DB support 
Support for additional underlying databases
 2012-10-15 13:09:55 +02:00
John McLear c45739becb Update src/package.json 
Bump version #
 2012-10-11 23:38:56 +02:00
John McLear da9439d36e Merge pull request #1059 from lepidum/develop 
Fix for #1032 caused by pull-request 999
 2012-10-11 10:12:54 -07:00
lepidum 250901bef5 Merge pull request #3 from ayokura/fix-international-composition 
fix Pita/etherpad-lite #1032 (International composition (e.g. Japanese Input))
 2012-10-11 09:20:28 -07:00
NAGOYA, Yoshihiko 957a0aa873 fix Pita/etherpad-lite #1032 
refact inInternationalComposition
 2012-10-12 01:12:15 +09:00
John McLear d7ec050f34 Merge pull request #1035 from amtep/develop 
Guard against malicious clients in USERINFO_UPDATE handling
 2012-10-11 08:27:27 -07:00
Marcel Klehr bedc51d2e3 Merge pull request #1057 from dmitryuv/sync-processing 
fix for error handling in the callback code
 2012-10-11 08:08:47 -07:00
Dmitry dbcdc2f956 fix for error handling in callback code 
The callback code does not follow error handling guidelines, thus always
receiving NULL instead of results array.
 2012-10-11 18:07:45 +04:00
Marcel Klehr 1461c4e19a Merge pull request #1056 from dmitryuv/sync-processing 
Fix variable name in handleMessageHook
 2012-10-11 07:05:51 -07:00
Dmitry 0fa954c1a0 fixed variable name in handleMessageHook 
the code would never work as expected with this type
 2012-10-11 17:51:57 +04:00
John McLear 442c5714f9 Merge pull request #1049 from cweider/fix-express 
Drop method deprecated in Express 3.x.
 2012-10-09 05:19:17 -07:00
Chad Weider 9d1274abaf Drop method deprecated in Express 3.x. 2012-10-09 01:32:21 -07:00
John McLear 90373964d3 Remove two instances of the same function name 
Both functions did the same thing, the first function was buggy.  Might be worth someone looking through the history of this file and pointing out when I made this heinous error ;)
 2012-10-06 02:36:51 +02:00