0f1fd0b281
working blocks
2014-11-18 23:51:22 +00:00
f5dcc374ba
slight ui fix
2014-11-18 23:15:56 +00:00
e821cb13fa
more polish
2014-11-18 22:47:20 +00:00
95cb721914
clean up
2014-11-18 22:41:00 +00:00
09b08e5a72
working pause
2014-11-18 22:29:46 +00:00
e2410e41b0
more polish
2014-11-18 22:24:16 +00:00
a06f01c04a
some timeslider styling but this wont be completed by me
2014-11-18 22:21:36 +00:00
645ec830b0
Don't crash on bad plugins.json; fixes #2323
2014-11-18 13:59:36 -08:00
0bea3a3af6
no image on timeslider
2014-11-18 21:13:21 +00:00
4a12eec3e0
a font lookup file
2014-11-18 21:10:40 +00:00
9712f852e9
remove connecting bar image
2014-11-18 19:16:50 +00:00
9b5ee93bce
spinning loading icons
2014-11-18 19:13:51 +00:00
3ad9a58895
fontello config file
2014-11-18 18:47:12 +00:00
21ce9b4dd3
correct font stuff
2014-11-18 18:44:45 +00:00
c14e1696b3
remove stuff, new files
2014-11-18 18:09:29 +00:00
3e8f3cd938
hrm I dont trust this security
2014-11-18 14:56:40 +00:00
ff603d7b58
stability restored now to handle the auth issues
2014-11-18 14:12:02 +00:00
d10013c159
client side code now fixed
2014-11-18 14:10:38 +00:00
020b636b1f
template of a semi-fix
2014-11-18 14:08:44 +00:00
135aa3e8fe
Merge pull request #1783 from simong/removed-console-in-html10n
...
Removed console wrapping in html10n as it's breaking in PhantomJS.
2014-11-15 18:08:53 +01:00
d7a181be67
Nooping console.foo in html10n.js when the method is not defined.
2014-11-15 16:31:19 +00:00
865829e159
Merge pull request #1682 from luto/fix-listSessionsOfGroup
...
Don't error in listSessionsOfGroup when there are non-existing sessions
2014-11-15 16:25:23 +00:00
fc79c8a298
Merge pull request #1912 from ether/hide-chat-when-caret-behind
...
Hide Chat Icon when the Caret is on the same line
2014-11-15 16:13:53 +00:00
3bf108f3b4
Merge pull request #2203 from ether/setting-to-not-import-unknown-file-types
...
Allow for a setting so you can stop unknown file types from being imported
2014-11-15 15:41:08 +00:00
4986dd11ee
merging
2014-11-15 15:39:46 +00:00
eff4863a22
Merge pull request #2290 from ether/IE11-null-password
...
change to proper IE check
2014-11-15 15:37:53 +00:00
12914e68ff
Merge pull request #2294 from ether/go-away-npm
...
Use request and a remote ep plugin only endpoint
2014-11-15 15:37:44 +00:00
8d2fa35b3f
Merge pull request #2298 from ether/reflow-toolbar-properly
...
Reflow toolbar properly
2014-11-15 15:37:28 +00:00
cce2d7279a
resolve merge issues
2014-11-15 15:34:18 +00:00
a75f02cddf
Merge pull request #2300 from cristo-rabani/patch-1
...
Added option to restore revisions #1791
2014-11-15 15:32:24 +00:00
e8fda27ead
Localisation updates from https://translatewiki.net .
2014-11-14 13:42:39 +01:00
a52743d8f1
Merge pull request #2282 from ether/chrome-paste
...
Chrome browser change wrapping type
2014-11-13 13:00:32 +00:00
e5d77c3763
indentation
2014-11-12 21:39:03 +00:00
0253156dbb
Update APIHandler.js
2014-11-12 19:55:37 +01:00
f7dd756642
Update API.js
2014-11-12 19:53:56 +01:00
f59238fe58
Update API.js
2014-11-12 19:50:43 +01:00
24ac082cae
Update API.js
2014-11-12 19:49:08 +01:00
9d39c9591a
update pad clients
2014-11-12 19:46:50 +01:00
07d29a5d7a
Merge pull request #2219 from Gared/fix_css
...
Fix position of import/export popup in timeslider
2014-11-12 15:18:25 +00:00
60b698f69b
Add keyboard shortcut for "Clear Authorshop Colors" in en locale
...
Translate wiki should pick this up and the translations will
start coming in a while. #2292
2014-11-09 09:18:50 +05:30
46bc328896
new api ver
2014-11-08 01:41:23 +01:00
c33c6e085e
comment addded
2014-11-08 01:39:27 +01:00
d246a191c6
Added option to restore revisions #1791
2014-11-08 01:12:40 +01:00
2d597a4cab
Add keyboard shortcut to Clear Authorship Colors. Fixes #2292
2014-11-07 14:01:32 +05:30
fc5152c2f3
remove logging
2014-11-06 17:38:38 +00:00
3eb0652b21
fix pg
2014-11-06 16:38:31 +00:00
d13b6162f0
this looks way better
2014-11-06 15:50:55 +00:00
0685e563ed
working on resize
2014-11-06 15:43:21 +00:00
96d6e7c1b7
cleaner reflow
2014-11-06 15:12:40 +00:00
9170effb27
working redraw and draw on startup
2014-11-06 15:09:44 +00:00
7d04d7309f
reflow buttons based on browser size, much better
2014-11-06 14:32:20 +00:00
57f56d8fe1
bump express to a working version
2014-11-04 23:42:40 +00:00
053ff3097d
whoops I missed this one
2014-11-04 23:29:45 +00:00
9fa77cdea2
working handling of setting client ip and anonymizing etc
2014-11-04 23:25:18 +00:00
f418dfa205
fix author notification handler
2014-11-04 22:37:10 +00:00
af3e8e5e15
fix room client leave
2014-11-04 22:34:43 +00:00
8391f902fb
re-apply roomsize
2014-11-04 22:31:09 +00:00
a6cbb4af40
working messages
2014-11-04 19:58:38 +00:00
68eaa09708
Begin to repair damage done to rooms logic
2014-11-04 19:55:05 +00:00
95e7b0f156
transports
2014-11-04 19:11:06 +00:00
cb28d10963
move logging into debug environment variable .. sighs
2014-11-04 18:32:26 +00:00
5d0ccb5f8f
auth fix
2014-11-04 18:17:39 +00:00
adef0af227
more stuff required to stop it crashing, now we have identified what needs fixing we can fix it
2014-11-04 18:01:41 +00:00
1e53c4f5f0
identify which parts are causing issues and comment them out, obviously this needs fixing
2014-11-04 17:57:18 +00:00
c7061e47db
use request and a remote ep plugin only endpoint
2014-11-04 17:06:47 +00:00
b59f6a4d6f
Update ace2_inner.js
2014-11-04 15:50:53 +00:00
b61d8d99d1
Update package.json
2014-11-03 17:15:22 +00:00
2c801cc558
no errors but no connections
2014-11-01 22:36:19 +00:00
a67e805da0
basics, still not working
2014-11-01 21:25:49 +00:00
124ae31137
blah push back for imports
2014-11-01 21:15:31 +00:00
1530757d8e
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2014-11-01 21:12:53 +00:00
ff549db261
use latest jsdom
2014-11-01 20:58:56 +00:00
a22b558a2c
change to proper IE check
2014-11-01 20:21:48 +00:00
9b8398d0bd
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2014-11-01 20:20:19 +00:00
d54bb52b75
Fixes #1414
...
https://github.com/ether/etherpad-lite/issues/1414
2014-11-01 18:18:25 +00:00
bf380eea50
take line breaks and treat them appropriatly instead of creating a space for them..
2014-11-01 18:07:34 +00:00
4b488bc8af
Merge pull request #2116 from jdittrich/updateUnderscore
...
Underscore Version: Update package.json
2014-11-01 16:37:00 +00:00
41b7f99204
Bump resolve
...
Update dep fixes https://github.com/ether/etherpad-lite/issues/2050
2014-11-01 16:25:14 +00:00
51b9af9df0
bump ueberdb again
2014-10-30 16:12:17 +00:00
cd8ea040ad
bump ueber to require working mysql
2014-10-30 14:41:21 +00:00
f104644297
Fix for MySQL issues
...
See https://github.com/Pita/ueberDB/issues/63
2014-10-29 12:15:53 +00:00
45611561e6
Localisation updates from https://translatewiki.net .
2014-10-27 18:53:33 +01:00
ac2e949c3e
chrome browser change wrapping type
2014-10-24 00:13:34 +01:00
3fce9f8309
Localisation updates from https://translatewiki.net .
2014-10-23 21:32:44 +02:00
086bf83e6c
Localisation updates from https://translatewiki.net .
2014-10-20 18:57:22 +02:00
226e0bf0e3
bump resolve
2014-10-14 14:41:18 +01:00
9c2f8808be
bump swagger
2014-10-14 14:38:47 +01:00
09acdda4f7
bump semver
2014-10-14 14:37:57 +01:00
6f5f89bc6b
Use 'evt.shiftKey' instead of matching 'charCodes'
...
The shortcut wasn't running consistently and was blocking
'Cmd+L' on Chrome 38. Instead of going to the location bar
it would tooggle the list. Strangely, it did not override
'Cmd+N'. Using `evt.shiftKey` instead of matching the `charCode`
to the uppercase letter solves the problem.
2014-10-14 18:37:35 +05:30
8af34a2295
Replace "-" with "+" in tooltips with keyboard shortcuts
...
Ctrl-Shift-L seems counter intuitive as you have to press
the keys together.
2014-10-14 18:14:47 +05:30
aee652dafc
Merge pull request #2269 from prtksxna/fonticons
...
Add a subset of FontAwesome icons using Fontello
2014-10-14 13:29:41 +01:00
b62c82575f
Merge pull request #2264 from prtksxna/a-span-title
...
Move `title` attribute of buttons from `<span>` to `<a>`
2014-10-14 13:29:00 +01:00
ca32ac89b6
Add a subset of FontAwesome icons using Fontello
...
Most of the code here has been taken from @LaKing's #2554 .
Only icons required for etherpad have been added. Here is a
list of the code points that are being used:
0xe800 0xe801 0xe802 0xe803
0xe804 0xe805 0xe806 0xe807
0xe808 0xe809 0xe80a 0xe80b
0xe80c 0xe80d 0xe80e 0xe80f
0xe810 0xe811 0xe812 0xe813
0xe814 0xe815 0xe816 0xe817
Their related icon names can be seen in:
/src/static/css/fontawesome-etherpad.css
Even though this patch *adds* all the required icons it only
uses them in the in toolbar. The switch to using only FontAwesome
icons and the removal of old PNG files will only happen after the
timeslider interface has been updated.
This is the first step for #2253
2014-10-14 09:16:44 +05:30
7b8953ee75
Add keyboard shortcuts for ordered and unordered lists and update tooltips #1987
...
Ordered List: Ctrl-Shift-N
Unordered List: Ctrl-Shift-L
2014-10-12 17:40:57 +05:30
001d75cd1e
Add 'Ctrl-5' keyboard shortcut for 'strikethrough' #1987
...
A quick search revealed that 'Ctrl-5' is a popular shortcut
for strikethrough. Implemented in 'ace2_inner' and updated
the English l10n file for the tooltip.
2014-10-11 22:51:20 +05:30
437b2bfc64
Move `title` attribute of buttons from `<span>` to `<a>`
...
The `.toolbar ul li a` that holds the `span.button` has a
padding of `4px 5px`. This means if the mouse is on the edge
of the button the `:hover` state is active but the relevant
tooltip does not show up. Moving the `title` attribute to
the `<a>` itself solves this problem.
Also removed some extra whitespace.
2014-10-11 20:22:31 +05:30
0962f65c08
I prefer this..
2014-10-06 14:23:13 +01:00
f0c12d3884
escape useragent before displaying
2014-10-06 14:18:54 +01:00
64c89613a1
Localisation updates from https://translatewiki.net .
2014-10-06 11:39:09 +02:00
fb940897ee
Merge pull request #2257 from 0ip/fix/user-count
...
Fix broken user count
2014-10-05 12:42:52 +01:00
29f8f13423
Prevent selection on buttons
2014-10-05 13:35:20 +02:00
5008ad10c6
Fix user count
...
Still dirty, but really works.
2014-10-05 13:14:07 +02:00
ee68d43932
Fix import/export popup margin @ timeslider
2014-10-03 17:39:15 +02:00
12c1d3b05a
Fix active button ui
2014-10-03 17:35:48 +02:00
bfde869948
If exportFileName hook isn’t defined don’t return empty filename.
...
This commit should fix #2251 .
If ``exportFileName`` hook is not defined, ``hookFileName`` should be an empty array. Test the length of ``hookFileName`` before overriding ``fileName``, the export filename.
2014-09-28 14:53:07 +02:00
0d95c8d1ec
Revert change on position of imp/exp overlay
2014-09-14 20:26:35 +02:00
bc8b5cc066
Merge pull request #2220 from Gared/timeslider_improvements
...
Timeslider improvements
2014-09-06 18:15:37 +01:00
2530bf0a86
add changelog and bump v number
2014-09-06 17:25:09 +01:00
4b7562de58
Merge pull request #2184 from qknight/patch-1
...
added /abs/path/settings.json handling
2014-08-23 21:24:46 +01:00
cf6e5aa3ca
Fix click on timeslider loads two different revisions
2014-08-09 18:56:18 +02:00
bb21759d78
Fix timeslider revision not changing in most cases
2014-08-09 18:52:44 +02:00
287a7805c9
Fix position of import/export popup in timeslider
2014-08-09 14:05:04 +02:00
2f8b860e69
Added a `userLeave` hook that gets called when a user leaves a pad
2014-08-08 15:49:15 +01:00
49bba7dfe2
Localisation updates from https://translatewiki.net .
2014-08-06 16:49:48 +02:00
63b89b693d
Update Settings.js
...
added brackets to match etherpad lite devs' coding style
2014-07-24 12:06:52 +02:00
17f26b8c2c
Support to allow for a setting so you can stop unknown file types from being imported
2014-07-22 15:46:31 +01:00
25f6c9bf9a
Checking if the author for the sessions match instead of comparing the entire session.
2014-07-12 16:40:59 -04:00
7861cae763
Cleaning up switchToPad functionality so that we only need one call to the server("SWITCH_TO_PAD") instead of two (cleaning session info and client ready).
...
Also Clearing chat messages when switchToPad is called in pad.js instead of having the server tell the client to clear the chat messages.
2014-07-12 16:27:00 -04:00
9d1eca42b3
Merge pull request #2174 from ether/fix/copy-pad-update-lists
...
Fix #2136 : update cache and group list when copying pads
2014-07-08 19:07:35 +00:00
3cafd689af
Fix Pad#copy routine for updating group list
2014-07-07 21:14:00 +02:00
070ba40f4f
Fallback for browsers that don't support window.history.pushstate
2014-07-06 18:22:24 -04:00
da0fe98edc
Fixes search on plugins without Description
...
example "tables_ssl"
2014-07-03 14:24:41 +02:00
2ee4e9e7fd
change to line 73
2014-06-28 15:19:28 +01:00
b657676bdd
gah can only do 1/2 a fix
2014-06-24 19:02:40 +01:00
25ace65374
don't lose comment
2014-06-24 18:46:41 +01:00
db045c6ffd
CSS fix for pasting plain-text in chrome, needs thorough testing
2014-06-24 18:45:54 +01:00
a76dc697f0
Localisation updates from https://translatewiki.net .
2014-06-23 12:39:04 +00:00
e17044d60e
added /abs/path/settings.json handling
...
before this path, one could only supply a relative path like:
--settings ../relative/path/settings.js
now one can also use it with absolute paths like:
--settings /abs/path/settings.json
2014-06-22 20:56:21 +02:00
b1b972a2b4
Merge pull request #1787 from goldquest/dev_nopass_whensession
...
Grant access for valid session to password protected group pads
so, if user has valid session, they don't need the password
2014-06-17 14:01:16 +02:00
c627608ea5
Merge pull request #1619 from ether/stricter-transport
...
Enable HSTS on TLS connections
2014-06-17 12:58:47 +01:00
6dd66c6a16
Localisation updates from https://translatewiki.net .
2014-06-17 11:55:02 +00:00
897f5189b0
Enable HSTS for TLS connections
...
Don't use X-Frame-Options: deny for now
2014-06-17 13:21:38 +02:00
44cb676ba2
Merge pull request #2150 from ether/export-file-name-hook
...
Server side hook to modify the export file name
2014-06-16 16:47:15 +01:00
4ccd7131d3
Added function to switch to a different pad without having to reload the whole page.
2014-06-14 14:25:56 -04:00
f70309645c
pluginfw: accept 'null' as a hook-result, as this is needed by handleMessage
2014-06-12 13:33:17 +02:00
c4f9828825
Fix #2136 : update cache and group list when copying pads
2014-06-11 22:23:43 +02:00
cd294c608b
Merge pull request #2149 from ether/dont-use-abiword-for-html
...
abiword shouldnt be used for HTML native documents
2014-06-11 14:47:33 +02:00
7bec297c0a
Merge pull request #2161 from ether/bump-ueber
...
bump ueberdb for more performance on mysql
2014-06-11 14:40:54 +02:00
fc3ce3429e
Corrected the API Version number.
2014-06-01 21:21:08 +02:00
412bdd1857
Renamed the variable to prevent possible problems.
2014-06-01 21:19:15 +02:00
d42a9eb3a6
Enhanced the Example for the API Method getPadID and make the return value consistent to other functions
2014-05-31 11:53:44 +02:00
fffdde0c59
Implemented the the new API method getPadID for reversing the Readonly ID. Based on: ff88c19fc1
2014-05-31 00:43:31 +02:00
493636ec36
Added a new API method getPadID for reversing the Readonly ID and introduced the API level 1.4.1. Based on: 97402f60b8
2014-05-31 00:39:36 +02:00
37f6dde365
bump ueberdb for more performance on mysql
2014-05-21 13:20:39 +01:00
19be8763c9
Fix race condition
2014-05-15 12:47:28 +00:00
c63cb812e8
Update ExportHandler.js
2014-05-15 10:53:37 +01:00
44b1ac2b16
Merge pull request #1984 from ldidry/fix/getRevisionChangeset-crash
...
Fix getRevisionChangeset API call making etherpad crash
2014-05-14 14:10:44 +01:00
a82823ede2
use full string not first char
2014-05-12 15:15:10 +01:00
d09e66e271
use call first and update docs
2014-05-12 15:08:32 +01:00
9212ebe9f0
Localisation updates from https://translatewiki.net .
2014-05-12 13:42:45 +00:00
b74c43889e
Update ImportHandler.js
2014-05-09 13:50:00 +01:00
32898dec80
Localisation updates from https://translatewiki.net .
2014-05-08 08:40:43 +00:00
ec6dc4fa0e
make async, please check
2014-05-07 16:27:41 +01:00
69ba3cc104
remove eplite add etherpad
2014-05-07 15:17:14 +01:00
1f7fcd54f1
working logic for allowing a server side hook to modify the export file name but NOT the extension
2014-05-06 21:13:22 +01:00
6d38b05623
abiword shouldnt be used for HTML native documents
2014-05-06 17:32:45 +01:00
e85d09400e
Merge pull request #2138 from ether/fix-user-icon-color-and-count
...
Fix showusers button: Show authorcolor and user_count again
2014-05-03 13:32:22 +02:00
46ef83d710
Fix #online_count
...
Rather dirty, but works.
2014-04-30 22:32:08 +02:00
20c32de5e7
Localisation updates from https://translatewiki.net .
2014-04-21 09:23:10 +00:00
706ee1f866
fix color
2014-04-15 18:11:41 +01:00
962b166c3a
Localisation updates from https://translatewiki.net .
2014-04-14 13:49:59 +00:00
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
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
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
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
a4f2ebe57e
Update package.json
...
updated the underscore version number to 1.5.1 (from 1.3.1). Not lifted to most current version because frontend tests broke from 1.5.2 upwards.
2014-03-26 18:22:41 +01:00
e23af7e439
changelog, package file and fix for redo
2014-03-26 15:44:04 +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
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
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
f5716a3b26
cleaner logic
2014-03-05 21:44:32 +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
eb32835ea1
Updated npm version.
2014-02-24 13:29:21 +01:00
8245e65d3f
disconnect client if it submits an already accepted changeset based on an old revision
2014-02-20 18:13:30 +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
44062ae765
escape rendered npm package info
2014-02-17 11:40:30 -05:00
f798e287fb
Localisation updates from https://translatewiki.net .
2014-02-09 15:22:15 +00:00
65a3344f46
Localisation updates from https://translatewiki.net .
2014-02-02 12:36:23 +00:00
7151e7827a
allow tabs to be cycled when focus is in editor
2014-02-01 07:05:25 +00:00
3f31445abf
don't call ace_getInInternationalComposition if editor is not fully loaded
2014-01-28 14:07:26 +01:00
b6f354a2de
Merge pull request #2052 from ether/fix/l10n-fallbacks-related-langs
...
Try to find related languages as a fallback
2014-01-25 05:34:11 -08:00
728958e131
Localisation updates from https://translatewiki.net .
2014-01-24 19:51:24 +00:00
John McLear