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

1802 Commits (bbc8848af3460a8dca63f53bd575471faa7ec12e)

Author SHA1 Message Date
Marcel Klehr 2d0cf156af Fix showModal animation. 
New content shouldn' slide in before the containing popup.
 2012-07-14 15:14:46 +02:00
Marcel Klehr 4220d6bedd Put loading git back in. 2012-07-14 15:12:21 +02:00
Marcel Klehr 9a3cb2c727 Sort the toolbar buttons correctly. 2012-07-14 14:54:25 +02:00
Marcel Klehr 444467bef2 Remove connectivity tollbar button. 2012-07-14 14:50:52 +02:00
Marcel Klehr 8ab12ee69e Only disable toolbar. 
Make content available and allow scrolling
 2012-07-14 14:46:02 +02:00
John McLear 84cf741acf Merge pull request #871 from marcelklehr/feature/nice-chat-bubble 
Use Tinycon to display chat mentions in favicon.
 2012-07-13 05:10:25 -07:00
Marcel Klehr 6bda1f8e4d Fix padeditbar.toggleDropDown 
Only call callback, if one was passed.
 2012-07-13 09:13:22 +02:00
Marcel Klehr 9e9cbd5ffa Fix typo. 2012-07-13 08:24:02 +02:00
Marcel Klehr 6da6a7f0d8 Use nice editbar popups for connection status instead of srceen-blocking modals. 2012-07-13 08:23:22 +02:00
Marcel Klehr dc9eda9364 Use Tinycon to display chat mentions in favicon. 2012-07-12 20:18:33 +02:00
Marcel Klehr ead379cf66 Merge pull request #853 from fourplusone/feature/async_handleMessage 
async handle message
 2012-07-12 03:50:37 -07:00
Matthias Bartelmeß 8882bbff6a Merge pull request #865 from marcelklehr/fix/chat-autoscroll 
Don't scroll chat automatically if user is not at the bottom
 2012-07-12 03:26:12 -07:00
Marcel Klehr f12cb0dd58 Don't screw up, if chat is empty. 2012-07-12 10:34:11 +02:00
Marcel Klehr 7653db36fe Revert "option to stop autoscroll" 
This reverts commit 6726ea6632.

Conflicts:

	src/static/js/chat.js
 2012-07-12 10:23:55 +02:00
Marcel Klehr 8a471e590a Fix #581 Don't scroll chat automatically if user is not at the bottom 2012-07-11 22:30:03 +02:00
John McLear 6726ea6632 option to stop autoscroll 2012-07-11 17:42:59 +01:00
Marcel Klehr dc09323d8f Don't exit if no settings file was found. 2012-07-11 15:36:41 +02:00
Marcel Klehr f09dd0f3fb Put toString() back in. 2012-07-11 15:34:33 +02:00
Marcel Klehr beb6378656 Merge pull request #850 from fourplusone/feature/remove_opt 
CodeCleanup: remove unused _opt in favor of code size/readability
 2012-07-10 13:03:44 -07:00
Marcel Klehr 87f26334d1 Fix typo. 2012-07-10 21:55:35 +02:00
Marcel Klehr 8858446678 Exit on error. 2012-07-10 21:38:14 +02:00
John McLear 72532fadc9 Merge pull request #863 from jhollinger/develop 
Don't crash server if setText was given no text
 2012-07-10 07:58:23 -07:00
Jordan Hollinger a7dd620b9f Don't crash if setText isn't passed any text. issue #861 2012-07-10 00:53:55 -04:00
Matthias Bartelmeß 975171a86b Make handleMessage async 2012-07-08 21:06:19 +02:00
John McLear 9617ace809 Merge pull request #849 from marcelklehr/fix-git-version-receiver 
Fix git version receiver
 2012-07-08 10:44:55 -07:00
Marcel Klehr 4c8f69b7c5 Use v8 to parse settings.json 2012-07-08 18:59:46 +02:00
Matthias Bartelmeß 3a0015c357 remove unused _opt in favor of code size/readability 2012-07-08 11:51:04 +02:00
Marcel Klehr af3c57a120 Load npm to enable server to see the git revision. 2012-07-08 11:37:24 +02:00
Matthias Bartelmeß 9ff3aa0ee0 make /static/tests.html functional again, 
added getLastEdited
 2012-07-07 20:41:26 +02:00
Jordan Hollinger 6d5fe459f0 Bugfix to getLastEdited API method, issue #845 2012-07-07 13:22:27 -04:00
John McLear f95e2793d7 Merge pull request #841 from Pita/releases-1.1.1 
Releases 1.1.1
 2012-07-05 10:56:00 -07:00
John McLear 34fdfcb253 Merge pull request #840 from redhog/master 
Bugfix for readonly timeslider
 2012-07-05 10:34:55 -07:00
Egil Moeller 17b6103a3d Bugfix for broken readonly timeslider 2012-07-05 19:33:20 +02:00
John McLear d18bb81aad Correct casing 2012-07-05 20:33:11 +03:00
johnyma22 f9805102f1 actually fix run script ;) 2012-07-05 18:30:59 +01:00
johnyma22 4c928a8aac Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop 2012-07-05 18:12:35 +01:00
John McLear 84ee5c901d Merge pull request #839 from marcelklehr/fix-run.sh 
Fix run.sh
 2012-07-05 10:12:16 -07:00
Marcel Klehr 5195f685e2 Correct error message. 2012-07-05 19:08:20 +02:00
Marcel Klehr f15ffbb5e4 Allow v0.6.0 on UNIX 2012-07-05 19:02:20 +02:00
johnyma22 35bf5d17c0 Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop 2012-07-05 17:55:30 +01:00
John McLear bc15ea5c15 Merge pull request #829 from marcelklehr/support-node-0.8 
Support node 0.8
 2012-07-05 09:54:25 -07:00
johnyma22 56a5c86e73 Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop 2012-07-05 17:53:50 +01:00
John McLear 071ddefc39 Merge pull request #838 from redhog/master 
Bug workaround for plugin manager
 2012-07-05 09:53:17 -07:00
Egil Moeller 799a5768c7 Quick hack to hide ep_etherpad-lite in plugin list 2012-07-05 18:13:29 +02:00
Marcel Klehr 42bbbd426f Add latest versions of async, express and connect. 2012-07-05 18:11:18 +02:00
Marcel Klehr c01aaeefc1 Allow node v0.6.x and 0.8.x 2012-07-05 17:34:23 +02:00
John McLear 31ef973c33 Merge pull request #826 from marcelklehr/remove-windows-settings-json 
Remove windows settings json
 2012-07-05 08:13:03 -07:00
johnyma22 9bfd5762b0 Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop 2012-07-05 16:12:15 +01:00
John McLear d59956b7da Merge pull request #837 from redhog/master 
Changes from pita/master not in develop :(
 2012-07-03 14:58:51 -07:00
Egil Moeller 1ff8debfbd Merge branch 'master' of git://github.com/Pita/etherpad-lite 
Conflicts:
	src/node/hooks/express/padurlsanitize.js
 2012-07-03 23:55:55 +02:00