mluto
|
7432b7aff9
|
Rewrote getParams() to be more dynamic and shorter
|
2013-01-27 11:02:15 +01:00 |
|
John McLear
|
e811037300
|
Merge pull request #1411 from ether/feature/plugin-update-checker
plugin update checker
|
2013-01-26 13:36:11 -08:00 |
|
Marcel Klehr
|
541aeb3a98
|
/admin/plugins: Display an update button for all plugins that are outdated
|
2013-01-26 22:15:19 +01:00 |
|
mluto
|
046fac9fa9
|
Added a comment to clearify *why* this works
|
2013-01-25 20:38:24 +01:00 |
|
mluto
|
763864539f
|
Use 'html10n' instead of '_', i10nzed "unnamed author(s)"
|
2013-01-25 17:41:33 +01:00 |
|
mluto
|
4a20a26cbf
|
Merge branch 'develop' of https://github.com/ether/etherpad-lite into hardcoded-i18n
|
2013-01-25 17:14:56 +01:00 |
|
mluto
|
7812d93e74
|
Fixed "unnamed" and "enter your name" in userlist
|
2013-01-25 10:32:09 +01:00 |
|
Marcel Klehr
|
3e793b8a63
|
[/admin/plugins] remove progress history
|
2013-01-24 23:00:56 +01:00 |
|
Marcel Klehr
|
23dd4c73e2
|
pluginfw/installer.js: Don't freak out users with cryptic errors, just use the error message
|
2013-01-24 22:40:31 +01:00 |
|
Marcel Klehr
|
fa55cd4759
|
[/admin/plugins] Add real-time on keypress search
also, I reduced the size of the activity indicator
|
2013-01-24 22:39:52 +01:00 |
|
John McLear
|
569fb8d3c8
|
silly little bug now resolved
|
2013-01-24 16:48:40 +00:00 |
|
John McLear
|
18b96b33c6
|
Merge pull request #1379 from ether/more-plugin-details
resolve #1349 - add url to plugin name
|
2013-01-24 07:29:30 -08:00 |
|
Marcel Klehr
|
9fa5b9506e
|
Add links for installed plugins
|
2013-01-24 13:43:42 +01:00 |
|
Marcel Klehr
|
25e1ed2d0c
|
Fix Array.prototype.indexOf for IE8! <3
|
2013-01-23 17:40:10 +01:00 |
|
John McLear
|
6ae46ea8e3
|
fix issue where url was wrong for install
|
2013-01-22 18:28:38 +00:00 |
|
John McLear
|
159feceb20
|
fix import without params
|
2013-01-22 18:17:15 +00:00 |
|
John McLear
|
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 |
|
John McLear
|
e23108d199
|
fix issue #1369 where params would break import
|
2013-01-22 16:03:00 +00:00 |
|
John McLear
|
441dd3785a
|
fix issue #1110
|
2013-01-20 23:11:59 +00:00 |
|
John McLear
|
8bfa8a7e73
|
better urls
|
2013-01-20 22:42:32 +00:00 |
|
John McLear
|
4cbf3869c6
|
open in external window
|
2013-01-20 22:36:58 +00:00 |
|
John McLear
|
1bf526124d
|
resolve #1349
|
2013-01-20 22:34:27 +00:00 |
|
Marcel Klehr
|
a1188c15c0
|
[html10n] Fix onload event listener (must be attached to window!)
|
2013-01-16 19:47:54 +01:00 |
|
mluto
|
e31b9fd1bd
|
IE8 does not have a string.trim()-function, so use regex..
|
2013-01-16 18:48:25 +01:00 |
|
John McLear
|
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 |
|
mluto
|
77401f2759
|
prevent empty chat-messages from being sent
|
2013-01-14 17:11:56 +01:00 |
|
John McLear
|
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 |
|
Marcel Klehr
|
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 |
|
John McLear
|
ac448937ab
|
fix egils fix of time delta resolves #1345
|
2013-01-10 00:01:38 +00:00 |
|
Marcel Klehr
|
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 |
|
Oscar Perez
|
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 |
|
mluto
|
bc05f9eb0a
|
converted load-more-link to button, added loading-gif, fixed typo
|
2013-01-07 19:15:55 +01:00 |
|
mluto
|
825b258d99
|
only load 20 messages when pressing the load-link, fixed whitespace
|
2013-01-07 17:43:03 +01:00 |
|
mluto
|
5f81daed0a
|
Added link to load more chat-messages using new GET_CHAT_MESSAGES
|
2013-01-07 17:36:03 +01:00 |
|
John McLear
|
8e366da82e
|
use .val() instead of [0]
|
2013-01-07 11:27:40 +00:00 |
|
mluto
|
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 |
|
John McLear
|
c370f779cc
|
stop enter reloading new page on search result request
|
2013-01-02 14:01:39 +00:00 |
|
Marcel Klehr
|
ba6e0d2a05
|
Fix #1307: Chrome needs console.log to be called on console obj
|
2012-12-30 10:56:31 +01:00 |
|
Marcel Klehr
|
fefbdb6fe1
|
Add direction info
|
2012-12-23 18:17:25 +01:00 |
|
Marcel Klehr
|
fdf6628cc5
|
Fix html attr translation
|
2012-12-23 18:17:23 +01:00 |
|
Marcel Klehr
|
04b65a0b4e
|
Add support for three-letter lang codes
|
2012-12-23 18:17:21 +01:00 |
|
Marcel Klehr
|
0c9178d392
|
Fix html10n usage in code that wouldn't allow lang switching
|
2012-12-23 18:17:19 +01:00 |
|
Marcel Klehr
|
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 |
|
Marcel Klehr
|
23b7469df6
|
[html10n] Don't expose lang code, if the language is not available
|
2012-12-23 18:17:14 +01:00 |
|
Marcel Klehr
|
f68adc8553
|
Fix translations in timeslider code
|
2012-12-23 18:17:05 +01:00 |
|
Marcel Klehr
|
00d7ebc646
|
Allow html10n to handle import paths relative to the importing file
|
2012-12-23 18:16:59 +01:00 |
|
Marcel Klehr
|
51f6ac6b71
|
Fix lang picker, again
|
2012-12-23 18:16:50 +01:00 |
|
Marcel Klehr
|
a2b2257851
|
Fix html10n cache and lang fallback
|
2012-12-23 18:16:48 +01:00 |
|
Marcel Klehr
|
f4f2c1d9ab
|
Fix lang picker
|
2012-12-23 18:16:43 +01:00 |
|
Marcel Klehr
|
64b176f4de
|
Fix html10n (finally)
|
2012-12-23 18:16:41 +01:00 |
|
Marcel Klehr
|
67c893aaca
|
Fix html10n and the locale resource <link>s
|
2012-12-23 18:16:39 +01:00 |
|
Marcel Klehr
|
6446281254
|
Migrate lang picker and embed param to html10n.js
|
2012-12-23 18:16:32 +01:00 |
|
Marcel Klehr
|
25be9b8c93
|
Add kick-off code for client-side l10n
|
2012-12-23 18:16:17 +01:00 |
|
Marcel Klehr
|
edacb3e2ca
|
Update html10n.js
|
2012-12-23 18:16:15 +01:00 |
|
Marcel Klehr
|
53521c8732
|
Replace webL10n with html10n.js
|
2012-12-23 18:16:13 +01:00 |
|
Iván Eixarch
|
9f1872afc1
|
use properties notation
|
2012-12-09 08:56:58 +01:00 |
|
Iván Eixarch
|
854ed56037
|
Merge remote branch 'ether/develop' into jstranslate
|
2012-12-09 08:43:19 +01:00 |
|
Marcel Klehr
|
45b1e3eacb
|
Merge pull request #1249 from leblanc-simon/develop
Fix author colors in chat
|
2012-12-07 05:59:28 -08:00 |
|
Iván Eixarch
|
b01903202c
|
Added new strings to translate for js files
|
2012-12-07 05:24:40 +01:00 |
|
0ip
|
20f13bc8ce
|
Add comment to explain how the property containing the version is being read
|
2012-12-04 19:08:25 +01:00 |
|
0ip
|
1fc5519c86
|
Display plugin versions
|
2012-12-04 14:30:30 +01:00 |
|
John McLear
|
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 |
|
John McLear
|
1e8d954560
|
best I can do with this temporary fix for IE
|
2012-12-03 14:28:25 +00:00 |
|
John McLear
|
b3e55f64a8
|
stop password being clearly visible
|
2012-12-03 13:10:32 +00:00 |
|
John McLear
|
0b92fdfc62
|
fix IE auth but only a temp fix
|
2012-12-03 12:47:11 +00:00 |
|
Marcel Klehr
|
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 |
|
John McLear
|
d09894ce77
|
make it show password dialog on wrong password
|
2012-12-03 12:05:11 +00:00 |
|
John McLear
|
4843840d72
|
last JS fix
|
2012-12-03 11:44:30 +00:00 |
|
John McLear
|
b0463bd7d5
|
whoopsi
|
2012-12-03 11:41:51 +00:00 |
|
John McLear
|
bef25b40f8
|
Merge branch 'develop' of github.com:ether/etherpad-lite into focus-on-password
|
2012-12-03 11:37:01 +00:00 |
|
root
|
84d154b168
|
Update strings, add UK strings, fix JS
|
2012-12-03 11:35:06 +00:00 |
|
Simon Leblanc
|
38b14c40f0
|
Add same color in pad and chat for author
|
2012-12-03 03:43:56 +01:00 |
|
John McLear
|
b5c263dd37
|
improve search to use description too, bit more cpu heavy for thats okay
|
2012-12-03 01:41:01 +00:00 |
|
Iván Eixarch
|
657322db91
|
fixed git merge confict
|
2012-12-03 01:39:59 +01:00 |
|
John McLear
|
c9a5e55654
|
Merge branch 'develop' of github.com:ether/etherpad-lite into focus-on-password
|
2012-12-02 17:06:33 +00:00 |
|
root
|
3cdf66c2f7
|
first effort to move into templates but javascript is broken so dont pull
|
2012-12-02 17:03:56 +00:00 |
|
John McLear
|
3dcbd8dd4e
|
fix the control S to save a revision
|
2012-11-30 23:28:34 +00:00 |
|
John McLear
|
a4c4d11cd4
|
fix letter s...
|
2012-11-30 15:26:51 -08:00 |
|
John McLear
|
93e9d7c852
|
remove control S comment
|
2012-11-28 17:20:58 +00:00 |
|
John McLear
|
8c7939ec9f
|
catch control S and send an event to save a revision
|
2012-11-28 17:17:35 +00:00 |
|
John McLear
|
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 |
|
John McLear
|
b66c9135f7
|
Merge branch 'develop' of github.com:ether/etherpad-lite into remove-alert-on-wrap
|
2012-11-26 20:20:21 +00:00 |
|
John McLear
|
6239c66e36
|
remove alert on line wrap as it doesnt mean anything
|
2012-11-26 20:19:27 +00:00 |
|
John McLear
|
491bf515c6
|
Merge pull request #1199 from leblanc-simon/develop
improving the translation of the timeline
|
2012-11-26 11:48:08 -08:00 |
|
Iván Eixarch
|
d7cca602df
|
Added message translatable about features importing without abiword
|
2012-11-26 03:18:47 +01:00 |
|
Iván Eixarch
|
0250f8d55c
|
Merge remote branch 'ether/develop'
|
2012-11-23 22:57:05 +01:00 |
|
Iván Eixarch
|
cc60b82a6e
|
Import html by default and allow basic import/export features without abiword
|
2012-11-23 22:55:25 +01:00 |
|
Simon Leblanc
|
94e9cf0a32
|
improving the translation of the timeline
|
2012-11-23 06:20:09 +01:00 |
|
John McLear
|
1899e3f48d
|
Merge pull request #1197 from hcartiaux/urlfix
Fix urls, use github.com/ether
|
2012-11-21 16:22:21 -08:00 |
|
Hyacinthe Cartiaux
|
d6027726e6
|
Fix urls, use github.com/ether
Signed-off-by: Hyacinthe Cartiaux <hyacinthe.cartiaux@uni.lu>
|
2012-11-22 01:12:30 +01:00 |
|
Mike Brousseau
|
196aafd9d6
|
Update src/static/js/pad.js
Gramatically change. Changed "You're Password" to "Your Password".
|
2012-11-21 13:35:47 -05:00 |
|
John McLear
|
34df9d651e
|
Merge pull request #1188 from joker-x/master
Allow ! in pads urls
|
2012-11-21 09:53:58 -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
|
beb5bf4d7d
|
Merge remote branch 'ether/develop'
|
2012-11-21 03:37:42 +01:00 |
|
Iván Eixarch
|
0c70ada9d7
|
Allow ! in urls autodetection
|
2012-11-21 03:35:49 +01:00 |
|
Marcel Klehr
|
8a23c2ff50
|
Use ; as comments indicator in i18n files
|
2012-11-20 22:08:42 +01:00 |
|
Peter 'Pita' Martischka
|
6de7634357
|
merged develop back in
|
2012-11-13 07:43:48 -08:00 |
|
Peter 'Pita' Martischka
|
4c095202bd
|
Merged branch feature/frontend-tests
|
2012-11-13 07:29:57 -08:00 |
|
0ip
|
c2253e49b6
|
Add ability to set language via URL parameter
|
2012-11-12 18:31:02 +01:00 |
|
Marcel Klehr
|
993d501943
|
Make L10n.js requireable
|
2012-11-12 17:42:07 +01:00 |
|