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

1198 Commits (a5366a0a161cf1ecfc8e9beb1da8d322402628f1)

Author SHA1 Message Date
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
Egil Moeller b20b86cdc8 Partial bugfix 2012-02-28 17:52:30 +01:00
Stefan 'Gared 051930e2c7 Added errorId to error message and shows error on screen when pad dies on loading 2012-02-28 13:38:29 +00:00
Chad Weider af4bd5ca65 Add a hack to prevent redirect of requests for `/static/js/pad` to `/static/js/pad.js`. 2012-02-27 23:14:49 -08:00
0ip 16f1b53044 Merge pull request #514 from 0ip/cssfix 
CSS improvements
 2012-02-27 13:47:05 -08:00
0ip a17a04182a fix weird looking input [IE7] 2012-02-27 22:40:47 +01:00
0ip d8a0584768 more subtle ui feedback when pressing buttons 2012-02-27 22:29:21 +01:00
0ip eddbc950dd combined css class 2012-02-27 22:06:46 +01:00
0ip 5bfde917b0 revert viewport to fix #508 2012-02-27 22:04:03 +01:00
Peter 'Pita' Martischka 599c8c7c12 update dependencies 2012-02-27 19:55:43 +01:00
Peter 'Pita' Martischka 5888f5ff7d @cweider, only Chuck Norris can compute in json files 2012-02-27 19:54:54 +01:00
Peter 'Pita' Martischka 611cfbd6fa Merge pull request #468 from cweider/minify-simplify 
Minify Simplification
 2012-02-27 10:00:18 -08:00
Peter 'Pita' Martischka bf42359669 Merge branch 'master' of github.com:Pita/etherpad-lite 2012-02-27 17:34:11 +01:00
Peter 'Pita' Martischka d00be5b817 Removed all window.unload event handlers. This kind of fixes #200 2012-02-27 17:33:27 +01:00
John McLear fec8f8a142 Merge pull request #511 from Gared/master 
Added cookie to save option showing author colors and fixed some spelling mistakes
 2012-02-27 07:35:11 -08:00
Stefan 'Gared c54d47e1c6 Added cookie to save option showing author colors 2012-02-27 15:24:36 +00:00
Stefan 'Gared d2cd1213ec Merge branch 'master' of http://github.com/Pita/etherpad-lite 2012-02-27 15:22:15 +00:00
Peter 'Pita' Martischka 0c77052698 Fixed #299 and #338 2012-02-27 14:20:33 +01:00
Peter 'Pita' Martischka 973aad5c96 Fix doesPadExist check 2012-02-27 14:13:47 +01:00
Peter 'Pita' Martischka da2b456b5b Merge branch 'master' of github.com:Pita/etherpad-lite 2012-02-27 00:23:14 +01:00
Peter 'Pita' Martischka ed8aff22d4 restart abiword on crash and give the user feedback about bad import files 2012-02-27 00:22:53 +01:00