0ip
|
64db697558
|
Fixed typos
|
2012-04-30 16:54:19 +02:00 |
|
0ip
|
7a09d97731
|
Fix #683 - Disabling authorship colors doesn't work
|
2012-04-30 17:40:29 +03:00 |
|
John McLear
|
34a2f8cb5d
|
Merge pull request #684 from 0ip/remove_qr_code
Remove QR-code
|
2012-04-30 06:57:42 -07:00 |
|
0ip
|
23cdb2a5c6
|
Removed QR-Code
|
2012-04-30 15:54:21 +02:00 |
|
Edy
|
cf54c23228
|
Merge branch 'develop' of git://github.com/Pita/etherpad-lite into body-block
Resolved conflicts:
src/templates/pad.html
|
2012-04-30 15:17:23 +02:00 |
|
0ip
|
96eb8ac004
|
100% is not needed here http://ragefac.es/416
|
2012-04-29 21:19:34 +03:00 |
|
John McLear
|
bf568b3477
|
Merge pull request #682 from fourplusone/fix/fix-677
fixed plugins.js
|
2012-04-29 11:13:45 -07:00 |
|
Matthias Bartelmeß
|
fa622857b9
|
fixed plugins.js
|
2012-04-29 20:12:15 +02:00 |
|
John McLear
|
122986798e
|
Merge pull request #681 from fourplusone/fix/fix-677
fixed socket.io in timeslider.js
|
2012-04-29 11:11:25 -07:00 |
|
Matthias Bartelmeß
|
cbb5a043b8
|
fixed socket.io in timeslider.js
|
2012-04-29 20:04:00 +02:00 |
|
John McLear
|
a73192b10d
|
Merge pull request #680 from fourplusone/fix/fix-677
Fix #677
|
2012-04-29 10:57:35 -07:00 |
|
Matthias Bartelmeß
|
0e941b498e
|
fix #677
|
2012-04-29 19:54:38 +02:00 |
|
John McLear
|
f6bdbddfcc
|
Merge pull request #679 from 0ip/highl_mod
Tidy up wobbly button highlighting code
|
2012-04-29 08:10:52 -07:00 |
|
John McLear
|
c969e11a6b
|
Merge pull request #678 from 0ip/admin_rel_paths
plugins.html ← Fix relative paths
|
2012-04-29 07:16:45 -07:00 |
|
0ip
|
2525f20ff4
|
Tidied up highlighting for currently opened module 2
|
2012-04-29 02:48:47 +02:00 |
|
0ip
|
4b272fe2e1
|
Tidied up highlighting for currently opened module
|
2012-04-29 01:00:31 +02:00 |
|
0ip
|
c11df112e8
|
templates/plugins.html Fixed relative paths
|
2012-04-28 22:00:15 +02:00 |
|
John McLear
|
83648481c3
|
Merge pull request #671 from fourplusone/fix/baseurl
baseURL/fixing #670
|
2012-04-25 07:01:53 -07:00 |
|
Matthias Bartelmeß
|
513deef768
|
added baseURL export to pad.js, timeslider.js, plugins.js, fixing #670
|
2012-04-25 10:23:58 +02:00 |
|
Matthias Bartelmeß
|
18d0c81181
|
adding padutils to padmodals
|
2012-04-21 14:57:22 +02:00 |
|
Matthias Bartelmeß
|
a557f2414e
|
cssManager top is not used, so drop it
|
2012-04-21 13:47:11 +02:00 |
|
John McLear
|
d554420f57
|
Remove my fix and allow @redhogs to be the proper one.. (even though it's exactly the same thing)
|
2012-04-21 01:23:13 +02:00 |
|
John McLear
|
3798f53f94
|
Merge pull request #660 from redhog/master
Unbreak last pull request (I forgot a dependency)
|
2012-04-20 16:21:04 -07:00 |
|
Egil Moeller
|
d08f3ff5ee
|
Bugfix dependencies
|
2012-04-21 01:17:27 +02:00 |
|
Matthias Bartelmeß
|
9d9b7b7b47
|
Merge branch 'develop' into feature/cleaner_code
|
2012-04-21 00:34:32 +02:00 |
|
John McLear
|
16edda7d46
|
luke warm fix.
|
2012-04-21 00:16:10 +02:00 |
|
John McLear
|
a5210ab27d
|
Merge pull request #647 from etinquis/fixes
Fix + New Hook
|
2012-04-20 15:10:40 -07:00 |
|
Matthias Bartelmeß
|
8fefb551fc
|
less verbose startup, better log messages at startup
|
2012-04-20 22:44:10 +02:00 |
|
Matthias Bartelmeß
|
7f50e8f551
|
server.js can be called from console.
|
2012-04-20 22:40:33 +02:00 |
|
Matthias Bartelmeß
|
c90ef5aeb8
|
default dirty.db to current pwd, so no new directory has to be created
|
2012-04-20 22:39:16 +02:00 |
|
Matthias Bartelmeß
|
e9fc16a974
|
warn if dirty db is used
|
2012-04-20 17:03:37 +02:00 |
|
Matthias Bartelmeß
|
90bbf169b2
|
allow startup without settings file
|
2012-04-20 17:03:26 +02:00 |
|
Matthias Bartelmeß
|
6fc45d6252
|
added etherpad-lite to "bin" in package.json
|
2012-04-20 17:00:32 +02:00 |
|
John McLear
|
b6be00c3ab
|
Merge pull request #659 from redhog/master
Oups, forgot a debug print in there in the last pull request
|
2012-04-20 06:12:34 -07:00 |
|
Matthias Bartelmeß
|
9691f02765
|
removing Minify.js.rej
|
2012-04-20 15:12:20 +02:00 |
|
Egil Moeller
|
9a67a3a1db
|
Removed debug print
|
2012-04-20 15:08:50 +02:00 |
|
John McLear
|
0a9fcc267f
|
Merge pull request #658 from redhog/master
Bugfixes for when plugins are installed as dependencies for other plugins
|
2012-04-20 05:56:57 -07:00 |
|
Egil Moeller
|
72c972b256
|
Bugfix for recursive dependency-installation and paths
|
2012-04-20 14:37:53 +02:00 |
|
Matthias Bartelmeß
|
89ab73c868
|
removing commented out functions from cssmanager.js
|
2012-04-20 14:25:07 +02:00 |
|
Matthias Bartelmeß
|
8593b1905c
|
getRepHTML seems to be unused. Removing
|
2012-04-20 14:24:44 +02:00 |
|
Matthias Bartelmeß
|
709a3b1dbe
|
removing debug code in collab_client.js
|
2012-04-20 13:34:35 +02:00 |
|
Matthias Bartelmeß
|
ab7f7506b9
|
removed unused functions in collab_client
|
2012-04-20 13:32:43 +02:00 |
|
Matthias Bartelmeß
|
07ee836946
|
set view zoom is unused
|
2012-04-20 12:19:09 +02:00 |
|
Matthias Bartelmeß
|
e661f653b1
|
sharebox and Feedback are not used. Removing them
|
2012-04-20 12:15:09 +02:00 |
|
Matthias Bartelmeß
|
23bbe4ab5a
|
undo-xpopup seems to be unused
|
2012-04-20 12:04:10 +02:00 |
|
Matthias Bartelmeß
|
f809b0d6c8
|
removing de-facto noop
|
2012-04-20 12:03:11 +02:00 |
|
0ip
|
a743112170
|
Fix #626, Plugins don't work if pad is on a subdir
|
2012-04-19 19:44:44 +03:00 |
|
John McLear
|
4a7ab12859
|
Merge pull request #649 from rassie/patch-1
Corrected color picker: `jQuery(...).css('background-color')` returns…
|
2012-04-19 08:37:09 -07:00 |
|
John McLear
|
9fe8a7530d
|
Merge pull request #641 from 0ip/highlight_module
Fix | Highlight currently opened module
|
2012-04-19 08:23:51 -07:00 |
|
John McLear
|
064568d169
|
Merge pull request #653 from 0ip/plugins_page
Restore plugin manager UI
|
2012-04-19 08:18:49 -07:00 |