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
04126690fb
Merge pull request #480 from fourplusone/ace2_inner_patch-1
...
fixed indention + variable scoping
2012-02-24 08:52:41 -08:00
88744901c0
Fixes import major bug caused by removing container required for callback of import
2012-02-24 12:23:31 +00:00
b06f3f6903
removed ";"
2012-02-21 23:15:19 +01:00
4ef71c3534
documented ace_setProperty
2012-02-21 23:13:59 +01:00
eae87fd835
fixed indention + variable scoping
2012-02-21 21:46:25 +01:00
6467a1a40f
Document the -s|--settings cli option in README
2012-02-21 15:36:05 -05:00
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
8bac77ff80
Allow settings filename to be passed as a cli option
2012-02-21 14:20:45 -05:00
10cbb485fb
Merge pull request #473 from drdla/patch-1
...
Promote proper use of css specificity
2012-02-21 02:45:08 -08:00
ec2d415a92
Promote proper use of css specificity
2012-02-20 22:28:25 +01:00
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
6ba865521a
See 1caaff9308
...
https://github.com/Pita/etherpad-lite/pull/462
2012-02-18 17:51:39 +00:00
0d9754760d
Merge pull request #458 from fourplusone/master
...
Should fix #417 and #360
2012-02-17 03:21:26 -08:00
fe6c5e1cfe
restructured and commented fixes #417 and #360 in order to make code more intuitive
2012-02-17 11:41:41 +01:00
97b7f0707f
Add further checks to make sure sessioninfos[sessionID] is !== undefined
2012-02-16 23:35:00 +01:00
2bc07204f8
Merge pull request #459 from cweider/fix-common-code
...
Account for more spaces and Windows paths. This fixes #456 .
2012-02-16 14:21:51 -08:00
1063a3d036
Account for more spaces and Windows paths. This fixes #456 .
2012-02-16 14:19:16 -08:00
bad920e28d
fixes #417 and #360
2012-02-16 23:11:52 +01:00
9ca914f8cd
Merge pull request #454 from cweider/fix-common-code
...
Fix CommonCode (#451 )
2012-02-15 13:40:21 -08:00
2931382a10
Update require-kernel, which fixes #451 .
2012-02-15 13:35:16 -08:00
a8469dcdaa
Merge pull request #450 from drdla/master
...
Improved structure and legibility of file; reduced redundancies
2012-02-15 05:42:36 -08:00
f93fba2511
Improved file structure and CSS coding style; also ran CSSLint on it;
...
To be done: sprite and compress images
2012-02-14 23:49:43 +01:00
546aaae379
Merge branch 'modulize-share'
2012-02-14 12:10:41 -08:00
9837cda257
Correct typo in 363e168561.
2012-02-14 12:09:47 -08:00
ebeb2da275
Merge pull request #422 from jhollinger/fix_listPads
...
HTTP API listPads should return an array
2012-02-14 09:22:18 -08:00
5751a8e434
Merge pull request #352 from cweider/modulize-share
...
Module Sharing
2012-02-14 09:21:45 -08:00
da1fbaad9a
Merge pull request #434 from jhollinger/unknown_message
...
Unknown message
2012-02-14 09:21:20 -08:00
da23a62c49
Remove an unused collab client message
2012-02-13 22:59:12 -05:00
0d3188365a
Bugfix to noColors view option
2012-02-13 22:59:12 -05:00
e0d23e3c5d
Create and use the Security module.
...
Use it to replace code on the client and server side.
2012-02-10 14:52:35 -08:00
363e168561
Share `randomString` method.
...
This simply shares a common implementation and makes no judgements on the validity of its use. The string created is not a secure random number, so some uses of it may not be applicable.
2012-02-10 14:52:34 -08:00
34edba3adf
Share `createCookie` and `readCookie` methods.
2012-02-10 14:52:34 -08:00
7038f9a61d
Drop the `cssmanager_client` module.
2012-02-10 14:52:34 -08:00
f6ac0b1926
Drop the `linestylefilter_client` module.
2012-02-10 14:52:34 -08:00
3581a45491
Drop the `domline_client` module.
2012-02-10 14:52:34 -08:00
4098cbe03b
Drop the `easysync*` modules.
2012-02-10 14:52:34 -08:00
f8f80968ca
Share the `AttributePoolFactory`, `Changeset`, and `contentcollector` modules.
2012-02-10 14:52:34 -08:00
3dabe81989
Create a module to proxy client-side modules.
2012-02-10 14:52:34 -08:00
8e6b451459
Merge pull request #424 from booo/master
...
update clean-css version
2012-02-07 08:02:39 -08:00
edfdb775fe
package.json: upgrade clean-css package
2012-02-07 16:59:19 +01:00
5fde0b548c
HTTP API listPads should return an array
2012-02-06 21:10:37 -05:00
e74c9e1bc9
Merge pull request #420 from cweider/fix-colorpicker
...
Fix colorpicker
2012-02-06 12:56:37 -08:00
b59c8a0c7e
Fix #419 : closeColorPicker is not defined.
...
Events are attached in script, so drop onclick attribute and use button to preserve interactivity.
2012-02-06 12:39:37 -08:00
2f32f5a6aa
IE does not support index of.
2012-02-06 12:36:45 -08:00
1df0cb5c34
Merge pull request #411 from marcelklehr/master
...
Font color isn't white on timeslider
2012-02-06 11:08:53 -08:00
394d542d5e
fix jquery version regex to make @0ip happy
2012-02-06 17:36:59 +01:00
dfa857d606
Updated ueberDB
2012-02-06 17:29:27 +01:00
c130a48d89
Text contrast adjustment for chat time
2012-02-06 16:16:31 +01:00
9e769571fa
Text contrast adjustment for timeslider
2012-02-06 16:00:42 +01:00
John McLear