6ae46ea8e3
fix issue where url was wrong for install
2013-01-22 18:28:38 +00:00
159feceb20
fix import without params
2013-01-22 18:17:15 +00:00
c6882aa65a
Merge pull request #1386 from ether/fix-import-on-params
...
fix issue #1369 where params would break import
2013-01-22 08:05:04 -08:00
e23108d199
fix issue #1369 where params would break import
2013-01-22 16:03:00 +00:00
666c0adcd2
script tag didn't link to right location
2013-01-22 16:42:56 +01:00
7869a543dd
Localisation updates from http://translatewiki.net .
2013-01-22 06:14:31 +00:00
441dd3785a
fix issue #1110
2013-01-20 23:11:59 +00:00
8bfa8a7e73
better urls
2013-01-20 22:42:32 +00:00
4cbf3869c6
open in external window
2013-01-20 22:36:58 +00:00
1bf526124d
resolve #1349
2013-01-20 22:34:27 +00:00
4b5d993f0d
bump v and create CHANGELOG
2013-01-20 13:45:16 +00:00
b282547dbf
Merge pull request #1376 from t-8ch/patch-2
...
listAllPads needs findKeys from ueberDB 0.1.9
2013-01-20 05:42:44 -08:00
0a06b07f7d
Merge pull request #1377 from mluto/add-users-block
...
Added a template block for #users
2013-01-20 05:35:19 -08:00
9c364d7d38
Added a template block for #users
2013-01-20 13:56:51 +01:00
9ee5098ad6
listAllPads needs findKeys from ueberDB 0.1.9
2013-01-19 19:17:52 +00:00
858d8e6e71
listAllPads should return an object, not an arraay. issue #1374
2013-01-18 11:13:03 -05:00
96989e63c7
prepare for release
2013-01-18 13:30:46 +00:00
a1188c15c0
[html10n] Fix onload event listener (must be attached to window!)
2013-01-16 19:47:54 +01:00
e31b9fd1bd
IE8 does not have a string.trim()-function, so use regex..
2013-01-16 18:48:25 +01:00
5eb09f981b
Merge pull request #1358 from mluto/clientvars-hook
...
Make the creation of clientVars hookable
2013-01-14 14:26:30 -08:00
bb9097e528
Merge pull request #1355 from mluto/chat-no-empty-line
...
prevent empty chat-messages from being sent
2013-01-14 14:25:46 -08:00
27c5498c54
Require ueberDB 0.1.9, not 0.1.8; this is needed for findKeys
2013-01-14 23:22:12 +01:00
41cb5d8265
Added hook for clientVars and hook-doc
2013-01-14 22:51:26 +01:00
94f9b05c4c
Only create clientVars when they are needed
2013-01-14 22:08:33 +01:00
96b7b5e8d0
Removed unnecessary return statement
2013-01-14 21:12:40 +01:00
654654b4e1
Merge pull request #1342 from spcsser/feature/padlisting
...
API & backend to list pads on epl instance
2013-01-14 08:13:57 -08:00
77401f2759
prevent empty chat-messages from being sent
2013-01-14 17:11:56 +01:00
1e7bcdba59
more sensible timeslider blocks..
2013-01-14 03:42:09 +00:00
33e0ec2097
Merge pull request #1334 from mluto/load-more-chat-messages
...
Load more than 100 chat messages using a 'load more'-link
2013-01-13 10:31:45 -08:00
6104987a4b
Merge pull request #1353 from ether/feature/log4js-config-setting
...
Add log4js config setting
2013-01-13 10:28:15 -08:00
0bcfef5aa4
Merge pull request #1352 from ether/timeslider-eejs
...
add a body eejs block to timeslider
2013-01-13 10:27:50 -08:00
eb0338d40c
better shindig
2013-01-13 18:23:35 +00:00
f8d6ffa22a
Localisation updates from http://translatewiki.net .
2013-01-13 15:01:03 +00:00
f4b95c5ca4
Add log4js config setting
2013-01-13 12:20:49 +01:00
e137919c3d
add a body eejs block to timeslider
2013-01-12 23:51:35 +00:00
2786807f2f
Fix broken relative paths
...
Bug introduced in 53521c8732
2013-01-12 18:41:56 +01:00
9687ecbb82
Modified pad list manager to return an ordered list.
2013-01-11 18:31:53 +01:00
e9726890a4
Edited getPads function to be able to work without callback
2013-01-11 04:43:59 +01:00
730266256c
fix #1341 by adding css to stop highlighting
2013-01-10 15:14:10 +00:00
7a62661705
Merge pull request #1346 from ether/fix-timeslider-date-not-changing
...
fix #1345 : timeslider time delta
2013-01-10 04:50:12 -08:00
ac448937ab
fix egils fix of time delta resolves #1345
2013-01-10 00:01:38 +00:00
c9f137b2e5
Added functionality to use spcsser/ueberDB findKey functionality.
2013-01-09 20:45:39 +01:00
7a49c82e16
Added comments
2013-01-08 20:21:14 +01:00
8c3263a6ea
Added comments
2013-01-08 20:19:10 +01:00
198754222d
Added functionality to list pads on this server.
2013-01-08 20:14:01 +01:00
fadfa6772e
changelog and package file
2013-01-07 19:31:29 +00:00
e6d523ba1c
Merge pull request #1317 from ether/enter-on-plugins
...
/admin/plugins: stop enter reloading new page on search result request
2013-01-07 10:46:05 -08:00
f00dddd09c
Moved console existence check before the variable is used. This was causing a crash in Internet Explorer when the console was not enabled (console is off by default).
2013-01-07 13:24:40 -05:00
bc05f9eb0a
converted load-more-link to button, added loading-gif, fixed typo
2013-01-07 19:15:55 +01:00
825b258d99
only load 20 messages when pressing the load-link, fixed whitespace
2013-01-07 17:43:03 +01:00
5f81daed0a
Added link to load more chat-messages using new GET_CHAT_MESSAGES
2013-01-07 17:36:03 +01:00
8e366da82e
use .val() instead of [0]
2013-01-07 11:27:40 +00:00
1782c68d4d
Localisation updates from http://translatewiki.net .
2013-01-07 10:18:02 +00:00
44981e8907
Merge pull request #1331 from mluto/fix-locales
...
Fixed broken placeholders in locales
2013-01-06 12:03:34 -08:00
c57ecf06ca
fixed broken placeholders in locales
2013-01-06 18:50:52 +01:00
5592c4b0fe
client loads messages using the new client loads messages using new method, getChatMessages restructured and renamed to getLastChatMessages, added GET_CHAT_MESSAGES, getChatMessages restructured and renamed to getLastChatMessages
2013-01-06 16:11:48 +01:00
9484b92ae2
fixed and unified indenting, added comments in handleClientReady
2013-01-06 14:55:33 +01:00
77315aa1d4
Load CSS before JS, in timeslider
2013-01-06 12:26:00 +01:00
c56c7b8ca9
Load CSS before JS
...
According to google this is more efficent
https://developers.google.com/speed/docs/best-practices/rtt?hl=en#PutSty
lesBeforeScripts
2013-01-06 12:19:56 +01:00
9f9f7a627e
corrected a documentation glitch for checkToken - clarified which token is validated
2013-01-02 15:14:46 +01:00
c370f779cc
stop enter reloading new page on search result request
2013-01-02 14:01:39 +00:00
53459fe160
release v1.2.3
2012-12-31 15:57:16 +01:00
b6c9b4ec30
Fix #1309 : Fix support for node v0.6
2012-12-31 15:47:42 +01:00
d9ef9f5648
Merge pull request #1308 from marcelklehr/fix/console-log-html10n-chrome
...
Fix #1307 : Chrome needs console.log to be called on console obj
2012-12-30 06:50:21 -08:00
f894d9b8f4
Localisation updates from http://translatewiki.net .
2012-12-30 10:31:57 +00:00
ba6e0d2a05
Fix #1307 : Chrome needs console.log to be called on console obj
2012-12-30 10:56:31 +01:00
ffc9bcf028
Bump API version for checkToken endpoint
2012-12-27 22:09:22 +01:00
b681359dfa
bump version # in package and update CHANGELOG
2012-12-27 20:09:14 +00:00
369e24682b
Merge pull request #1297 from marcelklehr/migrate-to-html10n
...
Migrate to html10n and allow plugin l10n
2012-12-27 07:56:41 -08:00
746396951d
Resolve #1301 startup pointing at old bitly URL
2012-12-26 00:17:43 +00:00
220e084484
Simplify local locale file format
2012-12-23 22:43:32 +01:00
d84951cd04
Remove locale file converter (ini2json)
2012-12-23 18:31:59 +01:00
2055a2b176
[l10n] Convert all ini files to json
2012-12-23 18:23:56 +01:00
fefbdb6fe1
Add direction info
2012-12-23 18:17:25 +01:00
fdf6628cc5
Fix html attr translation
2012-12-23 18:17:23 +01:00
04b65a0b4e
Add support for three-letter lang codes
2012-12-23 18:17:21 +01:00
0c9178d392
Fix html10n usage in code that wouldn't allow lang switching
2012-12-23 18:17:19 +01:00
580d936e50
Fix lang pre-selection of lang picker
...
(would break in cases when html10n might not have loaded yet)
2012-12-23 18:17:17 +01:00
23b7469df6
[html10n] Don't expose lang code, if the language is not available
2012-12-23 18:17:14 +01:00
7aba02f0cf
Don't break if a plugin hasn't got a locales dir
2012-12-23 18:17:12 +01:00
cf24e53eae
Simplify server-side i18n code and make it a bit more understandable
2012-12-23 18:17:10 +01:00
4a489f85f6
Fix translations in timeslider template
2012-12-23 18:17:08 +01:00
f68adc8553
Fix translations in timeslider code
2012-12-23 18:17:05 +01:00
e34036513e
There's no utf8, but there's utf-8
2012-12-23 18:17:03 +01:00
3c3c1630b1
Revert "Don't tell IE it's utf8. Just send it. Otherwise it'll snuff it!"
...
This reverts commit 5fb7a03fb34078a75fe5932563e5a9fe44c57015.
2012-12-23 18:17:01 +01:00
00d7ebc646
Allow html10n to handle import paths relative to the importing file
2012-12-23 18:16:59 +01:00
9d459687af
fixed bug in parseIni
2012-12-23 18:16:56 +01:00
bc0d9c854b
use relativa path in import definitions of locales.json
2012-12-23 18:16:54 +01:00
d9d0312a9e
Don't tell IE it's utf8. Just send it. Otherwise it'll snuff it!
...
(As if we wouldn't look forward to that...)
2012-12-23 18:16:52 +01:00
51f6ac6b71
Fix lang picker, again
2012-12-23 18:16:50 +01:00
a2b2257851
Fix html10n cache and lang fallback
2012-12-23 18:16:48 +01:00
e3f9ed37b4
Hacky solution for exploreDir error
...
We should only traverse the directories of actual plugins instead
of traversing the whole node_modules folder
2012-12-23 18:16:45 +01:00
f4f2c1d9ab
Fix lang picker
2012-12-23 18:16:43 +01:00
64b176f4de
Fix html10n (finally)
2012-12-23 18:16:41 +01:00
67c893aaca
Fix html10n and the locale resource <link>s
2012-12-23 18:16:39 +01:00
2b860986e8
support for json in i18n
2012-12-23 18:16:37 +01:00
1f4a171f10
convert language files from ini to json
2012-12-23 18:16:35 +01:00
6446281254
Migrate lang picker and embed param to html10n.js
2012-12-23 18:16:32 +01:00
754467782f
convert language files from ini to json
2012-12-23 18:16:22 +01:00
f72ec3eb28
convert language files from ini to json
2012-12-23 18:16:19 +01:00
25be9b8c93
Add kick-off code for client-side l10n
2012-12-23 18:16:17 +01:00
edacb3e2ca
Update html10n.js
2012-12-23 18:16:15 +01:00
53521c8732
Replace webL10n with html10n.js
2012-12-23 18:16:13 +01:00
f0b613aa57
Localisation updates from http://translatewiki.net .
2012-12-21 18:45:56 +00:00
fd848c30fd
Localisation updates from http://translatewiki.net .
2012-12-16 22:01:37 +00:00
48b1eb1aa9
Localisation updates from http://translatewiki.net .
2012-12-16 19:17:25 +00:00
a5965bcdb5
Merge pull request #1244 from Wikinaut/add-socketio-transport-protocol-parameter
...
add socketTransportProtocols parameter
2012-12-10 15:15:05 -08:00
05e8c74307
removed console.log of transport protocols
2012-12-10 22:33:00 +01:00
bf5283fa11
Fix issue #725 which was caused by a race condition
2012-12-10 11:34:53 +00:00
f1ca9bb456
Merge pull request #1272 from stephan48/patch-1
...
Added a checkToken Method for checking the Validity of the API Token
2012-12-10 01:17:11 -08:00
ff8b4b6b20
change key of message sucessfull on import
2012-12-09 17:34:32 +01:00
0371d5ba9e
Remove async load of l10n.js because Chrome fail to translate
2012-12-09 09:41:30 +01:00
9f1872afc1
use properties notation
2012-12-09 08:56:58 +01:00
854ed56037
Merge remote branch 'ether/develop' into jstranslate
2012-12-09 08:43:19 +01:00
25125c30c3
Localisation updates from http://translatewiki.net .
2012-12-08 18:47:42 +00:00
5a4c8e2a4a
Merge remote-tracking branch 'upstream/develop' into add-socketio-transport-protocol-parameter
2012-12-08 03:04:48 +01:00
45b1e3eacb
Merge pull request #1249 from leblanc-simon/develop
...
Fix author colors in chat
2012-12-07 05:59:28 -08:00
4318d210ce
Update src/node/db/API.js
...
Corrected function documentation.
2012-12-07 11:28:03 +01:00
26ece95905
Update src/node/db/API.js
...
Added a missing symicolon and removed the padID argument which is not passed(and thus leads to an errors because the callback lands in there).
2012-12-07 11:28:03 +01:00
2163c8be5c
Update src/node/handler/APIHandler.js
...
Added the checkToken function to the function array.
2012-12-07 11:28:03 +01:00
8686da87e8
Update src/node/db/API.js
...
Added a checkToken method for checking if the API token is valid.
2012-12-07 11:28:03 +01:00
5bf79971b8
merged upstream develop
2012-12-07 08:59:13 +01:00
b01903202c
Added new strings to translate for js files
2012-12-07 05:24:40 +01:00
98e03c1d87
Merge pull request #1268 from ether/fix/eejs-block-caching
...
Fix #1247 , #1201 : Don't cache eejs blocks!
2012-12-06 12:13:39 -08:00
c909ed256f
Fix #1247 , #1201 : Don't cache eejs blocks!
...
Caching eejs blocks led to many unexpected bugs
like having to restart the server after installing new plugins
or the legendary connectingbar.gif issue...
2012-12-06 18:35:35 +01:00
1380fda2b2
use the parent window, not the top
2012-12-06 17:51:43 +01:00
1a5035ae6b
reverse old change
2012-12-06 11:53:58 +01:00
bf04a4686a
avoid use of os.tmpDir() for node 0.6 compatibility
2012-12-06 11:49:04 +01:00
f9b6d9f122
Merge remote branch 'ether/develop' into develop
2012-12-06 11:22:05 +01:00
7631096135
fix for multiple cookies support (Also fix for, when session is not valid anymore)
2012-12-06 02:01:38 +01:00
4ce16b526e
Added semicolons
2012-12-06 02:00:58 +01:00
6b3917cde7
Merge pull request #1257 from marcelklehr/fix/api-if-requireAuth
...
Fix #1219 : Make api work if requireAuth is enabled
2012-12-05 07:27:59 -08:00
b5af643969
Merge pull request #1259 from GuillaumeAmat/fixes/import-file-input-size
...
Reduce the file input's width in the import popup to prevent overflow
2012-12-05 06:14:05 -08:00
c853f8fad2
Reduces the width of the file input to prevent overflow in the import popup
2012-12-05 15:02:32 +01:00
fe89a367cc
Fix #1226 : Chrome would load async js
2012-12-05 14:16:44 +01:00
2f37afac66
Merge pull request #1255 from 0ip/feature/show-pl-version
...
Display plugin version numbers in /admin/plugins
2012-12-05 05:09:20 -08:00
377ff1eade
Fix #1219 : Make api work if requireAuth is enabled
2012-12-05 14:04:48 +01:00
8d0ef88baf
Adjust select width
...
looks better :)
2012-12-05 12:55:48 +01:00
20f13bc8ce
Add comment to explain how the property containing the version is being read
2012-12-04 19:08:25 +01:00
1fc5519c86
Display plugin versions
2012-12-04 14:30:30 +01:00
a2b22652ce
added direction language in English
2012-12-04 13:02:23 +01:00
5f949b8457
Update language4translatewiki 0.1.3
2012-12-04 12:12:58 +01:00
b21c4403b2
Merge remote branch 'ether/develop' into languages4translatewiki
2012-12-04 11:40:17 +01:00
55d543f9ca
Merge pull request #1221 from ether/focus-on-password
...
proper fix for focus and some styling of the form and allows for pressin...
2012-12-03 06:35:16 -08:00
1e8d954560
best I can do with this temporary fix for IE
2012-12-03 14:28:25 +00:00
b3e55f64a8
stop password being clearly visible
2012-12-03 13:10:32 +00:00
0b92fdfc62
fix IE auth but only a temp fix
2012-12-03 12:47:11 +00:00
17fb60e483
Merge pull request #1248 from ether/improved-search
...
Improve plugin search
uses modules descriptions too now, bit more cpu heavy, but that's okay
2012-12-03 04:14:15 -08:00
d09894ce77
make it show password dialog on wrong password
2012-12-03 12:05:11 +00:00
4843840d72
last JS fix
2012-12-03 11:44:30 +00:00
b0463bd7d5
whoopsi
2012-12-03 11:41:51 +00:00
bef25b40f8
Merge branch 'develop' of github.com:ether/etherpad-lite into focus-on-password
2012-12-03 11:37:01 +00:00
84d154b168
Update strings, add UK strings, fix JS
2012-12-03 11:35:06 +00:00
38b14c40f0
Add same color in pad and chat for author
2012-12-03 03:43:56 +01:00
b5c263dd37
improve search to use description too, bit more cpu heavy for thats okay
2012-12-03 01:41:01 +00:00
657322db91
fixed git merge confict
2012-12-03 01:39:59 +01:00
8a9045b335
remove ssl not enabled message
2012-12-02 18:33:31 +00:00
0d2eddb62a
console.debug socketTransportProtocols
2012-12-02 18:54:30 +01:00
9224e9beef
removed wrong comment in Settings.js
2012-12-02 18:44:39 +01:00
8b044254cc
add socketTransportProtocols parameter
2012-12-02 18:28:28 +01:00
a74defdab7
Merge branch 'focus-on-password' of github.com:ether/etherpad-lite into focus-on-password
2012-12-02 17:07:23 +00:00
c9a5e55654
Merge branch 'develop' of github.com:ether/etherpad-lite into focus-on-password
2012-12-02 17:06:33 +00:00
3cdf66c2f7
first effort to move into templates but javascript is broken so dont pull
2012-12-02 17:03:56 +00:00
e9e4d65ad4
Localisation updates from http://translatewiki.net .
2012-12-02 12:35:02 +00:00
b0b64358f9
Merge remote branch 'ether/develop' into develop
2012-12-02 05:57:14 +01:00
d4b79a6cba
Localisation updates from http://translatewiki.net .
2012-12-01 11:32:26 +00:00
3dcbd8dd4e
fix the control S to save a revision
2012-11-30 23:28:34 +00:00
a4c4d11cd4
fix letter s...
2012-11-30 15:26:51 -08:00
d761003588
fix path to favicon resolves #1236
2012-11-30 22:50:54 +00:00
ab148ebc1a
Merge pull request #1229 from ether/control-s
...
catch control S and send an event to save a revision -- fixes #1128
2012-11-29 08:57:10 -08:00
53d6d0813e
Merge pull request #1233 from marcelklehr/fix/s.io-perf-with-modern-browsers
...
Let socket.io decide which transport is best for the browser
2012-11-29 06:55:51 -08:00
719fb7e045
Let socket.io decide which transport is best for the browser
2012-11-29 13:42:37 +01:00
795a20b3f2
get languages availables through translatewiki API
2012-11-28 23:54:23 +01:00
93e9d7c852
remove control S comment
2012-11-28 17:20:58 +00:00
8c7939ec9f
catch control S and send an event to save a revision
2012-11-28 17:17:35 +00:00
9ec8a6e3d3
back to globalize... don't work :S
2012-11-28 04:02:55 +01:00
1cc0e8cbf0
Restore original ini file
2012-11-28 03:27:09 +01:00
523c7aebe5
Merge remote branch 'ether/develop' into develop
2012-11-28 03:13:04 +01:00
c445197e7f
Update src/static/css/pad.css
2012-11-27 15:10:36 +00:00
97d77ea089
added my name in header
2012-11-27 00:11:45 +01:00
6fe6103632
added languages for translatewiki
2012-11-26 23:40:31 +01:00
7280376a26
Merge with ether develop
2012-11-26 22:11:31 +01:00
f880473360
remember the styling for the pasword prompt
2012-11-26 20:54:28 +00:00
fddca354b3
proper fix for focus and some styling of the form and allows for pressing enter on form so generally a better fix
2012-11-26 20:52:10 +00:00
b66c9135f7
Merge branch 'develop' of github.com:ether/etherpad-lite into remove-alert-on-wrap
2012-11-26 20:20:21 +00:00
6239c66e36
remove alert on line wrap as it doesnt mean anything
2012-11-26 20:19:27 +00:00
491bf515c6
Merge pull request #1199 from leblanc-simon/develop
...
improving the translation of the timeline
2012-11-26 11:48:08 -08:00
a49bab5dae
fix timeslider rightstep button position
2012-11-26 08:54:13 +01:00
d7cca602df
Added message translatable about features importing without abiword
2012-11-26 03:18:47 +01:00
460200981e
Merge remote branch 'ether/develop'
2012-11-26 02:21:18 +01:00
de5a90b9c7
Localisation updates from http://translatewiki.net .
2012-11-25 12:52:08 +00:00
fdf0b1a384
Merge pull request #1202 from Wikinaut/fix-1148-add-native-node-https-support
...
Fix 1148 add native node https support
2012-11-24 16:35:02 -08:00
6d5907562d
Fixed installed plugins section in plugins/info
2012-11-24 03:18:22 +01:00
8ac49477f9
Fix 1203: non-escaped html in plugins info
2012-11-24 00:42:44 +01:00
ef7590fb73
Fix 1203: non-escaped html in plugins info
2012-11-24 00:26:48 +01:00
0250f8d55c
Merge remote branch 'ether/develop'
2012-11-23 22:57:05 +01:00
cc60b82a6e
Import html by default and allow basic import/export features without abiword
2012-11-23 22:55:25 +01:00
ef3231efd2
cleaning
2012-11-23 19:06:18 +01:00
d0a17d5471
test import converting to html instead to txt by default
2012-11-23 18:18:03 +01:00
94e9cf0a32
improving the translation of the timeline
2012-11-23 06:20:09 +01:00
John McLear