fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,167 Commits 1 Branch 0 Tags 10 MiB
Commit Graph

1167 Commits

Author SHA1 Message Date
Chad Weider ca91c0c403 Correct cache location and guard against bad directories. 2012-03-10 15:27:09 -08:00
Chad Weider ddda347f7a Merge branch 'require-paths' into plugin 
Conflicts:
	node/server.js
	src/static/js/Changeset.js
	src/static/js/ace.js
	src/static/js/ace2_common.js
	src/static/js/ace2_inner.js
	src/static/js/broadcast.js
	src/static/js/changesettracker.js
	src/static/js/chat.js
	src/static/js/collab_client.js
	src/static/js/contentcollector.js
	src/static/js/domline.js
	src/static/js/linestylefilter.js
	src/static/js/pad.js
	src/static/js/pad_connectionstatus.js
	src/static/js/pad_docbar.js
	src/static/js/pad_editbar.js
	src/static/js/pad_editor.js
	src/static/js/pad_impexp.js
	src/static/js/pad_modals.js
	src/static/js/pad_savedrevs.js
	src/static/js/pad_userlist.js
	src/static/js/pad_utils.js
	src/static/js/timeslider.js
	src/static/js/undomodule.js
	src/static/pad.html
	src/static/timeslider.html
 2012-03-10 15:08:09 -08:00
Chad Weider 86d6dde42f Rename javascript path from 'minified' to 'javascripts/src'. 
Also anticipate requirement of libary modules for plugins.
 2012-03-10 14:54:38 -08:00
Chad Weider 7b497b1522 Merge branch 'plugin-fix-require' into plugin 2012-03-10 14:40:28 -08:00
Chad Weider 0d6ec8c04a Minify implements virtual plugins resources. 2012-03-10 14:39:37 -08:00
Chad Weider 1a1f222221 Change paths. 2012-03-10 14:39:37 -08:00
Chad Weider c6b8beabd3 Correct paths to reflect their being libraries. 2012-03-10 14:39:37 -08:00
Chad Weider ca02ca05ae Remove unnecessary line. 2012-03-10 14:39:37 -08:00
Chad Weider 2fd9019792 Remove require code that is unnecessary and/or incorrect. 2012-03-10 14:39:37 -08:00
Chad Weider 648603126b Remove require changes in `pushScriptsTo` method. 
These duplicate `pushRequireScriptTo` at least, but mostly break things.
 2012-03-10 14:39:37 -08:00
Chad Weider ee312672d3 This is duplicated by the contents of static. 2012-03-10 14:39:37 -08:00
Chad Weider 652fffe8ea Upgrade require-kernel for relative path fixes. 2012-03-10 12:09:27 -08:00
Chad Weider 6af869cadd Modules requires use relative paths. 2012-03-10 12:09:27 -08:00
Peter 'Pita' Martischka 7b518eeb2d Fixing client side require, the minify code is completly unused now, very ugly solution 2012-03-04 23:45:33 +01:00
Peter 'Pita' Martischka 8b5925440a Fix configuration of express 2012-03-04 21:23:05 +01:00
Peter 'Pita' Martischka 0e110efe9e fix debugRun 2012-03-04 21:06:37 +01:00
Peter 'Pita' Martischka 9f03e5ec68 Output nicer exceptions in hook call 2012-03-04 20:32:57 +01:00
Peter 'Pita' Martischka 5396cd68db Fix dirty path for windows 2012-03-04 19:50:52 +01:00
Peter 'Pita' Martischka 4e78a6b9cc Fix gitignore for custom files 2012-03-04 19:50:05 +01:00
Peter 'Pita' Martischka 935edbf892 fix dirty path in settings.json 2012-03-04 19:47:35 +01:00
Egil Moeller f6b9b49ab4 Added the rejected/conflicting files as .rej-files so they're not forgotten but resolved manually 2012-03-02 22:02:42 +01:00
Egil Moeller ce5d2d8685 Merge branch 'pita' 
Resolved conflicts:
	.gitignore
	src/static/js/ace.js
	src/static/js/ace2_inner.js
	src/static/js/broadcast.js
	src/static/js/domline.js
	src/static/pad.html
	src/static/timeslider.html

Ignored conflicts (please merge manually later):
	node/server.js
	src/node/utils/Minify.js
 2012-03-02 22:00:20 +01:00
Egil Moeller 6cd391d3fb Fixed timeslider which I broke a few minutes ago 2012-03-01 20:18:03 +01:00
Egil Moeller df531a7b2b Made ace actually use the new hooks system, and removed remnants of old system 2012-03-01 19:22:02 +01:00
Egil Moeller 81440cd856 Removed old pluginfw stuff 2012-03-01 19:00:58 +01:00
Egil Moeller 73aa0687b8 Client side hooks are now loaded and works 2012-03-01 18:45:02 +01:00
Egil Moeller 35626df77b Send plugin data to client 2012-02-29 16:05:44 +01:00
Egil Moeller c9797a3714 Bugfix for dependency data circle 2012-02-29 16:05:25 +01:00
Egil Moeller 30b5a92bd0 Bugfix for dependency 2012-02-29 16:04:57 +01:00
Peter 'Pita' Martischka 6fd73ecfda Merge pull request #524 from marcelklehr/master 
Dynamic text color (adding dynamic link text color)
 2012-02-29 06:02:46 -08:00
John McLear b148a42946 Update README.md 2012-02-29 13:45:42 +00:00
Marcel Klehr f5f82a7637 Rework dynamic text contrast 
-Remove hard coding of default text color
-add dynamic link text contrast
 2012-02-29 14:21:35 +01:00
Marcel Klehr 173e7c8f27 Extend colorutils 
Add color invertion and calculation of complementary colors.
 2012-02-29 14:16:20 +01:00
John McLear 0a13615254 Merge pull request #523 from 0ip/labelfix 
fixes #520
 2012-02-29 04:20:44 -08:00
0ip 43e90c7470 cross-browser compatible solution + removed some resizing stuff 2012-02-29 13:17:35 +01:00
0ip cefda46a44 fixes #520, sideeffect: looks bad now using Chrome 2012-02-29 12:54:44 +01:00
Peter 'Pita' Martischka d868fd73d4 Merge pull request #521 from cweider/fix-minify 
Fix minify
 2012-02-29 01:49:45 -08:00
Chad Weider 07823ddf26 Update to yajsml with more windows support. 2012-02-28 19:40:10 -08:00
Chad Weider 82652dffda Revert "Add a hack to prevent redirect of requests for `/static/js/pad` to `/static/js/pad.js`." 
This reverts commit af4bd5ca65.
 2012-02-28 19:00:27 -08:00
Chad Weider 45b7cafca4 Don't let filenames be changed to Windows' backslash-notation. 2012-02-28 18:29:23 -08:00
Chad Weider 45ba5d60dc Windows does not like IP addresses of 0.0.0.0. 2012-02-28 18:13:10 -08:00
Chad Weider a7c009d0c9 Status code should not be assumed. 2012-02-28 18:09:33 -08:00
Chad Weider 118e7928b9 Headers should only be set after file is written. 2012-02-28 18:08:03 -08:00
Chad Weider 24a26953a7 Account for undefined argument. 2012-02-28 18:06:30 -08:00
Chad Weider 96ee77d85b Check error not stats. 2012-02-28 18:05:27 -08:00
0ip 280e07d737 Merge pull request #519 from 0ip/cssfix2 
CSS improvements 2
 2012-02-28 12:41:27 -08:00
0ip b507f48a34 typos 2012-02-28 21:37:10 +01:00
0ip 5db8c5bda9 properly display number of users when more than 99 are on a pad + added ids + aligned chatlabel 2012-02-28 21:21:59 +01:00
Egil Moeller a894fcd4f9 Removed CommonCode entierly 2012-02-28 21:19:10 +01:00
Egil Moeller cf191df0b8 So simple, yet so hard to find. Finally I found you, oh error caused by the new require usage... 2012-02-28 21:14:31 +01:00