6597c287e2
Localisation updates from https://translatewiki.net .
2014-04-06 17:03:18 +00:00
156200d0fd
Localisation updates from https://translatewiki.net .
2014-03-31 21:29:38 +00:00
31c45bc9b8
Merge pull request #2126 from ether/fix/toolbar-timeslider-button
...
Toolbar: Fix timeslider button
2014-03-31 19:51:03 +01:00
6b5e3ea3a5
Toolbar: Fix timeslider button
...
Wouldn't play nice with url params in document.location
fixes #2124
2014-03-31 20:50:01 +02:00
991f0f8c26
Merge pull request #2123 from ether/master
...
Update README.md
2014-03-31 20:47:11 +02:00
c3a6a2374c
Update README.md
...
Added support for node v0.11 in the installation description
2014-03-31 02:05:52 +02:00
874181ce3b
Merge branch 'master' into develop
2014-03-30 15:12:47 +02:00
c6d13a965c
Merge branch 'release/1.4.0'
2014-03-30 15:11:50 +02:00
a7671a690b
docs: update api version
2014-03-30 15:10:29 +02:00
de3a60ee2a
Merge pull request #2120 from ether/fix/timeslider-editbar
...
Add a customizable toolbar for timeslider
2014-03-30 12:25:07 +01:00
33ecc1d8df
Update docs
2014-03-30 13:08:26 +02:00
80e45e1192
Fix redo toolbar command, again.
2014-03-30 13:05:51 +02:00
6054cda473
Create a customizable timeslider toolbar
2014-03-30 13:02:41 +02:00
867e40533a
Fix timeslider export dropdown
2014-03-30 12:30:18 +02:00
54bf17bfea
fix error on focus remove from import/export
2014-03-29 13:32:34 +00:00
c1ef3f4801
Merge pull request #2117 from ether/doc/asset-css-suit-up
...
Polish the styles of our docs a little
2014-03-27 17:09:50 +00:00
3a82cba4c5
Polish the styles of our docs a little
2014-03-27 18:08:55 +01:00
56fd078469
Merge pull request #2092 from webzwo0i/fix-crash-with-queued-messages
...
Fix crash with queued messages
2014-03-26 19:39:19 +00:00
e23af7e439
changelog, package file and fix for redo
2014-03-26 15:44:04 +00:00
dc1a33bead
Merge pull request #2111 from ether/quickfix/req_cs-bounds-check
...
Fix REQ_CS rev boundary check
2014-03-20 20:35:48 +00:00
f6f319960d
Fix REQ_CS rev boundary check
...
fixes #2096
2014-03-20 21:34:01 +01:00
ba38bc998e
Localisation updates from https://translatewiki.net .
2014-03-18 12:14:27 +00:00
e1fa43e640
quick formatting clean up
2014-03-17 19:20:32 +00:00
8cd9b98b76
Merge pull request #2110 from ether/modularize-toolbar
...
Modularize toolbar
2014-03-16 17:19:22 +00:00
a69793a203
Add docs for toolbar controller and pad_editbar
2014-03-16 15:43:38 +01:00
da5970dda3
Refactor toolbar.js to use consistent naming
2014-03-16 15:14:21 +01:00
51900cbf67
Toolbar: Allow custom dropdowns for plugins
2014-03-16 14:04:12 +01:00
a369347d86
Merge branch 'pr/1579' into toolbar-test
...
Conflicts:
settings.json.template
src/static/js/pad_editbar.js
2014-03-16 13:30:22 +01:00
44f8b43719
Update CONTRIBUTING.md
2014-03-15 17:26:02 +00:00
cd0f5742f6
Merge pull request #2108 from goldquest/dev_deleteSessionBug
...
Session deletion error, when group2session/author2session are not available
2014-03-14 17:22:46 +00:00
a00c505403
Sometimes, the author2session / group2session don't exist anymore, but the session does.
...
It should be possible to delete a session, if they don't exist
2014-03-14 17:50:37 +01:00
cc03f5374c
Merge pull request #2089 from dmitryuv/changesetslib-fixes
...
fix for infinite loop on bad changeset
2014-03-13 14:39:19 +00:00
e12093eb19
Merge pull request #2080 from ether/ignore-ctrl-pageup
...
allow tabs to be cycled when focus is in editor
2014-03-13 00:49:20 +00:00
96d06abac0
Localisation updates from https://translatewiki.net .
2014-03-12 12:42:31 +00:00
26869d29b3
Merge pull request #2101 from ether/preProcessDomLine
...
preprocessor for domline attributes
2014-03-11 17:44:56 +00:00
f5716a3b26
cleaner logic
2014-03-05 21:44:32 +00:00
df205a4ef4
docs
2014-03-05 21:44:22 +00:00
89d7ba0dc0
merge
2014-03-05 21:27:12 +00:00
432438a40d
fix dintenation
2014-03-04 23:36:16 +00:00
c3d62c5fa4
preprocessor for domline attributes
2014-03-04 23:14:15 +00:00
6940106829
Merge pull request #2095 from vvision/develop
...
Fix plugins not being fetched (update npm)
2014-02-26 23:30:39 +01:00
af50001769
Merge pull request #2074 from webzwo0i/fix-disconnect-on-new-changes-in-padinitialization
...
don't call ace_getInInternationalComposition if editor is not fully load...
2014-02-26 22:52:30 +01:00
8b572b888c
Merge pull request #2088 from simong/padUsersCallback
...
Addressed a potential never finishing forEach in PadMessageHandler.padUsers
2014-02-26 22:50:29 +01:00
eb32835ea1
Updated npm version.
2014-02-24 13:29:21 +01:00
fa681d43f7
remember user session because it can be gone when finalHandler is called
2014-02-20 17:38:25 +01:00
c8c2866087
fix crash if disconnect happens for sessions that have messages queued
2014-02-20 16:33:42 +01:00
0e6019344e
fix for infinite loop on bad changeset
2014-02-20 14:08:49 +04:00
cfdd57b487
Addressed a potential never finishing forEach in PadMessageHandler.padUsers
...
If the session info for a client would be null or undefined, the forEach
callback would never get called which means the padUsers callback would
never get trigged. This could potentially block API request as this function
is exposed at an HTTP API endpoint.
2014-02-19 10:48:15 +00:00
ca8dce1840
Merge pull request #2086 from bnchdrff/cleanse-npm-values
...
escape rendered npm package info
2014-02-17 16:51:07 +00:00
44062ae765
escape rendered npm package info
2014-02-17 11:40:30 -05:00
Siebrand Mazeland