John McLear
|
7e3a3bb9ea
|
Merge branch 'master' of github.com:Pita/etherpad-lite
|
2012-02-25 19:37:29 +00:00 |
|
John McLear
|
2fd1702960
|
fix sticky chat... dont like where i put the call but it will have to do cause im tired.
|
2012-02-25 19:35:49 +00:00 |
|
0ip
|
1b339a6a6d
|
Merge pull request #486 from fourplusone/fix_redirect
use relative path for redirects avoiding problems with reverse proxies
|
2012-02-25 11:05:26 -08:00 |
|
John McLear
|
a449876f80
|
Merge pull request #498 from eldiddio/master
This fixes issue #308
|
2012-02-25 09:32:55 -08:00 |
|
Mark Fisher
|
164db7b074
|
Added test for IE XML HTTP and added link to wiki article
|
2012-02-25 17:30:59 +00:00 |
|
John McLear
|
bbaa6bb7d2
|
add stuff for how to do load testing
|
2012-02-25 16:54:27 +00:00 |
|
0ip
|
9790598381
|
fix for #491 + #415a (floating chat icon) & fixed hidden authorship colors button on iOS
|
2012-02-25 16:41:10 +01:00 |
|
John McLear
|
e9858041a4
|
Merge pull request #494 from 0ip/miscFix
Misc fix
|
2012-02-25 05:32:29 -08:00 |
|
John McLear
|
1b5a7659c3
|
fix bug #495
|
2012-02-25 13:28:47 +00:00 |
|
John McLear
|
706b7b685d
|
change copyright holder in license
|
2012-02-25 09:44:57 +00:00 |
|
John McLear
|
300418e2b0
|
Adding full apache license
|
2012-02-25 09:44:12 +00:00 |
|
John McLear
|
54da9fad73
|
Merge pull request #466 from fourplusone/cleanup-ace
Cleanup ace
|
2012-02-25 01:34:51 -08:00 |
|
Matthias Bartelmeß
|
0191c248b5
|
Merge commit '64f04670efd582230e693a1c6b3c91bc8df27299' into cleanup-ace-fix
Conflicts:
static/js/ace2_inner.js
|
2012-02-24 20:22:32 +01:00 |
|
John McLear
|
64f04670ef
|
Merge pull request #483 from fourplusone/ace2_inner_patch2
refactored ace_setProperty of ace2_inner.js
|
2012-02-24 09:00:18 -08:00 |
|
John McLear
|
04126690fb
|
Merge pull request #480 from fourplusone/ace2_inner_patch-1
fixed indention + variable scoping
|
2012-02-24 08:52:41 -08:00 |
|
John McLear
|
88744901c0
|
Fixes import major bug caused by removing container required for callback of import
|
2012-02-24 12:23:31 +00:00 |
|
Matthias Bartelmeß
|
9e82aab858
|
use relative path for redirects avoiding problems with reverse proxies
|
2012-02-23 20:35:41 +01:00 |
|
Matthias Bartelmeß
|
b06f3f6903
|
removed ";"
|
2012-02-21 23:15:19 +01:00 |
|
Matthias Bartelmeß
|
4ef71c3534
|
documented ace_setProperty
|
2012-02-21 23:13:59 +01:00 |
|
Matthias Bartelmeß
|
eae87fd835
|
fixed indention + variable scoping
|
2012-02-21 21:46:25 +01:00 |
|
Jordan
|
6467a1a40f
|
Document the -s|--settings cli option in README
|
2012-02-21 15:36:05 -05:00 |
|
Peter 'Pita' Martischka
|
481489e6e5
|
Merge pull request #478 from jhollinger/settings_option
Allow settings filename to be passed as a cli option
|
2012-02-21 12:16:14 -08:00 |
|
Jordan
|
8bac77ff80
|
Allow settings filename to be passed as a cli option
|
2012-02-21 14:20:45 -05:00 |
|
Peter 'Pita' Martischka
|
10cbb485fb
|
Merge pull request #473 from drdla/patch-1
Promote proper use of css specificity
|
2012-02-21 02:45:08 -08:00 |
|
drdla
|
ec2d415a92
|
Promote proper use of css specificity
|
2012-02-20 22:28:25 +01:00 |
|
John McLear
|
d479784559
|
Hotfix for issue #467 https://github.com/Pita/etherpad-lite/issues/467 -- probably wants a permafix
|
2012-02-20 01:11:34 +00:00 |
|
Matthias Bartelmeß
|
b9130134c6
|
remove javascript lexer styles
|
2012-02-19 21:59:31 +01:00 |
|
0ip
|
0261ab653e
|
Update static/css/pad.css
|
2012-02-19 20:10:10 +01:00 |
|
0ip
|
fc0114fc2d
|
added settings to mobile version
|
2012-02-19 17:51:10 +01:00 |
|
0ip
|
12298a926c
|
move width-specific css to bottom + transfer js-css to a class [#chatbox:.stickyChat]
|
2012-02-19 17:16:05 +01:00 |
|
0ip
|
255cf8c5f0
|
qr codes now have equal margins
|
2012-02-19 17:04:36 +01:00 |
|
0ip
|
a540bff652
|
more robust index page + fix for iOS Safari rotation-bug
|
2012-02-19 17:00:43 +01:00 |
|
Matthias Bartelmeß
|
f9ad9bec92
|
clean up broadcast.js
|
2012-02-19 16:05:07 +01:00 |
|
Matthias Bartelmeß
|
465f6c2de7
|
use shared functions from Ace2Common
|
2012-02-19 15:47:20 +01:00 |
|
Matthias Bartelmeß
|
9ede14a546
|
drop embedding of JS/CSS files in ace.js. May result in a little performance drop but makes code much smaller
|
2012-02-19 15:02:54 +01:00 |
|
Matthias Bartelmeß
|
7e7646b517
|
make jshint a bit more happier
|
2012-02-19 14:52:24 +01:00 |
|
Matthias Bartelmeß
|
ce8d60e32c
|
remamed to Ace2Inner() and made it more classlike
|
2012-02-19 14:30:57 +01:00 |
|
Matthias Bartelmeß
|
3c4b4af43d
|
removed recolor module since it wasn't used
|
2012-02-19 14:30:08 +01:00 |
|
Matthias Bartelmeß
|
fb879576e1
|
replaced noop in skiplist with ace2common implementation
|
2012-02-19 14:28:51 +01:00 |
|
Matthias Bartelmeß
|
5d14fb372a
|
Merge branch 'cleanup-ace-js' into cleanup-ace
|
2012-02-19 14:19:54 +01:00 |
|
Matthias Bartelmeß
|
5313053d2d
|
even more compact code for exposed functions in ace2.js
|
2012-02-19 14:18:52 +01:00 |
|
Matthias Bartelmeß
|
a66e01a08f
|
moving noop and identity helper functions to ace2_common
|
2012-02-19 14:11:32 +01:00 |
|
Matthias Bartelmeß
|
77dbe4646e
|
binarySearch is never used
|
2012-02-19 12:40:13 +01:00 |
|
Matthias Bartelmeß
|
3cd7bd0dd1
|
Since ace2_inner.js is already scoped by require-kernel, function OUTER is pretty useless
|
2012-02-19 12:34:24 +01:00 |
|
Matthias Bartelmeß
|
99fb567a3d
|
removed parenModule as it is entirely unused since getCharType() always returns an emtpy string
|
2012-02-19 12:15:42 +01:00 |
|
Matthias Bartelmeß
|
8031c31bc3
|
more compact code for exposed functions in ace2.js
|
2012-02-19 03:16:42 +01:00 |
|
John McLear
|
6ba865521a
|
See 1caaff9308
https://github.com/Pita/etherpad-lite/pull/462
|
2012-02-18 17:51:39 +00:00 |
|
Peter 'Pita' Martischka
|
0d9754760d
|
Merge pull request #458 from fourplusone/master
Should fix #417 and #360
|
2012-02-17 03:21:26 -08:00 |
|
Matthias Bartelmeß
|
fe6c5e1cfe
|
restructured and commented fixes #417 and #360 in order to make code more intuitive
|
2012-02-17 11:41:41 +01:00 |
|
Matthias Bartelmeß
|
97b7f0707f
|
Add further checks to make sure sessioninfos[sessionID] is !== undefined
|
2012-02-16 23:35:00 +01:00 |