John McLear
|
f3036eb124
|
Merge pull request #715 from redhog/master
Bugfix for IE and document.domain
|
2012-05-18 10:19:44 -07:00 |
|
Egil Moeller
|
9f46678e5d
|
Bugfix for IE and document.domain
|
2012-05-18 18:57:18 +02:00 |
|
John McLear
|
ee11338927
|
Merge pull request #709 from cweider/packaging
Packaging
|
2012-05-17 04:59:24 -07:00 |
|
John McLear
|
1043d607d0
|
Merge pull request #712 from edy-b/issue-707
Don't set cached cookies, fixes issue #707
|
2012-05-17 04:57:22 -07:00 |
|
Edy
|
e8639d87ce
|
fixes issue #707
Don't set cached cookies
|
2012-05-17 12:08:19 +02:00 |
|
Chad Weider
|
a9eb2d4e31
|
Fix ordering of editer code loading operations.
|
2012-05-14 19:01:00 -07:00 |
|
Chad Weider
|
9b0e2287aa
|
Add plugin framwork to common package.
|
2012-05-14 18:20:16 -07:00 |
|
Chad Weider
|
1a2c6425e1
|
Extract ace2_common into its own package.
|
2012-05-14 18:20:16 -07:00 |
|
Chad Weider
|
384523859e
|
Require ace2_common separately.
|
2012-05-14 18:20:16 -07:00 |
|
Chad Weider
|
97c7842d19
|
Remove unused line.
|
2012-05-14 18:20:16 -07:00 |
|
Chad Weider
|
4680bfaee8
|
Upgrade yajsml version.
Fixes parent-relative redirects and prints results more nicely.
|
2012-05-14 18:14:50 -07:00 |
|
John McLear
|
916e52a1eb
|
Merge pull request #609 from prauscher/disable-passwords
Disable passwords
|
2012-05-13 06:55:47 -07:00 |
|
John McLear
|
c70d88eedc
|
Merge pull request #667 from fourplusone/feature/cleaner_code
Removing unused code - All looks good, some minor tweeks are probably worthwhile in the future.
|
2012-05-13 06:51:58 -07:00 |
|
0ip
|
99ecadc0c3
|
Fix #655, wrong located APIKEY.txt
|
2012-05-13 00:34:26 +03:00 |
|
John McLear
|
476065b68d
|
Merge pull request #627 from edy-b/body-block
add more blocks to pad.html
|
2012-05-12 14:18:28 -07:00 |
|
0ip
|
c406d076de
|
Updated socket.io
|
2012-05-02 19:12:57 +03:00 |
|
Edy
|
47a257ff72
|
accidentally deleted an end block in last merge
|
2012-05-01 12:02:12 +02:00 |
|
Edy
|
1329e93639
|
Merge branch 'develop' of git://github.com/Pita/etherpad-lite into body-block
Conflicts:
src/templates/pad.html
|
2012-05-01 11:35:06 +02:00 |
|
John McLear
|
73a962e6ca
|
Correct dependency paths for checkPad script.
|
2012-04-30 19:23:41 +02:00 |
|
John McLear
|
40af25d282
|
Merge pull request #685 from 0ip/typo
Fix #666 - Typo "seperator"
|
2012-04-30 08:00:05 -07:00 |
|
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 |