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

1631 Commits (dae0cbfb53cf4fd4b94e0e99100adf2c78650131)

Author SHA1 Message Date
0ip 4b272fe2e1 Tidied up highlighting for currently opened module 2012-04-29 01:00:31 +02:00
0ip c11df112e8 templates/plugins.html Fixed relative paths 2012-04-28 22:00:15 +02:00
johnyma22 dce07ceeed Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop 2012-04-25 17:51:28 +01:00
Egil Moeller c173ebe197 Merge branch 'master' into timeslider-realtimeupdate+readonly-pads 2012-04-25 17:51:03 +02:00
John McLear 83648481c3 Merge pull request #671 from fourplusone/fix/baseurl 
baseURL/fixing #670
 2012-04-25 07:01:53 -07:00
Matthias Bartelmeß 513deef768 added baseURL export to pad.js, timeslider.js, plugins.js, fixing #670 2012-04-25 10:23:58 +02:00
Egil Moeller e559ef5640 Disable design mode in readonly pad 2012-04-23 16:41:41 +02:00
Egil Moeller ba3430ebb7 Corect ReadOnly link 2012-04-23 16:20:55 +02:00
Egil Moeller 480d0b8e25 ReadOnly pad handling 2012-04-23 16:18:14 +02:00
Egil Moeller ed7e254417 Disconnect handling and cleanup of unused code 2012-04-23 14:47:07 +02:00
Egil Moeller e5a22423bb Fixed timedelta problem 2012-04-23 14:20:17 +02:00
Egil Moeller 1faae5b756 Timeslider autoupdate on pad change 2012-04-23 13:29:27 +02:00
Egil Moeller 583743a3f9 Restored saved revision support 2012-04-23 12:58:04 +02:00
Egil Moeller 914d79ad20 Unified timeslider and pad editing protocol / component 2012-04-23 12:52:30 +02:00
johnyma22 3d862b8bde Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop 2012-04-22 14:51:28 +01:00
Matthias Bartelmeß 18d0c81181 adding padutils to padmodals 2012-04-21 14:57:22 +02:00
Matthias Bartelmeß a557f2414e cssManager top is not used, so drop it 2012-04-21 13:47:11 +02:00
John McLear d554420f57 Remove my fix and allow @redhogs to be the proper one.. (even though it's exactly the same thing) 2012-04-21 01:23:13 +02:00
John McLear 3798f53f94 Merge pull request #660 from redhog/master 
Unbreak last pull request (I forgot a dependency)
 2012-04-20 16:21:04 -07:00
Egil Moeller d08f3ff5ee Bugfix dependencies 2012-04-21 01:17:27 +02:00
Matthias Bartelmeß 9d9b7b7b47 Merge branch 'develop' into feature/cleaner_code 2012-04-21 00:34:32 +02:00
johnyma22 937524ab8c Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop 2012-04-20 23:16:19 +01:00
John McLear 16edda7d46 luke warm fix. 2012-04-21 00:16:10 +02:00
johnyma22 ee77257636 Merge branch 'develop' of https://github.com/Pita/etherpad-lite into develop 2012-04-20 23:13:31 +01:00
John McLear a5210ab27d Merge pull request #647 from etinquis/fixes 
Fix + New Hook
 2012-04-20 15:10:40 -07:00
Matthias Bartelmeß 8fefb551fc less verbose startup, better log messages at startup 2012-04-20 22:44:10 +02:00
Matthias Bartelmeß 7f50e8f551 server.js can be called from console. 2012-04-20 22:40:33 +02:00
Matthias Bartelmeß c90ef5aeb8 default dirty.db to current pwd, so no new directory has to be created 2012-04-20 22:39:16 +02:00
Matthias Bartelmeß e9fc16a974 warn if dirty db is used 2012-04-20 17:03:37 +02:00
Matthias Bartelmeß 90bbf169b2 allow startup without settings file 2012-04-20 17:03:26 +02:00
Matthias Bartelmeß 6fc45d6252 added etherpad-lite to "bin" in package.json 2012-04-20 17:00:32 +02:00
John McLear b6be00c3ab Merge pull request #659 from redhog/master 
Oups, forgot a debug print in there in the last pull request
 2012-04-20 06:12:34 -07:00
Matthias Bartelmeß 9691f02765 removing Minify.js.rej 2012-04-20 15:12:20 +02:00
Egil Moeller 9a67a3a1db Removed debug print 2012-04-20 15:08:50 +02:00
John McLear 0a9fcc267f Merge pull request #658 from redhog/master 
Bugfixes for when plugins are installed as dependencies for other plugins
 2012-04-20 05:56:57 -07:00
Egil Moeller 72c972b256 Bugfix for recursive dependency-installation and paths 2012-04-20 14:37:53 +02:00
Matthias Bartelmeß 89ab73c868 removing commented out functions from cssmanager.js 2012-04-20 14:25:07 +02:00
Matthias Bartelmeß 8593b1905c getRepHTML seems to be unused. Removing 2012-04-20 14:24:44 +02:00
Matthias Bartelmeß 709a3b1dbe removing debug code in collab_client.js 2012-04-20 13:34:35 +02:00
Matthias Bartelmeß ab7f7506b9 removed unused functions in collab_client 2012-04-20 13:32:43 +02:00
Matthias Bartelmeß 07ee836946 set view zoom is unused 2012-04-20 12:19:09 +02:00
Matthias Bartelmeß e661f653b1 sharebox and Feedback are not used. Removing them 2012-04-20 12:15:09 +02:00
Matthias Bartelmeß 23bbe4ab5a undo-xpopup seems to be unused 2012-04-20 12:04:10 +02:00
Matthias Bartelmeß f809b0d6c8 removing de-facto noop 2012-04-20 12:03:11 +02:00
0ip a743112170 Fix #626, Plugins don't work if pad is on a subdir 2012-04-19 19:44:44 +03:00
John McLear 4a7ab12859 Merge pull request #649 from rassie/patch-1 
Corrected color picker: `jQuery(...).css('background-color')` returns…
 2012-04-19 08:37:09 -07:00
John McLear 9fe8a7530d Merge pull request #641 from 0ip/highlight_module 
Fix | Highlight currently opened module
 2012-04-19 08:23:51 -07:00
John McLear 064568d169 Merge pull request #653 from 0ip/plugins_page 
Restore plugin manager UI
 2012-04-19 08:18:49 -07:00
0ip 31909f6e60 Added viewport 2012-04-19 17:04:44 +02:00
0ip ef88d2798e Restore overwritten plugin manager UI 2012-04-19 17:00:29 +02:00