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

3487 Commits (toolbarItemsInSettings)

Author SHA1 Message Date
John McLear 8836981e32 expose broadcast slider so plugins can interact with it 2013-04-09 15:55:14 +01:00
John McLear 90c5b26e89 keep integrity on paste and better styling but new lists dont reset counter 2013-04-09 14:29:55 +01:00
John McLear 2e76bd4e50 working but then create a second list, it will be stupid, SIGH 2013-04-09 01:22:09 +01:00
John McLear 7885c410b5 Merge branch 'develop' of github.com:ether/etherpad-lite into keep-list-order-on-paste 2013-04-09 00:52:04 +01:00
John McLear bfa233ba04 kudos to quenenni for some working CSS 2013-04-09 00:46:13 +01:00
John McLear 70a25964b6 make sure elements are supported, still doesn't assign numbers properly 2013-04-08 23:32:04 +01:00
John McLear 49cff88a48 semi working 2013-04-08 23:03:19 +01:00
John McLear 7098ba49f3 Merge pull request #1722 from mluto/remove-top-console-log-in-collab-client 
use `parent.parent` instead of `top` in `collab_client.js`
 2013-04-08 14:09:36 -07:00
mluto dfc49df52d use `parent.parent` instead of `top` in `collab_client.js`, since `top` breaks embedding when a pad is embedded (same origin policy) 2013-04-08 22:58:34 +02:00
John McLear bf93500214 some polish for a turd 2013-04-08 19:50:52 +01:00
John McLear 946289c221 temp patch for 1652 2013-04-08 19:46:45 +01:00
John McLear 99dff9c4e5 Merge pull request #1720 from ether/remove-draggable 
remove draggable which was used for dragging users in the userbox
 2013-04-08 10:05:31 -07:00
John McLear 7728d5b321 remove draggable which was used for dragging users in the userbox 2013-04-08 17:23:03 +01:00
John McLear 12bc98af7e Merge pull request #1716 from ether/only-redraw-existing-lines 
only try to redraw the line height of lines that exist..
 2013-04-08 08:44:48 -07:00
John McLear d8eb0ba7ea Merge pull request #1718 from ether/fix/plugins-multi-install 
pluginfw/installer: Only restart the server when all tasks have finished
 2013-04-08 08:05:29 -07:00
Marcel Klehr 324b9b1f5f pluginfw/installer: Only restart the server when all tasks have finished 
fixes #1685
 2013-04-08 16:14:03 +02:00
John McLear 3cdb8131ce Actually update windows download link 
Need to remember to do this on release..
 2013-04-08 03:43:34 +02:00
John McLear f135f79d13 only try to redraw the line height of lines that exist.. 2013-04-07 19:06:15 +01:00
John McLear ffc8f61a2f remove cruft 2013-04-07 18:44:13 +01:00
John McLear 6c47e29e07 restore PMH original 2013-04-07 18:43:49 +01:00
John McLear 12a2da2884 attempting to get right client authorid sent with changeset 2013-04-07 18:40:55 +01:00
Siebrand Mazeland 555be31eab Localisation updates from http://translatewiki.net. 2013-04-07 17:11:22 +00:00
John McLear 85c68b1f51 rewrite author to actual author on changes 2013-04-07 16:28:28 +01:00
Siebrand Mazeland 5b1de1421c Localisation updates from http://translatewiki.net. 2013-04-07 10:36:57 +00:00
John McLear 069319fda1 Merge branch 'release/1.2.91' 2013-04-06 14:40:02 +01:00
John McLear 7492fb18a4 version bump 2013-04-06 14:29:21 +01:00
John McLear 288cfb0dc5 Merge pull request #1712 from goldquest/dev_imp-browser-detect-fix 
import broken / missing browser detection. fixes #1695
 2013-04-05 14:04:08 -07:00
goldquest cbf0535f97 browser detection was dropped in jquery 1.9, so we have to add the browser detection js file 2013-04-05 15:35:03 +02:00
Marcel Klehr 38f54057a0 Merge pull request #1711 from ether/fix/two-part-locales 
html10n.js: Finally fix two-part locale specs
 2013-04-05 05:20:44 -07:00
Marcel Klehr 402a4b7b3e html10n.js: Finally fix two-part locale specs 
fixes #1706
 2013-04-05 14:18:46 +02:00
John McLear 7cbce4543e Merge pull request #1710 from ether/remove-chat-trans 
no need for the language string on that div
 2013-04-04 19:42:02 -07:00
John McLear 6dc4ddd29e no need for the language string on that div 2013-04-05 03:38:47 +01:00
John McLear 883be3d48d begin by adding some template css 2013-04-05 02:21:56 +01:00
John McLear 7805e83b7f Merge pull request #1705 from ether/ctrl-s-top 
dont use top, use the scheduler
 2013-04-04 11:02:40 -07:00
John McLear 38f7253d31 Merge pull request #1704 from ether/readme2 
Updated README, it's about time we let go.
 2013-04-04 11:02:27 -07:00
John McLear 5fb5b6c7af Linux clarity 2013-04-04 18:23:56 +01:00
Bernard `Guyzmo` Pratz 0e5a89becc added full comments to the new API functions. 
Signed-off-by: Bernard `Guyzmo` Pratz <guyzmo+github@m0g.net>
 2013-04-04 19:07:11 +02:00
Bernard `Guyzmo` Pratz 3df3b90bd9 fixed missing API functions declaration in API ; fixed a typo in APIHandler. 
Signed-off-by: Bernard `Guyzmo` Pratz <guyzmo+github@m0g.net>
 2013-04-04 19:06:51 +02:00
John McLear 43f8778241 hrm, maybe this makes sense to a wider audience 2013-04-04 15:35:19 +01:00
John McLear 380821781f dont use top, use the scheduler 2013-04-04 02:25:19 +01:00
John McLear a3136d778d animated image prolly wont work 2013-04-04 01:56:36 +01:00
John McLear a677286a40 line breaks 2 2013-04-04 01:24:09 +01:00
John McLear 2003dd8327 line breaks 2013-04-04 01:22:46 +01:00
John McLear 4f07f829db new readme 2013-04-04 01:20:46 +01:00
John McLear 78d1c5746f Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2013-04-04 01:00:54 +01:00
John McLear 35d84144db changelog and package file 2013-04-04 00:59:51 +01:00
John McLear 29beda8ebd Merge pull request #1703 from mluto/kick-users-with-invalid-session-2 
Kick the user if the deleteSession-API is called
 2013-04-03 06:40:50 -07:00
mluto c5b4e4934d Kick the user if has already successfully authenticated but his session became invalid later 2013-04-03 11:19:26 +02:00
John McLear f503f28b08 Merge pull request #1699 from ether/fix-custom 
Fix custom obj msg broadcaster to pads
 2013-04-02 15:24:42 -07:00
John McLear 5855e3d5bf weird styling 2013-04-02 23:17:25 +01:00