libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
1016 commits 2 branches 0 tags 24 MiB
Commit graph

1016 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Chad Weider
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
Chad Weider
1063a3d036 Account for more spaces and Windows paths. This fixes #456. 2012-02-16 14:19:16 -08:00
Matthias Bartelmeß
bad920e28d fixes #417 and #360 2012-02-16 23:11:52 +01:00
Chad Weider
9ca914f8cd Merge pull request #454 from cweider/fix-common-code 
Fix CommonCode (#451)
 2012-02-15 13:40:21 -08:00
Chad Weider
2931382a10 Update require-kernel, which fixes #451. 2012-02-15 13:35:16 -08:00
Peter 'Pita' Martischka
a8469dcdaa Merge pull request #450 from drdla/master 
Improved structure and legibility of file; reduced redundancies
 2012-02-15 05:42:36 -08:00
drdla
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
Chad Weider
546aaae379 Merge branch 'modulize-share' 2012-02-14 12:10:41 -08:00
Chad Weider
9837cda257 Correct typo in 363e168561. 2012-02-14 12:09:47 -08:00
Peter 'Pita' Martischka
ebeb2da275 Merge pull request #422 from jhollinger/fix_listPads 
HTTP API listPads should return an array
 2012-02-14 09:22:18 -08:00
Peter 'Pita' Martischka
5751a8e434 Merge pull request #352 from cweider/modulize-share 
Module Sharing
 2012-02-14 09:21:45 -08:00
Peter 'Pita' Martischka
da1fbaad9a Merge pull request #434 from jhollinger/unknown_message 
Unknown message
 2012-02-14 09:21:20 -08:00
Jordan
da23a62c49 Remove an unused collab client message 2012-02-13 22:59:12 -05:00
Jordan
0d3188365a Bugfix to noColors view option 2012-02-13 22:59:12 -05:00
Chad Weider
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
Chad Weider
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
Chad Weider
34edba3adf Share createCookie and readCookie methods. 2012-02-10 14:52:34 -08:00
Chad Weider
7038f9a61d Drop the cssmanager_client module. 2012-02-10 14:52:34 -08:00
Chad Weider
f6ac0b1926 Drop the linestylefilter_client module. 2012-02-10 14:52:34 -08:00
Chad Weider
3581a45491 Drop the domline_client module. 2012-02-10 14:52:34 -08:00
Chad Weider
4098cbe03b Drop the easysync* modules. 2012-02-10 14:52:34 -08:00
Chad Weider
f8f80968ca Share the AttributePoolFactory, Changeset, and contentcollector modules. 2012-02-10 14:52:34 -08:00
Chad Weider
3dabe81989 Create a module to proxy client-side modules. 2012-02-10 14:52:34 -08:00
Peter 'Pita' Martischka
8e6b451459 Merge pull request #424 from booo/master 
update clean-css version
 2012-02-07 08:02:39 -08:00
booo
edfdb775fe package.json: upgrade clean-css package 2012-02-07 16:59:19 +01:00
Jordan
5fde0b548c HTTP API listPads should return an array 2012-02-06 21:10:37 -05:00
John McLear
e74c9e1bc9 Merge pull request #420 from cweider/fix-colorpicker 
Fix colorpicker
 2012-02-06 12:56:37 -08:00
Chad Weider
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
Chad Weider
2f32f5a6aa IE does not support index of. 2012-02-06 12:36:45 -08:00
John McLear
1df0cb5c34 Merge pull request #411 from marcelklehr/master 
Font color isn't white on timeslider
 2012-02-06 11:08:53 -08:00
Peter 'Pita' Martischka
394d542d5e fix jquery version regex to make @0ip happy 2012-02-06 17:36:59 +01:00
Peter 'Pita' Martischka
dfa857d606 Updated ueberDB 2012-02-06 17:29:27 +01:00
Marcel Klehr
c130a48d89 Text contrast adjustment for chat time 2012-02-06 16:16:31 +01:00
Marcel Klehr
9e769571fa Text contrast adjustment for timeslider 2012-02-06 16:00:42 +01:00
Marcel Klehr
169bae6cc9 Tweak contrast factor for author colors in editor 2012-02-06 16:00:08 +01:00
Peter 'Pita' Martischka
d7e29dba0d Merge pull request #405 from cweider/remote-modules 
Remote modules
 2012-02-06 03:57:20 -08:00
Peter 'Pita' Martischka
94b5998347 Merge pull request #407 from impulzia/master 
Fix for issue #406 (avoid check ssl certificate in curl with prefixfree)
 2012-02-06 03:35:24 -08:00
Pedro Gracia
7a41cde51f Add -k option in curl to check prefixtree to avoid check ssl certificate 2012-02-06 07:25:36 +01:00
Chad Weider
64ae1c433f Allow modules to be fetched remotely. 2012-02-05 16:59:40 -08:00
Chad Weider
b5ddba8741 Update require-kernel, it includes a patch for relative paths. 2012-02-05 16:59:40 -08:00
Chad Weider
762d39f009 Move scripts to the bottom of the page. 2012-02-05 16:59:40 -08:00