goldquest
|
b08a6e522f
|
IE8 complains, if catch block is missing
|
2013-04-17 16:51:21 +02:00 |
|
Marcel Klehr
|
146c75e703
|
Remove console.log in content collector
fixes #1731
|
2013-04-17 16:37:45 +03:00 |
|
John McLear
|
a3ed936d5f
|
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
|
2013-04-16 00:12:57 +01:00 |
|
John McLear
|
e7a80b7b77
|
still express is stuck at 3.1.0
|
2013-04-16 00:12:11 +01:00 |
|
John McLear
|
2e0c8dbc4f
|
Merge pull request #1745 from ether/master
Pull tags
|
2013-04-15 16:05:03 -07:00 |
|
John McLear
|
c19b7b8f55
|
Merge pull request #1743 from ether/dont-crash-on-export-abiword
catch error on export
|
2013-04-15 15:32:14 -07:00 |
|
John McLear
|
f987299a5d
|
catch error on export
|
2013-04-15 23:01:08 +01:00 |
|
John McLear
|
fac4058e83
|
Merge pull request #1739 from ether/update-connect
Update connect and express
|
2013-04-15 11:09:34 -07:00 |
|
John McLear
|
9b952da692
|
Merge branch 'develop' of github.com:ether/etherpad-lite into update-connect
|
2013-04-15 19:07:01 +01:00 |
|
John McLear
|
9a863824c9
|
update connect and express
|
2013-04-15 19:06:22 +01:00 |
|
John McLear
|
0b2e1a0c31
|
Update .travis.yml
|
2013-04-15 17:33:41 +02:00 |
|
John McLear
|
a670158e78
|
Update .travis.yml
|
2013-04-15 17:33:20 +02:00 |
|
John McLear
|
c5a58d392c
|
Merge pull request #1737 from ether/develop
Patch allow spam to be sent :|
|
2013-04-15 06:38:42 -07:00 |
|
John McLear
|
9b7dca5427
|
Merge pull request #1736 from ether/dont-avoid-spam
undo avoid changeset spam as it breaks functionality
|
2013-04-15 06:37:49 -07:00 |
|
John McLear
|
4989f56673
|
undo avoid changeset spam as it breaks functionality
|
2013-04-15 14:36:25 +01:00 |
|
John McLear
|
2872a824de
|
Merge branch 'release/1.2.10'
|
2013-04-15 12:24:44 +01:00 |
|
John McLear
|
2c8699506d
|
push express back as it breaks sessions
|
2013-04-15 12:21:10 +01:00 |
|
John McLear
|
c3c7a3d128
|
Merge pull request #1721 from ether/dont-send-same-cs-spam
temp patch for #1652
|
2013-04-15 04:20:05 -07:00 |
|
Siebrand Mazeland
|
8a2977381f
|
Localisation updates from http://translatewiki.net.
|
2013-04-14 11:54:26 +00:00 |
|
John McLear
|
08b54ef61b
|
Merge pull request #1732 from ether/authorID-2
Correct authorID in Changeset on modification
|
2013-04-12 06:36:39 -07:00 |
|
John McLear
|
337179fddd
|
remove console logs and cruft
|
2013-04-12 14:34:07 +01:00 |
|
Marcel Klehr
|
f4de7f6a90
|
Use a string instead of an array!
|
2013-04-11 21:23:38 +02:00 |
|
Marcel Klehr
|
49013b18c7
|
We need to replace all new author attribs with thisSession.author, in case someone copy/pasted or otherwise inserted other peoples changes
|
2013-04-11 21:12:59 +02:00 |
|
John McLear
|
b137f301e2
|
MAGIQ
|
2013-04-11 18:34:40 +01:00 |
|
Marcel Klehr
|
e8d953a15c
|
Use the correct version number
|
2013-04-11 19:08:07 +03:00 |
|
John McLear
|
f9d23767f8
|
Merge pull request #1709 from ether/keep-list-order-on-paste
When you paste into a numbered list, keep some integrity
|
2013-04-11 09:07:22 -07:00 |
|
John McLear
|
a81a40d75b
|
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
|
2013-04-11 17:05:24 +01:00 |
|
John McLear
|
f4123d2904
|
bump v and readme
|
2013-04-11 17:04:54 +01:00 |
|
John McLear
|
dc6e2e13fe
|
Merge pull request #1723 from ether/expose-broadcastslider
expose broadcast slider so plugins can interact with it
|
2013-04-11 09:03:43 -07:00 |
|
Marcel Klehr
|
594757cc47
|
html10n.js: Don't break in getDirection if language hasn't been set
fixes #1724
|
2013-04-11 18:51:49 +03:00 |
|
John McLear
|
9581097dc7
|
remove cruft
|
2013-04-11 16:39:25 +01:00 |
|
John McLear
|
1fc906017c
|
final css
|
2013-04-11 16:38:41 +01:00 |
|
John McLear
|
e712f7665d
|
working solution props to dmitryu for making me not be scared of modifying div clases
|
2013-04-11 16:33:03 +01:00 |
|
John McLear
|
df8a31f241
|
Merge pull request #1726 from ether/fix/html10n.js-console-log-shim
Update html10n.js to correctly use the console.log shim
|
2013-04-10 08:57:42 -07:00 |
|
Marcel Klehr
|
c755633f09
|
Update html10n.js to correctly use the console.log shim
fixes #1724
|
2013-04-10 17:56:09 +02:00 |
|
John McLear
|
4a5e63f105
|
Merge pull request #1693 from guyzmo/api_extension
extension of the API (versioned 1.2.8)
|
2013-04-09 14:49:11 -07:00 |
|
John McLear
|
9dfac79107
|
no need to declare var twice
|
2013-04-09 15:58:18 +01:00 |
|
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 |
|