5baef07b55
Load l10n.js first but asynchronusly
2012-11-17 15:28:33 +01:00
e131f60071
Serve English strings directly with /locales.ini
2012-11-17 14:33:01 +01:00
5009ab1174
Merge pull request #1176 from marcelklehr/fix/padaccess-cookie
...
Fix #1115 correctly reference session cookie
2012-11-17 05:23:19 -08:00
a39faf9368
Fix #1115 correctly reference session cookie
2012-11-17 14:19:09 +01:00
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
cefbd8354d
fix tiny error of missing space
2012-11-16 21:12:04 +00:00
0b7d488ea4
Merge pull request #1172 from ether/fix-windows-package-extract
...
Fix windows package extract
2012-11-16 13:08:52 -08:00
fbe16da728
dont forget to allow for cleanup
2012-11-16 20:52:19 +00:00
27c5e8691f
mheh, better way of handling the buidl for windows script
2012-11-16 20:51:08 +00:00
1321d9e16f
Resolve #1171 by not including tests in windows build
2012-11-16 20:17:25 +00:00
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
716aa13a79
Fix examples url in settings.html to use ether/
2012-11-16 10:39:38 +01:00
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
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
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
fcee203a1a
Dont include git history in the windows .zip
...
git history is located in .git/objects
2012-11-15 15:16:12 +01:00
269cd941c2
Merge pull request #1167 from joker-x/master
...
Add Spanish translation
2012-11-15 06:04:52 -08:00
dd845f7731
fixed label languague
2012-11-15 13:41:44 +01:00
ce371235b3
Traducción al castellano/Spanish translation
2012-11-15 11:44:31 +01:00
a3a0e1d77f
Merge branch 'master' of github.com:Pita/etherpad-lite into develop
...
Conflicts:
README.md
2012-11-14 15:23:38 -08:00
5f30ea447e
Merge pull request #1160 from ether/release/releases-1.2
...
Release version 1.2
2012-11-14 13:29:51 -08:00
6d2391dba6
Fix version number in changelog and package.json
2012-11-14 22:02:40 +01:00
ae2fee8be8
Sigh. I must have forgotten to commit this..
...
Apologies.
2012-11-14 19:38:17 +00:00
6ede651813
v1.2 news into changelog
2012-11-14 19:30:46 +00:00
8b50f194a3
fix README to use ether/
2012-11-14 19:26:37 +00:00
dff8910966
Fix links in README
2012-11-14 20:05:58 +01:00
26ee9c2f16
Update CONTRIBUTING.md
2012-11-14 19:01:05 +00:00
97d82fd19f
Update README.md
2012-11-14 19:00:40 +00:00
68b1d78f32
Merge pull request #1159 from marcelklehr/fix/lang-autodetection
...
Fix language auto-detection
2012-11-14 10:58:07 -08:00
a3ff346547
Merge pull request #1152 from marcelklehr/fix/updatePadClients-error
...
PadMessageHandler: Make sure sessioninfos[session] still exists before p...
2012-11-14 10:44:30 -08:00
3821c1441c
Merge pull request #1150 from marcelklehr/fix/script-migrate-dirty-mysql
...
Fix #1142 error in bin/migrateDirtyDBtoMySQL.js
2012-11-14 10:40:11 -08:00
b416402f10
Fix language auto-detection
2012-11-14 19:38:35 +01:00
dcff0d74ef
Fix Timeslider translation not showing up
2012-11-14 19:31:09 +01:00
a5c4fb154f
Update README.md
2012-11-14 09:29:49 -08:00
2aaf80c880
Initial commit
2012-11-14 09:27:21 -08:00
6426b05c67
Merge pull request #1158 from Pita/feature/i18n
...
Internationalization support! Yay!
2012-11-14 09:06:56 -08:00
37450340ee
Fix typo in timeslider.pageTitle string in french translation
2012-11-14 18:05:51 +01:00
bb33cfb23d
Add in docs for L10n
2012-11-14 18:01:01 +01:00
b69396d5a0
Fix French locale une autre fois
2012-11-14 17:29:06 +01:00
7ee42edcf1
Document 'lang' Parameter
2012-11-14 17:21:45 +01:00
d65460a409
Add missing colon in fr-locale
2012-11-14 17:15:28 +01:00
440804ce0b
Update French localization
2012-11-14 17:13:19 +01:00
f5563ab704
Move locale detection to the client
...
* l10n.js is doing locale detection already, so
we shouldn't interfere but help it do its job
* this should also fix the ?lang embed parameter
* Set language from cookie on page init for l10n
to load the right translation
2012-11-14 17:01:59 +01:00
ffb7cf47f2
Mate timslider page title translateable
2012-11-14 15:31:43 +01:00
6b6315ca3c
Tidy up settings
2012-11-14 14:26:49 +01:00
2d31d3fc46
add colon to language
2012-11-14 12:20:41 +00:00
2657f06887
Merge branch 'develop' of github.com:Pita/etherpad-lite into feature/i18n
2012-11-14 10:19:52 +00:00
838a1e3d69
just export on timeslider, no import..
2012-11-14 09:31:27 +00:00
0e6a701f92
Update src/templates/timeslider.html
2012-11-14 09:20:16 +00:00
e0935d9e25
Update src/locales/fr.ini
2012-11-13 20:09:02 +00:00
Marcel Klehr