8a0a1a65b1
Adding missing code to make toolbar be fixed on top/bottom of the screen for iOS devices.
...
This commit complements 9ccaeb5
2015-07-07 16:54:11 -03:00
25db7d995f
Merge pull request #2718 from lpagliari/develop
...
Fix toolbar and chat positioning on mobile devices
2015-07-03 23:12:02 +01:00
47c4ca9c29
Fixing chat on bottom of the page for mobile devices
2015-07-03 18:38:46 -03:00
9ccaeb585b
Fixing toolbar on top of the page for mobile devices
2015-07-02 13:03:45 -07:00
193b5a07ef
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2015-07-01 20:23:43 +01:00
b5686adf92
fix font test
2015-07-01 20:23:31 +01:00
7520c614ae
Merge pull request #2714 from charakterziffer/patch-1
...
Added CSS fallback fonts
2015-07-01 20:16:38 +01:00
7c0f3a6826
Added Helvetica Neue to the Normal font
2015-07-01 12:13:37 +02:00
c0f5b92e3d
Added CSS fallback fonts
...
I’m not sure if this is the correct and only place where to change this. I just gave the present fonts some fallbacks (when possible) but didn’t add, remove or merge fonts.
2015-07-01 10:42:33 +02:00
2bf16fe09f
Merge pull request #2712 from xavidotron/xavid
...
Restore newline-adding to setText() if passed string does not end in '\n'.
2015-06-30 10:03:57 +01:00
ad137fa4c8
Restore newline-adding to setText() if passed string does not end in '\n'.
...
Add a test for the ending-in-'\n' case and update tests for the other case.
2015-06-30 04:47:55 -04:00
d803ac128e
use settings for backend tests
2015-06-29 11:00:00 +01:00
e48d605d2d
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
2015-06-29 10:23:52 +01:00
4252ef26f6
remove console logs
2015-06-29 10:23:30 +01:00
7e964445b5
Merge pull request #2711 from ether/aria-label-for-button
...
aria-labels for everything
2015-06-28 17:15:01 +01:00
90575064a9
aria-labels for everything
2015-06-28 17:14:37 +01:00
85d44c8a4e
Merge pull request #2675 from cboylan/userInfoUpdate-guards
...
Check for valid session in handleUserInfoUpdate
2015-06-25 01:31:07 +01:00
1060595676
Check for valid session in handleUserInfoUpdate
...
Address issue 2674 by checking that the session is valid and has a valid
author and padId before using it to update the userInfo for that
session. Otherwise it is possible that by the time we try to update a
session with new userInfo that session has disconnected and is no longer
available to be updated. Without this commit the etherpad-lite service
gracefully shutsdown whenever this happens.
2015-06-24 15:18:35 -07:00
444634b588
Merge pull request #2707 from lpagliari/develop
...
Fixing @font-face src path to be able to use font icons on plugins when minify is on
2015-06-24 18:49:33 +01:00
6ed85b8787
Fixing @font-face src path to be able to use font icons on plugins when minify is on.
...
This is a commit similar to 56ce8e8
2015-06-24 14:32:10 -03:00
04d5e25305
Update settings.json.template
2015-06-23 23:03:56 +01:00
95ca936dd7
Merge pull request #2703 from LaKing/patch-1
...
run.sh [: too many arguments
2015-06-22 15:25:35 +01:00
376fccfe92
bugfix for correct bash syntax
...
$rocks has to be enclosed into a "string" so bash can treat is as a string.
We can compare two strings with the == operator then, ...
2015-06-22 16:11:29 +02:00
6b40961fc8
Merge pull request #2699 from xavidotron/develop
...
Add author information to the context for padCreate and padUpdate hooks.
2015-06-22 10:56:56 +01:00
13fa863f4b
Localisation updates from https://translatewiki.net .
2015-06-22 11:52:20 +02:00
bc78e0c68d
Update documentation for the updatePad and createPad hooks to include 'author'
...
in the context.
2015-06-21 11:34:59 -04:00
a4fe0d0dc8
Add an 'author' entry to the context for the padCreate and padUpdate hooks.
2015-06-21 11:29:17 -04:00
23bcccdf80
Merge pull request #2696 from xavidotron/develop
...
Allow a pad to end with only a single newline.
2015-06-20 13:54:37 +01:00
778e1e4641
Allow a return keypress in a list on the last line of a pad to create a new
...
line.
2015-06-19 14:03:22 -04:00
0713553906
Allow a pad to only end with a single newline, rather than requiring two.
2015-06-19 14:02:18 -04:00
ef5e62e3a1
Localisation updates from https://translatewiki.net .
2015-06-18 13:25:28 +02:00
8af8c37896
Merge pull request #2695 from goldquest/dev_overallImportBug
...
On Import, when successful, loading circle didn't go away
2015-06-17 18:16:18 +01:00
32ba48835a
if variable not declared, test if null throws error
2015-06-17 18:54:19 +02:00
a0aa9470a3
Merge pull request #2690 from lpagliari/develop
...
Add new icon to fontawesome subset: comment
2015-06-11 11:46:31 +01:00
1353c093db
Add new icon to fontawesome subset: comment
2015-06-10 18:05:24 -03:00
5a5d245c06
fix issues with redrawing focus back to input element would lose param selected name
2015-06-08 17:13:46 +01:00
2fa2dc8a03
Localisation updates from https://translatewiki.net .
2015-06-08 16:09:38 +02:00
fd20c5ef79
Merge pull request #2689 from luin/develop
...
Change "Javascript" to "JavaScript"
2015-06-03 12:55:02 +01:00
beae99415c
Change "Javascript" to "JavaScript"
2015-06-03 19:45:08 +08:00
d11c92cbf9
Merge pull request #2684 from hinnerk/develop
...
Conver.js: Use current mysql client API
2015-05-30 16:40:22 +01:00
7ba5e97a60
Use current mysql client API
2015-05-30 15:14:40 +02:00
b049f4bfc7
Merge pull request #2681 from lpagliari/develop
...
Allowing 'value' to be a localizable attribute on HTML elements.
2015-05-25 22:07:05 +01:00
7e38e2c2b1
Localisation updates from https://translatewiki.net .
2015-05-25 13:00:34 +02:00
92aabe12dc
Allowing 'value' to be a localizable attribute on HTML elements.
2015-05-25 07:08:24 -03:00
bfb34ff806
Merge pull request #2678 from shimaore/patch-2
...
Do not extend Array.prototype
2015-05-22 11:29:32 +01:00
0b3216ecb6
Do not extend Array.prototype
2015-05-22 12:27:08 +02:00
757ad765d3
use removeItem instead of remove namespace
2015-05-22 11:09:21 +01:00
0eb8b800cf
hide chat if its already open on readonly mode
2015-05-20 01:50:37 +01:00
48da5c1ab1
docs for handle message security
2015-05-20 01:09:35 +01:00
3944a0e79b
more read only mode fixes andadd support for handleMessageSecurity hook
2015-05-20 01:05:53 +01:00
Luiza Pagliari