Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: square/pad
...
head fork: square/pad
This comparison is big! We’re only showing the most recent 250 commits
Commits on Mar 23, 2011
Egil Moeller Bugfix 72ef825
Egil Moeller Delete objects bc4798d
Egil Moeller Some dojoification of structure 3ba6647
Egil Moeller More code cleanup 7301508
Egil Moeller More code cleanup 0ebb47f
Egil Moeller More code cleanup 41ed24a
Egil Moeller Group move cb01cb9
Egil Moeller Separate click and move for selection dc2825f
Commits on Mar 24, 2011
Egil Moeller Added a mode stack 29b51b5
Egil Moeller Added rectangle creation c304584
Egil Moeller Removed some debugging output 86bf7d4
Commits on Mar 25, 2011
etherpad Print debug message when exiting because of missing directory 6c31bf6
sometestmachine Merge branch 'SketchSpace' of github.com:redhog/pad into SketchSpace a598c01
Egil Moeller Added zoom 1a35e9b
Egil Moeller Merge branch 'SketchSpace' of github.com:redhog/pad into SketchSpace 66e216b
Egil Moeller Bugfix for coodinates 2bfa6f0
Egil Moeller Circles now added same way as rectangles, plus delete using keyboard da4d649
Commits on Mar 28, 2011
Egil Moeller Code cleanup for selection 7146c8a
Egil Moeller Bugfixes for selection move d5f732c
Egil Moeller Bugfixes for selection move fb2a3ec
Commits on Mar 29, 2011
Egil Moeller Moved coord handling to Mode e480444
Axel Liljencrantz Java wrapper around image magic for pdf rasterization and scaling 3de6b03
Egil Moeller Basic color selection a626bbc
Egil Moeller Merge branch 'openingdesign' of git://github.com/liljencrantz/pad int…
…o SketchSpace
368639a
@LarsFronius LarsFronius Wrote an init-script and short README to get etherpad working on redhat 45c5519
Egil Moeller Added an image conversion/resizeing extension for fileUpload fa4c267
Egil Moeller removed some debug code 921cf32
Egil Moeller Removed some temporary debug files df5dc61
Commits on Mar 30, 2011
Egil Moeller Images+zoom (nah, just a troll for now, sorta hardcoded) 588b0b8
Egil Moeller Image upload 15b3dd1
Egil Moeller Working image upload/zoom 35c288b
Egil Moeller Keyboard zoom 8b8364c
Egil Moeller Panning 63a2fdf
Commits on Mar 31, 2011
Egil Moeller More pdf conversion stuff d2a22b0
Egil Moeller Bugfix for pdf page handling 8439358
Egil Moeller Rounding of zoom levels 220bb56
Egil Moeller Don't regenerate images/reload the same images e5d97cf
Egil Moeller Don't move existing shape, just remove it once the new shape is there 8326a57
Egil Moeller Better input event handling ad8c122
Egil Moeller Pan with space button ffb6c43
Egil Moeller Added a 'freehand path' tool, plus fixed a sync bug b92740a
Egil Moeller Freehand tool sort of works 7bc2157
Commits on Apr 01, 2011
Egil Moeller New section based freehand/line/polygon drawing tool 8d51aa0
Egil Moeller Filled/unfilled for all objects f8dfe93
Egil Moeller Straight lines 2fa097b
Egil Moeller Bugfix for pdfzoom 35d818d
Egil Moeller Added cache headers 2d9edc0
Commits on Apr 04, 2011
Egil Moeller We have a working timeslider 6aa3afa
Egil Moeller Bugfix for select image and updates bed0d3e
Egil Moeller Some restructuring to add a simpler combined upload-pdf-and-create-im…
…age button
f3c6fe5
Egil Moeller Added a tool to get nr of pages of an image befaf03
Egil Moeller Code cleanup 48636fb
Egil Moeller Handle multipage pdf images 886cdcb
Egil Moeller Bugfix for zoom f2a9973
Egil Moeller Adde authorship data f3b8056
Commits on Apr 05, 2011
Axel Liljencrantz A few Chrome 7 bug fixes and slight improvements to logging in image …
…conversion script
ecb7e5e
Egil Moeller Merge branch 'SketchSpace' of git://github.com/liljencrantz/pad into …
…SketchSpace
e95536c
Egil Moeller Authorship colors b606615
Commits on Apr 06, 2011
Egil Moeller Some options dialog work 6b56158
Egil Moeller Color input in options dialog works 56aa567
Egil Moeller Authorship color option dddc770
Egil Moeller Bugfix + doFill & doStroke as options 59f2181
Egil Moeller Better layout of options b67c70a
Commits on Apr 07, 2011
Egil Moeller Some more options 59ecfaf
Egil Moeller Cleanup in the toolbar 3dfd570
Axel Liljencrantz Fully working, but very expensive, Z reordering. Only move to front a…
…nd move to back buttons currently supported, move up/down single step is significantly more complicated because of limitations in the dojo API.
f9f3c84
Egil Moeller Simple fix to unbreak the playback 9b53faf
Egil Moeller Merge branch 'SketchSpace' of git://github.com/liljencrantz/pad into …
…SketchSpace

Conflicts:
	etherpad/src/plugins/sketchSpace/static/js/sketchSpaceDesigner/designer/modes/Select.js
bbcb71f
Axel Liljencrantz Support deleting of objects 8d9f630
Egil Moeller Some more ui code cleanup 2345f56
Egil Moeller Some more ui cleanup e52cd2e
Egil Moeller merged the circle tool into an ellipse tool 1dc4fa8
Egil Moeller Shared current image ffd2dfa
Commits on Apr 08, 2011
Egil Moeller Got shared current image to sort of work 67ffec6
Axel Liljencrantz Bug fix for egil eb8288a
Egil Moeller Merge branch 'SketchSpace' of git://github.com/liljencrantz/pad into …
…SketchSpace
a1089b3
Egil Moeller Bug workaround in chrome a720738
Egil Moeller Bugfix for spurious loads from / adf60c1
Egil Moeller Bug workaround for Chrome 8264e18
Axel Liljencrantz Another bug fix for egil 1ac76d2
Egil Moeller Removed some old junk code c9133e9
Egil Moeller Merge branch 'SketchSpace' of git://github.com/liljencrantz/pad into …
…SketchSpace
6e1c3c2
Egil Moeller Bugfix for timeslider cdab84f
Egil Moeller Got authorship colors to work in timeslider 692af48
Egil Moeller Some code layout cleanup db77ece
Egil Moeller Some code layout cleanup 5b56ebc
Egil Moeller Some more code layout cleanup 2ee01f5
Egil Moeller Some more code reorganization 77afc7a
Egil Moeller Resizing of editing window e12cc18
Egil Moeller Bugfix for timeslider c37d5ec
Egil Moeller Bugfixes for timeslider 54afbab
Egil Moeller Disabled the editing controls for the timeslider 2d03790
Axel Liljencrantz Move up/down now working a850b8c
Egil Moeller Bugfixes for timeslider 8145669
Egil Moeller Merge branch 'SketchSpace' of git://github.com/liljencrantz/pad into …
…SketchSpace
6adf587
Commits on Apr 11, 2011
Egil Moeller Hide editor if it isn't used 80630ac
Egil Moeller Some layout 8f885fd
Egil Moeller Some theme changes to generalize the topbar a bit 61f2ce1
Egil Moeller Maximization handling b4a730f
Egil Moeller Better maximization handling 9fa0a29
Egil Moeller Image enhancements ecd775f
Axel Liljencrantz Working minimal diffs b0e5629
Egil Moeller Merge branch 'SketchSpace' of git://github.com/liljencrantz/pad into …
…SketchSpace
ce7507c
Commits on Apr 12, 2011
etherpad Bugfix for resize 190a942
Dev server Merge branch 'SketchSpace' of github.com:redhog/pad into SketchSpace 7876464
Axel Liljencrantz Fix z order bug d1dbc2f
Egil Moeller Merge branch 'SketchSpace' of git://github.com/liljencrantz/pad into …
…SketchSpace
b519ab1
Egil Moeller Merge branch 'SketchSpace' of github.com:redhog/pad into SketchSpace 3c457c8
Egil Moeller Bugfix for selection matrix bug bcdca2e
Egil Moeller Bugfix 72c547f
Commits on Apr 13, 2011
Egil Moeller ZoomPlus 1aa9998
Egil Moeller Icons for zoom in/out f00b68d
Egil Moeller Use symbolic names for mouse/key bindings 2910968
Egil Moeller Added zoom default, and set the cursor for most operations 619dc2f
Egil Moeller A better outline handling 7aab1c3
Egil Moeller More outline work 29440c6
Egil Moeller More selection 2a62bd5
Commits on Apr 14, 2011
Egil Moeller Bugfix for selection mode 2d72e85
Commits on Apr 26, 2011
Egil Moeller Better defaults 513e8fa
Egil Moeller Added links to other software 4cdb8a0
Egil Moeller ESC to go back to selection mode e41b064
Egil Moeller Bugfix for authorship colors 7e16b83
Egil Moeller Added pan mode c04e747
Egil Moeller Autoapply in selection tool 42dbd86
Egil Moeller Added a separate freehand path tool b03876c
Egil Moeller Add polyline mode 5484ee0
Commits on Apr 27, 2011
Egil Moeller Bugfixes for closed lines ba8fe58
Egil Moeller Some layout 94005c1
Jake Maul Adding etherpad.spec file, for building etherpad RPM e9d3a9d
Commits on Apr 28, 2011
Egil Moeller More layout (moving around editbar icons f6484fe
Egil Moeller More theme generalization 79c88db
Egil Moeller Some more options styling d5a83f2
Egil Moeller Some more OpeningDesign specific styling 193baa6
Egil Moeller Separated out all the OpeningDesign specific styling into a separate …
…plugin
c32377d
Egil Moeller More OD styling 6c74eb1
Egil Moeller User list starts out hidden ab748b0
Egil Moeller Dragable separator between pad and edit area cfc7ab9
Egil Moeller Removed titlebar fb88a61
Egil Moeller Oups, sometimes css precendence isn't that obvious c4289ea
Egil Möller Merged pull request #242 from LarsFronius/master.
Ported init-scripts to Red Hat.
d002b6d
Egil Möller Merged pull request #250 from jakemaul/master.
RPM spec file for RHEL/CentOS systems
c3b045e
Jake Maul moved spec file, altered paths in sysconfig file e73b040
Commits on Apr 29, 2011
Jake Maul spec file changes to match new path, and upstream sources 152bcaa
Jake Maul init.etherpad -> etherpad.init 0eece67
Jake Maul remove now-unused SourceX lines 0dab09e
Jake Maul remove dupe file listings cbe06de
Jake Maul multiple fixes, including dedicated user account 5ff4995
Jake Maul OpenOffice.org dependencies 3b0f4e8
Jake Maul OO.o changes ce8cf47
Jake Maul more OOo changes bb1d513
Jake Maul chmod in spec for etherpad user 5e1c22b
Jake Maul fucked up chmod/chown :/ 51962c1
Jake Maul user account fixes 8f2a025
Jake Maul swapping back in my own init script, as an alternative
can't make it start with daemon, using screen :/
a3aec6c
Jake Maul actually build now d80acb4
Jake Maul pathing fix 5e1375f
Jake Maul no quotes in screen cmd 9d876ff
Jake Maul adding spec file for building Scala as an RPM...
the Etherpad spec in redhat/ has a dependency on a 'scala' package
daabdf7
Egil Möller Merged pull request #252 from jakemaul/master.
RHEL RPM spec file + enough to build
909fafa
Egil Moeller Bug workarounds for Opera 3db95b4
Egil Moeller Adde requirements to a readme... 93c9ccd
Egil Moeller IE workarounds e548490
Commits on May 02, 2011
Egil Moeller Somemore IE fixes ea8185d
Egil Moeller Better link bug workaround f06b983
Egil Moeller Bugfix 83f045a
Egil Moeller Some more styling 63400ff
Egil Moeller Bug workaround for IE 20f1a80
Commits on May 03, 2011
Egil Moeller Merge consecutive zooms withing 1s instead of 500ms 6f27ded
Egil Moeller Removed junk 11d1ca1
Egil Moeller Merge branch 'SketchSpace' of github.com:redhog/pad into SketchSpace fe9ebc5
Egil Moeller New image conversion for PDF, still kind of buggy 2203dbe
Commits on May 04, 2011
Egil Moeller New pdf rendering 203dd9d
Egil Moeller Updated documentation cf1959d
Jake Maul add --cfg option, it was choosing the default one instead of the one …
…specified in /etc/sysconfig/etherpad
5aa6e6e
Commits on May 09, 2011
Egil Moeller Bugfix for running in an iframe 14ad903
Egil Moeller Added some more junk files to gitignore c5a8ef6
Egil Moeller Removed dojo copy from code (see next commit for how this is gonna be…
… done instead)
328aa56
Egil Moeller New system for building plugins e81a2a9
Egil Moeller Use non-built version if in devMode 45a799a
Egil Moeller Bugfix 0d7742e
Commits on May 10, 2011
Egil Moeller Bug workaround for getSize of PDF cac74c0
Egil Moeller Bugfixes for timeslider 1b425f3
Egil Moeller Added a css class to distinguish between a pad and a timeslider view 1ba0f11
Commits on May 11, 2011
Egil Moeller Bugfixed IE by simplifying the sketchspace icon/link format 92dedc0
Egil Moeller Bugfix for msie mouse hopping f4c16dc
Egil Moeller Merge branch 'SketchSpace' of github.com:redhog/pad into SketchSpace 5fe8184
Commits on May 12, 2011
Egil Moeller Made the copyPad plugin able to copy pads with styling and authorship…
… info
99bcc02
Egil Moeller Enable copying an existing pad to create pad default content ee25440
Commits on May 13, 2011
Egil Moeller Removed some customer-specific cludges 57c1316
Egil Moeller Merge branch 'master' of github.com:redhog/pad b1202fb
Egil Moeller Merge branch 'master' of git://github.com/jakemaul/pad 2e6982b
Commits on May 14, 2011
Egil Möller Merge pull request #251 from square/master
Ignore [cmd|ctrl]+s.
bf2a529
Commits on May 16, 2011
Nikola Trandafilovic Sound notification plugin - plays nice litle boing on new message (is…
…sue #177)
eb91467
Egil Moeller Bug workaround 2a865da
Nikola Trandafilovic Documentation on flashplayer for sounds 5dbcea7
Nikola Trandafilovic Added hide button on reconnect dialog (Fixes #203) c409163
Egil Moeller Merge branch 'master' of git://github.com/redhog/pad 557d581
Egil Moeller Merge branch 'master' of git://github.com/elrik/pad 6a66c6e
Egil Moeller Merge branch 'master' of github.com:ether/pad 10abdf4
Commits on May 19, 2011
@sesam sesam Better error message. Fixes #258. bc6c781
@sesam sesam Removing one mention of "etherpad.com" 04866a3
@thomasf thomasf Incorrect change
Revert "Changed init script to match correct path"

This reverts commit 0c7ba51.
5b262f5
@thomasf thomasf Merge branch 'master' of github.com:thomasf/pad 2c4d593
Egil Möller Merge pull request #261 from thomasf/5b262f59e9ab03cf0532184da468442d…
…42bcf61a

This seems to be to be a bad commit.
5e5dfa6
@thomasf thomasf Merge branch 'master' of https://github.com/ether/pad 73dc4d5
@thomasf thomasf Do not overwrite etherpad.local.properties if it already exists 313f4b6
Commits on May 20, 2011
@nanobug nanobug Edited etherpad/src/themes/nano/default/templates/pad/pad_body2.ejs v…
…ia GitHub
749d875
@nanobug nanobug Added missing id refered to from javascript (Invite Mail). 7d86585
Commits on May 21, 2011
Egil Möller Merge pull request #264 from nanobug/patch-1
Added missing id refered to by javascript
ed78dc5
Commits on May 23, 2011
@Pita Pita Merge pull request #262 from thomasf/master
Debian packaging suggestion: Don't overwrite /etc/etherpad/etherpad.local.properties if it already exists.
38318ff
sMesHer just format d6247fe
sMesHer Include captcha service for request account 513c16d
Commits on May 24, 2011
Egil Moeller Minimal selection size for zoom-to-selection to lessen chance of mist…
…akes
9ce1263
Egil Moeller Better marquee handling for selection and zoom a9f5c6f
@Pita Pita Merge pull request #265 from nanobug/patch-2
Added missing id refered to from javascript (Invite Mail).
9f16db2
@Pita Pita Merge pull request #233 from smesher/master
A better patch for the admin bug on non-pro-accounts
1167560
Commits on May 25, 2011
Egil Moeller Better selection tool beed53d
Egil Moeller Bugfix for getSize for pdfs with different page formats for each page 44ab61a
Commits on May 31, 2011
Egil Möller Merge pull request #269 from redhog/master
Bugfixes for sketchSpace plugin
84b081c
@randyho-kk randyho-kk modifications to support cygwin building and running. credit goes to …
…gyokuro for his work in getting earlier pad versions to build with cygwin.
a86ced4
Commits on Jun 01, 2011
@JohnMcLear JohnMcLear Merge pull request #270 from kingkaeru/master
Modifications to support cygwin
b9857b9
Commits on Jun 21, 2011
@Pita Pita This small fix reduces the load time of a 19k revisions pad from 2 mi…
…nutes to 20s, cause we skip creating rough changests biger then 1k
4e53d69
Commits on Jun 24, 2011
@sigmike sigmike fixed missing '[[' when dash is the default shell a742886
@JohnMcLear JohnMcLear Merge pull request #279 from ouvrages/master
fixed missing '[[' when dash is the default shell
2fc6b66
Commits on Jun 30, 2011
@johnuren1980 johnuren1980 Added errorMessage variable declaration to prevent "reconnect" calls …
…causing a java exception
e0d6b58
Commits on Jul 13, 2011
sMesHer Bugfix #239: Remove max height in ace b2489c5
@absynce absynce Add support for smtp starttls (required for gmail as smtp server) - n…
…ew config: config.smtpStartTls, default: false
26cb49d
@Yuuji Yuuji Bugfix: pro account admin pages are now secured (Bug #268) 823f255
Commits on Jul 14, 2011
Egil Möller Merge pull request #283 from Yuuji/admin_rights_268
Bugfix: pro account admin pages are now secured (Bug #268)
0a5a397
Egil Möller Merge pull request #282 from Yuuji/maxlines_bug239
Bugfix #239: Remove max height in ace
f13c911
Egil Möller Merge pull request #280 from johnuren1980/master
pad_control.js change to fix a bug found in my instance of Etherpad.
3091dd9
@absynce absynce Merge remote-tracking branch 'upstream/master' d6f48ae
@Gared Gared add function to delete public pads as etherpad admin 94b67ae
Egil Möller Merge pull request #285 from Gared/master
Delete pads
bd3b396
Commits on Jul 18, 2011
Egil Möller Merge pull request #284 from absynce/master
Add TLS support to SMTP server configuration
fbb9287
Commits on Aug 14, 2011
@btuduri btuduri Add debconf messages french translation. e1363c3
Egil Möller Merge pull request #291 from btuduri/master
Deconf french po.
f25ffef
Commits on Sep 05, 2011
@Gared Gared Fixed error when opening "Application Configuration" on pro-pads 4b53666
@JohnMcLear JohnMcLear Merge pull request #292 from Gared/patch-1
Fixed error when opening "Application Configuration" on pro-pads
94d5b2d
Commits on Oct 03, 2011
Francois Marier Make sure the /var/log/etherpad directory always exists (issue #140)
Prior to this change, reconfiguring the package would delete the
/var/log/etherpad directory (see prerm file) and not recreate it
afterwards.
b7ad00c
@JohnMcLear JohnMcLear Merge pull request #294 from fmarier/issue140
Make sure the /var/log/etherpad directory always exists (issue #140)
f91170a
Commits on Oct 21, 2011
Francois Marier Resurrect missing images
These two images were removed in 8f38b84
but are still used here:

  src/themes/nano/js/pad2.js
  src/themes/micro/js/pad2.js
  src/static/js/pad2.js

This was causing a bunch of 404s to show up in Firebug.
da9bcf7
@JohnMcLear JohnMcLear Merge pull request #296 from fmarier/missing_images
Resurrect missing images
461cd89
Francois Marier Fix "Share this pad" button (issue 288)
This is just applying the fix that erdgeist put on issue 293.
a4817ed
@sesam sesam Merge pull request #297 from fmarier/issue_288
Fix "Share this pad" button. Closes 288. Closes 293.
233228d
@sesam sesam .gitignore for favicon.ico and robots.txt -- the default files can co…
…me along on first checkout but should then stay out of the way from git-status
5cfe2b1
@sesam sesam spelling and readability: format Comet Stats in milliseconds 4360f3b
Commits on Nov 12, 2011
@JohnMcLear JohnMcLear Fixes ether#301 7377591
Commits on Jan 05, 2012
@crazybob crazybob Merged from upstream. 71cd08e
@crazybob crazybob Fixed path problem in sketchSpace build. Added Square-specific instal…
…lation instructions.
74c9e9d