summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-11-01Fixes #1414John McLear
https://github.com/ether/etherpad-lite/issues/1414
2014-11-01take line breaks and treat them appropriatly instead of creating a space for ↵John McLear
them..
2014-11-01Merge pull request #2116 from jdittrich/updateUnderscoreJohn McLear
Underscore Version: Update package.json
2014-11-01Bump resolveJohn McLear
Update dep fixes https://github.com/ether/etherpad-lite/issues/2050
2014-10-30bump ueberdb againJohn McLear
2014-10-30bump ueber to require working mysqlJohn McLear
2014-10-29Fix for MySQL issuesJohn McLear
See https://github.com/Pita/ueberDB/issues/63
2014-10-27Localisation updates from https://translatewiki.net.Siebrand Mazeland
2014-10-24chrome browser change wrapping typeJohn McLear
2014-10-23Localisation updates from https://translatewiki.net.Siebrand Mazeland
2014-10-20Localisation updates from https://translatewiki.net.Siebrand Mazeland
2014-10-14Merge pull request #2272 from prtksxna/lang-testsJohn McLear
Update frontend language tests for new keyboard shortcut convention
2014-10-14Update frontend language tests for new keyboard shortcut conventionPrateek Saxena
8af34a2295f2ff85cf0b introduced a failing test frontend test- https://travis-ci.org/ether/etherpad-lite/builds/37931978 This commit updates both the German and English strings even though the German locale files haven't been updated yet. The tests will continue to fail but will stop as soon as translatewiki catches up.
2014-10-14Merge pull request #2271 from prtksxna/keyboard-errorJohn McLear
Use 'evt.shiftKey' instead of matching 'charCodes'
2014-10-14Use 'evt.shiftKey' instead of matching 'charCodes'Prateek Saxena
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-14Merge pull request #2270 from prtksxna/tooltipJohn McLear
Replace "-" with "+" in tooltips with keyboard shortcuts
2014-10-14Replace "-" with "+" in tooltips with keyboard shortcutsPrateek Saxena
Ctrl-Shift-L seems counter intuitive as you have to press the keys together.
2014-10-14Merge pull request #2269 from prtksxna/fonticonsJohn McLear
Add a subset of FontAwesome icons using Fontello
2014-10-14Merge pull request #2264 from prtksxna/a-span-titleJohn McLear
Move `title` attribute of buttons from `<span>` to `<a>`
2014-10-14Add a subset of FontAwesome icons using FontelloPrateek Saxena
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-12Merge pull request #2266 from prtksxna/list-keyboard-shortcutsJohn McLear
Add keyboard shortcuts for ordered and unordered lists
2014-10-12Add keyboard shortcuts for ordered and unordered lists and update tooltips #1987Prateek Saxena
Ordered List: Ctrl-Shift-N Unordered List: Ctrl-Shift-L
2014-10-11Merge pull request #2265 from prtksxna/keyboard-shortcutJohn McLear
Add 'Ctrl-5' keyboard shortcut for 'strikethrough' #1987
2014-10-11Add 'Ctrl-5' keyboard shortcut for 'strikethrough' #1987Prateek Saxena
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-11Move `title` attribute of buttons from `<span>` to `<a>`Prateek Saxena
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-06Merge pull request #2261 from ether/fix-xss-on-useragentJohn McLear
Fix xss on useragent
2014-10-06I prefer this..John McLear
2014-10-06escape useragent before displayingJohn McLear
2014-10-06Localisation updates from https://translatewiki.net.Siebrand Mazeland
2014-10-05Merge pull request #2257 from 0ip/fix/user-countJohn McLear
Fix broken user count
2014-10-05Merge pull request #2258 from 0ip/fix/button-selectJohn McLear
Prevent selection on buttons
2014-10-05Prevent selection on buttons0ip
2014-10-05Fix user count0ip
Still dirty, but really works.
2014-10-03Merge pull request #2256 from 0ip/developJohn McLear
Fix active button UI, when a popup is shown
2014-10-03Fix import/export popup margin @ timeslider0ip
2014-10-03Fix active button ui0ip
2014-09-28Merge pull request #2252 from otetard/bugfix/fix_export_filenameJohn McLear
If exportFileName hook isn’t defined don’t return empty filename.
2014-09-28If exportFileName hook isn’t defined don’t return empty filename.Olivier Tétard
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-27Merge pull request #2249 from Gared/support_npm2John McLear
Add support for npm 2
2014-09-27Add support for npm 2Stefan
2014-09-23Merge pull request #2243 from mrshu/patch-1John McLear
readme: Add formatting sugar for readibility
2014-09-23readme: Add formatting sugar for readibilityMarek Šuppa
* Added a bit more formatting for UNIX-like systems dependencies installation.
2014-09-14Merge pull request #2232 from ether/masterJohn McLear
Merge branch 'release/1.4.1'
2014-09-14Revert change on position of imp/exp overlayStefan
2014-09-06Merge pull request #2220 from Gared/timeslider_improvementsJohn McLear
Timeslider improvements
2014-09-06Merge branch 'release/1.4.1'John McLear
2014-09-06add changelog and bump v numberJohn McLear
2014-08-23Merge pull request #2184 from qknight/patch-1John McLear
added /abs/path/settings.json handling
2014-08-09Fix click on timeslider loads two different revisionsStefan
2014-08-09Fix timeslider revision not changing in most casesStefan
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 20:46:10 +0000