johnyma22
|
a75d17f55a
|
More stuff into changelog
|
2012-11-21 18:48:33 +00:00 |
|
johnyma22
|
064051a30d
|
Bump stuff to 1.2.1
|
2012-11-21 18:20:54 +00:00 |
|
John McLear
|
122093904f
|
Actually fix the language tests...
|
2012-11-21 18:14:05 +00:00 |
|
John McLear
|
34df9d651e
|
Merge pull request #1188 from joker-x/master
Allow ! in pads urls
|
2012-11-21 09:53:58 -08:00 |
|
John McLear
|
db5119f798
|
Fix tests to run on IE8 etc.
A bit more fragile but so is the life of supporting older browsers.
|
2012-11-21 17:53:46 +00:00 |
|
John McLear
|
2260b1fc62
|
Test for PR 1188
https://github.com/ether/etherpad-lite/pull/1188
|
2012-11-21 17:52:10 +00:00 |
|
John McLear
|
4fb46c0063
|
Merge pull request #1192 from marcelklehr/fix/l10n-ie-bug
Fix #1186 Autodetection wouldn't work correctly in IE9
|
2012-11-21 08:46:14 -08:00 |
|
Marcel Klehr
|
dcb3da829d
|
Fix #1186 Autodetection wouldn't work correctly in IE9
|
2012-11-21 17:45:01 +01:00 |
|
Iván Eixarch
|
0c70ada9d7
|
Allow ! in urls autodetection
|
2012-11-21 03:35:49 +01:00 |
|
Marcel Klehr
|
a6cbcc9d51
|
Merge pull request #1185 from Nikerabbit/develop
Localisation updates from http://translatewiki.net.
|
2012-11-20 13:11:30 -08:00 |
|
Marcel Klehr
|
8a23c2ff50
|
Use ; as comments indicator in i18n files
|
2012-11-20 22:08:42 +01:00 |
|
Niklas Laxström
|
4e18df45c6
|
Localisation updates from http://translatewiki.net.
|
2012-11-20 20:47:34 +00:00 |
|
Marcel Klehr
|
4053ab2dfa
|
Clarify English strings and rephrase some stupid-sounding messages.
|
2012-11-20 21:35:06 +01:00 |
|
Marcel Klehr
|
383e1fb604
|
Merge pull request #1184 from joker-x/master
Replace Globalize with languages module
|
2012-11-20 11:58:04 -08:00 |
|
Iván Eixarch
|
1e71797ad5
|
Replace Globalize with languages module
|
2012-11-20 19:46:17 +01:00 |
|
Marcel Klehr
|
b515156041
|
Only show errors/warnings on npm install [windows]
|
2012-11-19 15:24:48 +01:00 |
|
Marcel Klehr
|
3e53a11127
|
Show errors on npm install
|
2012-11-19 15:19:59 +01:00 |
|
Peter 'Pita' Martischka
|
a7e6c6b0ab
|
encrypted the key again, please travis accept this
|
2012-11-19 14:52:45 +01:00 |
|
John McLear
|
323517c6dc
|
Merge pull request #1181 from marcelklehr/fix/lang-test-dont-use-setimeout
dont use setimeout for lang tests
|
2012-11-18 13:09:35 -08:00 |
|
Marcel Klehr
|
c1f9028d19
|
Fix lang frontend test to 'waitFor' the 'localized' event
|
2012-11-18 20:11:16 +01:00 |
|
Marcel Klehr
|
f20af4818c
|
Revert "Make language frontend test pass"
Shouldn't have used setTimeout here...
This reverts commit ff0c9bb4a0.
|
2012-11-18 19:55:13 +01:00 |
|
John McLear
|
39ec36552f
|
Merge pull request #1180 from tux-tn/patch-6
Fix typo in pad.toolbar.clearAuthorship.title string in fr.ini
|
2012-11-18 07:51:24 -08:00 |
|
Sarhan Aissi
|
67de23225a
|
Fix typo in pad.toolbar.clearAuthorship.title string in fr.ini
|
2012-11-18 16:44:59 +01:00 |
|
John McLear
|
95dee60d2d
|
Merge pull request #1179 from marcelklehr/fix/improve-frontendtest-ux
improve frontend test ux
|
2012-11-18 07:39:10 -08:00 |
|
Marcel Klehr
|
bec2c3692d
|
Always display the test overview panel
|
2012-11-18 12:49:59 +01:00 |
|
Marcel Klehr
|
1b409d7b9d
|
Scroll down the list of tests after a test completed
|
2012-11-18 12:49:34 +01:00 |
|
Peter 'Pita' Martischka
|
a99ff139c9
|
updated sauce_key env for new repo
|
2012-11-17 11:46:49 -08:00 |
|
John McLear
|
d6c0f96084
|
Merge pull request #1177 from marcelklehr/fix/optimize-l10n-loading-times
optimize l10n loading times
|
2012-11-17 07:31:21 -08:00 |
|
John McLear
|
73eafb92c2
|
Merge pull request #1178 from marcelklehr/fix/tests
Fix/tests
|
2012-11-17 07:31:03 -08:00 |
|
Marcel Klehr
|
ff0c9bb4a0
|
Make language frontend test pass
|
2012-11-17 16:29:11 +01:00 |
|
Marcel Klehr
|
364e6928b5
|
Make tests work on windows
|
2012-11-17 16:28:54 +01:00 |
|
Marcel Klehr
|
5baef07b55
|
Load l10n.js first but asynchronusly
|
2012-11-17 15:28:33 +01:00 |
|
Marcel Klehr
|
e131f60071
|
Serve English strings directly with /locales.ini
|
2012-11-17 14:33:01 +01:00 |
|
John McLear
|
5009ab1174
|
Merge pull request #1176 from marcelklehr/fix/padaccess-cookie
Fix #1115 correctly reference session cookie
|
2012-11-17 05:23:19 -08:00 |
|
Marcel Klehr
|
a39faf9368
|
Fix #1115 correctly reference session cookie
|
2012-11-17 14:19:09 +01:00 |
|
John McLear
|
faeee3e09a
|
Merge pull request #1174 from ether/fix-installdeps-line-error
fix tiny error of missing space
|
2012-11-16 13:21:03 -08:00 |
|
johnyma22
|
cefbd8354d
|
fix tiny error of missing space
|
2012-11-16 21:12:04 +00:00 |
|
John McLear
|
0b7d488ea4
|
Merge pull request #1172 from ether/fix-windows-package-extract
Fix windows package extract
|
2012-11-16 13:08:52 -08:00 |
|
johnyma22
|
fbe16da728
|
dont forget to allow for cleanup
|
2012-11-16 20:52:19 +00:00 |
|
johnyma22
|
27c5e8691f
|
mheh, better way of handling the buidl for windows script
|
2012-11-16 20:51:08 +00:00 |
|
johnyma22
|
1321d9e16f
|
Resolve #1171 by not including tests in windows build
|
2012-11-16 20:17:25 +00:00 |
|
John McLear
|
b1b1fa018a
|
Merge pull request #1170 from tux-tn/patch-4
Fix examples url in settings.html to use ether/
|
2012-11-16 05:46:34 -08:00 |
|
Sarhan Aissi
|
716aa13a79
|
Fix examples url in settings.html to use ether/
|
2012-11-16 10:39:38 +01:00 |
|
John McLear
|
c765b563e4
|
Merge pull request #1168 from tux-tn/patch-3
Fix the path of run.sh on README.md
|
2012-11-15 14:49:41 -08:00 |
|
Sarhan Aissi
|
2c268f6c48
|
Fix the path of run.sh on README.md
In Linux forward slash is used for file path and not backslash
|
2012-11-15 22:11:48 +01:00 |
|
John McLear
|
bad9b2ee66
|
Merge pull request #1162 from ether/windows-build-script-exclusions
Dont include git history in the windows .zip
|
2012-11-15 08:10:30 -08:00 |
|
Marcel Klehr
|
fcee203a1a
|
Dont include git history in the windows .zip
git history is located in .git/objects
|
2012-11-15 15:16:12 +01:00 |
|
Marcel Klehr
|
269cd941c2
|
Merge pull request #1167 from joker-x/master
Add Spanish translation
|
2012-11-15 06:04:52 -08:00 |
|
Iván Eixarch
|
dd845f7731
|
fixed label languague
|
2012-11-15 13:41:44 +01:00 |
|
Iván Eixarch
|
ce371235b3
|
Traducción al castellano/Spanish translation
|
2012-11-15 11:44:31 +01:00 |
|