public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
992 Commits
190 Branches
71 Tags
55 MiB
Commit Graph

992 Commits (706b7b685d7bd05d122580dbc0d4cf3569e665eb)

Author SHA1 Message Date
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ß 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
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
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