bf93500214
some polish for a turd
2013-04-08 19:50:52 +01:00
946289c221
temp patch for 1652
2013-04-08 19:46:45 +01:00
7728d5b321
remove draggable which was used for dragging users in the userbox
2013-04-08 17:23:03 +01:00
12bc98af7e
Merge pull request #1716 from ether/only-redraw-existing-lines
...
only try to redraw the line height of lines that exist..
2013-04-08 08:44:48 -07:00
324b9b1f5f
pluginfw/installer: Only restart the server when all tasks have finished
...
fixes #1685
2013-04-08 16:14:03 +02:00
f135f79d13
only try to redraw the line height of lines that exist..
2013-04-07 19:06:15 +01:00
ffc8f61a2f
remove cruft
2013-04-07 18:44:13 +01:00
12a2da2884
attempting to get right client authorid sent with changeset
2013-04-07 18:40:55 +01:00
402a4b7b3e
html10n.js: Finally fix two-part locale specs
...
fixes #1706
2013-04-05 14:18:46 +02:00
883be3d48d
begin by adding some template css
2013-04-05 02:21:56 +01:00
380821781f
dont use top, use the scheduler
2013-04-04 02:25:19 +01:00
c5b4e4934d
Kick the user if has already successfully authenticated but his session became invalid later
2013-04-03 11:19:26 +02:00
56275d8de7
longer timeout on reconnection
2013-04-02 12:20:38 -07:00
1793e93ea1
Decode the sessionID before sending it to the server since our separator ',' gets encoded
2013-03-31 11:30:01 +02:00
6a5e5cb6fd
Merge pull request #1640 from ether/caret-refactor
...
Caret refactor - I need help with tests...
2013-03-30 09:21:35 -07:00
f1b60e9867
Merge pull request #1677 from ether/ctrl-s-fade
...
show light yellow for .5 secs on save revision keypress
2013-03-28 20:11:30 -07:00
c67c7ca746
remove messy bits
2013-03-29 03:09:10 +00:00
0ff5137da3
Make revision button glow on ctrl-s and increase duration
2013-03-28 16:39:33 +01:00
59a9ff404d
more settimeout to top window
2013-03-28 13:18:55 +00:00
c489177206
show light yellow for .5 secs on save revision keypress
2013-03-28 02:24:59 +00:00
09b32ea694
Merge pull request #1672 from ether/feature/admin-plugins-revamp
...
/admin/plugins revamp
2013-03-27 12:05:00 -07:00
2abb993e8b
Merge pull request #1607 from ether/custom-obj-msg
...
Custom Object messages
2013-03-27 11:50:56 -07:00
cbee50d42d
/admin/plugins: Display a tooltip when hovering the plugin details link
2013-03-27 12:28:54 +01:00
bc8d6d4c45
/admin/plugins: Add a loading indicator to some messages
2013-03-27 12:20:50 +01:00
c4d9a71156
/admin/plugins: Fix update check
2013-03-27 12:02:19 +01:00
cee1ead8f6
Merge pull request #1664 from ether/sticky-chat
...
Option to enable Sticky chat from the chat dialogue
2013-03-26 13:12:01 -07:00
d01a209cbf
/admin/plugins: Dry up displaying of info messages
2013-03-26 21:04:21 +01:00
76c879bb47
/admin/plugins: Fix for smaller screens
2013-03-26 20:41:24 +01:00
806926d0f6
/admin/plugins: If a user installs sth scroll up to the loading indicator
2013-03-26 19:54:23 +01:00
4edb3b7ab3
/admin/plugins: Fix infinite scroll for larger screens
2013-03-26 19:32:15 +01:00
2393dcd652
Disable search until registry is loaded and fix sorting by version
...
... and always display a scrollbar.
2013-03-26 19:22:04 +01:00
f75a839cd0
Remove plugin prefix in pluin lists and make links to plugins more clear
2013-03-26 18:39:46 +01:00
7edfff7574
/admin/plugins: Show some text if nothing is display otherwise
2013-03-26 16:23:47 +01:00
638cea5fd6
Install and uninstall plugins with style
...
- Don't block the whole page when installing a plugin
- allow people to search and install other plugins meanwhile
Why? http://i.imgur.com/XoX6uYS.jpg
2013-03-26 15:11:30 +01:00
981a33f01e
pluginfw/installer.js fire callbacks only once
2013-03-26 14:40:19 +01:00
aca5d150e4
/admin/plugins: Don't list installed plugins as available
2013-03-26 11:58:31 +01:00
511407241a
/admin/plugins: Make it display the same amount of plugins after sorting
2013-03-26 11:38:51 +01:00
5d7a8adcb7
Silence npm when using npm.commands.search
2013-03-26 11:33:04 +01:00
9109bd206e
Catch all errors in pluginfw/installer.js
2013-03-26 11:20:12 +01:00
e8bae61cf5
/admin/plugins: Add progress indicators and report errors
2013-03-26 11:19:36 +01:00
6b55d13370
expose ace document, reqjired for various plugins
2013-03-26 01:54:01 +00:00
b35d9c14fd
/admin/plugins:Hide ep_etherpad-lite in the list of installed plugins
2013-03-25 23:52:10 +01:00
773293991b
admin/plugins: Allow people to sort search results
2013-03-25 23:09:03 +01:00
1ebbcd2f30
Don't leak event listeners in pluginfw/installer.js
...
fixes #921
2013-03-25 17:22:51 +01:00
079fdf0f38
Revamp /admin/plugins
...
- dry up the client-side code
- use the new saner API of pluginfw/installer.js on the server
- Improve UX: allow user to infinitely scroll to display their results
2013-03-25 17:20:10 +01:00
b297784288
Make npm registry access code more sane
2013-03-25 16:51:12 +01:00
0070eab416
Fix caching of npm search results and only make one registry request on /admin/plugins
...
fixes #1488
2013-03-25 12:45:23 +01:00
2e7a9796de
option to show sticky chat on screen, note i use a literal string, how am i supposed to add a l10n title?
2013-03-24 01:12:01 +00:00
0063933041
fix cookies
2013-03-23 02:59:12 +00:00
23abafb3cb
Issue #1648 - Long lines without any spaces don't wrap on Firefox, the text ends up going off screen
2013-03-20 15:48:11 -07:00
4ea7ccd104
merge develop
2013-03-20 01:11:27 +00:00
bcb92f25a6
Refactor chat notifications and the chatNewMessage hook
2013-03-19 20:21:27 +01:00
d0e656d0a6
Merge branch 'develop' of github.com:ether/etherpad-lite into custom-obj-msg
2013-03-19 13:59:07 +00:00
7741f762e2
hook for chat msg
2013-03-19 02:21:53 +00:00
b3dbf1c995
Update html10n.js
2013-03-18 22:29:42 +01:00
3562672a75
stop start point going negative
2013-03-18 18:44:01 +00:00
27e9f91864
page up, down etc all working, still no shift page up/down for highlight but that never worked anyways
2013-03-18 18:03:37 +00:00
9f54a65c88
refactored arrow keys now work after paste in chrome
2013-03-18 17:40:18 +00:00
3e0a80cb74
remove console log
2013-03-17 15:17:36 +00:00
693b9b9b94
better mobile support for gritter messages, before it was awful
2013-03-17 01:23:31 +00:00
a1d9d27cde
much cleaner way of showing / hiding overlay
2013-03-16 17:57:23 +00:00
69a4ab76cf
hide modal once reconnect is good
2013-03-16 17:50:53 +00:00
13ad46aa67
a safer approach I think but still be careful
2013-03-16 13:19:12 +00:00
cf041dcb08
Merge pull request #1618 from ether/tidy-up
...
Tidy up
2013-03-14 14:32:13 -07:00
5d12be940c
return text instead of html
2013-03-14 18:28:35 -03:00
383439629a
specialkey doesnt even exist afaik
2013-03-14 18:27:32 -03:00
1bb9d1d625
remove pointless +
2013-03-14 18:23:27 -03:00
d72abceee7
escape .color
2013-03-14 18:18:14 -03:00
babb33d825
add authorId to chat and userlist, possibly privacy/security issue?
2013-03-13 21:55:29 +01:00
52aa7d3997
Registering commands on the ace toolbar
2013-03-10 15:42:12 -07:00
292a3bd7b7
Setting up the right toolbar.
2013-03-09 14:57:42 -08:00
26a6765b50
fix indent on chrome in linux
2013-03-08 08:40:40 -08:00
1e94eaa06c
fix safari rtl dissapearing pad
2013-03-06 14:50:08 +00:00
5731ef7802
Fix ace rtlIsTrue property setter
2013-03-06 15:40:02 +01:00
2a8038b9fe
Merge pull request #1593 from marcelklehr/feature/rtl-pad-setting
...
Add a setting for RTL text direction (integrating the url paramter)
2013-03-06 05:58:47 -08:00
760e1b82c3
Add a setting for RTL text direction (integrating the url paramter)
...
Fixes #1191
2013-03-05 23:12:00 +01:00
f9f8b1c079
allow chrome to do control z type functionality, not sure why this was never in.. broken when we last updated jQ anyway
2013-03-05 20:30:31 +00:00
994c4ebeed
stop the client disconnecting of the server sends out a bad revision #, this is very dangerous, the server really shouldn't be sending the same rev #, we could really do with some strong tests case that cover this. Either way this commit 'resolves' #1510
2013-02-27 19:29:59 +00:00
18b6cf1534
Merge pull request #1523 from ether/store-sessions-in-db
...
Store sessions in db
2013-02-26 18:03:54 -08:00
ad52b40597
post correct url, heh
2013-02-26 13:24:24 +00:00
b2eb1b3814
post url with pad error msg
2013-02-26 13:14:17 +00:00
f915285f15
merge develop
2013-02-25 10:13:50 +00:00
5b89242c5b
Merge pull request #1538 from ether/timeslider-init-hook
...
timeslider init hook
2013-02-25 02:12:37 -08:00
4a98ec3c23
resolve merge conflict
2013-02-20 22:37:27 +00:00
9eff8576ef
timeslider init hook
2013-02-18 22:04:58 +00:00
cda3a0e78b
a different approach
2013-02-18 21:03:52 +00:00
c986a8565a
Merge pull request #1535 from ether/fix-extractPadData
...
fix extract and checkPad
2013-02-18 12:41:46 -08:00
ab81b5cfe9
dont jump pages
2013-02-18 19:46:31 +00:00
5441179e78
dont jump pages
2013-02-18 19:38:25 +00:00
e7a07a495c
Merge pull request #1531 from ether/fix-for-long-strings
...
make the focus jump back to the left if it's required
2013-02-18 11:26:46 -08:00
2ee3d0469e
Merge pull request #1533 from ether/indenting-text
...
Indenting text
2013-02-18 11:25:55 -08:00
7fcc71710f
dont exposrt sendSocketMs
2013-02-18 18:59:53 +00:00
75fd27998e
expose socket timeslider with a bad hack
2013-02-18 18:58:58 +00:00
4cfac2f624
fix extract and checkPad
2013-02-18 08:29:25 -08:00
77d03d3473
Try to add some sanity to indentation
2013-02-18 01:40:34 +00:00
48ffbde731
allow colon to indent line
2013-02-18 01:10:54 +00:00
6d7e709ecb
Merge branch 'develop' of github.com:ether/etherpad-lite into store-sessions-in-db
2013-02-17 23:44:26 +00:00
51a9ecf1f0
better support for other browsers
2013-02-17 21:19:15 +00:00
7e023ce8e1
make the focus jump back to the left if it's required
2013-02-17 21:03:19 +00:00
9ca2275432
Fixes #1498 : Two-part locale specs in lang cookie wouldn't be read correctly
2013-02-17 21:35:46 +01:00
04f609752f
actually works
2013-02-17 18:05:25 +00:00
6b47fb69d0
seems to be working pretty well
2013-02-17 18:01:25 +00:00
93d58b93be
Update src/static/css/iframe_editor.css
2013-02-17 17:13:02 +00:00
140ff6f1bf
dont lose focus on key up, doesn't work yet
2013-02-15 12:24:16 +00:00
36814ed42b
apply overlay and remove overlay instantly
2013-02-13 23:44:20 +00:00
14dca92692
Merge pull request #1505 from ether/fix-for-long-strings
...
very simple fix that might break other things but stops the caret focus ...
2013-02-12 11:06:45 -08:00
a37d396577
fix issue where opera was doing stupid things but still an issue w/ double tabs exists
2013-02-12 19:04:43 +00:00
2f20461445
a comment
2013-02-12 00:13:47 +00:00
5f73a5ec30
very simple fix that might break other things but stops the caret focus being moved to the end of new lines when a long string without spaces is pasted into a pad
2013-02-12 00:08:44 +00:00
24485283fd
Merge pull request #1504 from ether/feature/bringJqueryBack
...
Checked JQuery back in. Temporary fix for #1499
2013-02-11 14:05:31 -08:00
b76e49ecde
Checked JQuery back in. Temporary fix for #1499
2013-02-11 21:22:16 +00:00
0953a5ac33
Brought scheduler back completly, fixes #1502
2013-02-11 20:51:40 +00:00
25fd3c5901
Windows and Mobile tests should be case insensitive
2013-02-10 22:10:25 +00:00
8d8487dfa6
Made jquery browser usable in testframework
2013-02-10 21:49:00 +00:00
1fbd408e82
replaced opera regex check with jquery browser check
2013-02-10 21:21:22 +00:00
500c451ba1
removed hack, because its uncessary now that scheduler is back
2013-02-10 21:19:48 +00:00
5e041aaedb
Moved old jquery recognition to seperate file
2013-02-10 20:34:27 +00:00
60de52477c
jquery shouldn't be checked in
2013-02-10 20:14:13 +00:00
6191b01633
Merge pull request #1477 from ether/fix-opera-double-enter
...
Fixes #940 : opera double enter
2013-02-10 05:10:38 -08:00
98d45af0f9
Merge pull request #1484 from disy-mk/develop
...
jquery update 1.7.1 -> 1.9.1
2013-02-09 18:18:40 -08:00
7b3d567d0c
.browser() support
...
Code appended to support use of .browser() (which is deprecated as of jquery 1.3 and was removed with v.1.9.0)
2013-02-10 02:53:07 +01:00
cd77f3e637
Merge pull request #1483 from 0ip/ua
...
Add UA functions
2013-02-09 17:47:34 -08:00
7389e90cd0
update jquery 1.7.1 -> 1.9.1
2013-02-10 02:37:17 +01:00
c3a29d1480
Add missing export entry for the browser object
2013-02-09 22:35:10 +01:00
7ddfdc3935
Add UA functions
2013-02-09 22:26:47 +01:00
8a6b3c90e2
Fix loader styling
2013-02-09 21:29:11 +01:00
8fb8f0d3b6
Change settings layout
2013-02-09 21:22:23 +01:00
40734e6776
Fix table CSS
2013-02-09 20:58:57 +01:00
a45a8a837d
stop opera doing stupid things
2013-02-09 19:44:13 +00:00
b04e99bddc
Tweak admin-UI
2013-02-09 17:54:39 +01:00
a93ff37879
fix opera by recreating a scheduler object
2013-02-09 16:42:47 +00:00
ef0a6ce5ff
Remove top-border
2013-02-09 17:39:08 +01:00
5f79546c2a
Merge pull request #1465 from mluto/kill-ep-stuff
...
Removing old etherpad code
2013-02-08 13:21:57 -08:00
f2cd9e3adc
Removed sidebar-code since the sidebar got removed in EPL, there is only the stickychat which is not affected by this.
2013-02-08 22:06:28 +01:00
e6454af5ed
Removed fullWidth/resizing-code as the pad is always fullscreen, unlike the old EP
2013-02-08 22:00:17 +01:00
fc60ab24fa
Removed debug code, moved hash-setting after the param-checking
2013-02-07 15:34:10 +01:00
0d5b98a338
Removed isProPad, since all pads are public except for group-pads
2013-02-07 14:30:09 +01:00
0cbd4034b1
Killed pad_docbar.js as it's from the old etherpad and not used
2013-02-07 13:59:41 +01:00
6e8dcee650
Removed old chat-code
2013-02-07 11:15:16 +01:00
e78879c300
Merge pull request #1461 from ether/slider-nan
...
stop slider showing NaN on tiny pads
2013-02-06 15:45:39 -08:00
284748adb7
stop slider showing NaN on tiny pads
2013-02-06 23:35:58 +00:00
adaded343d
better fix for IE8 page up down
2013-02-06 20:09:30 +00:00
dd49c71af9
fixes IE8 error by only redifining if firefox
2013-02-06 19:43:28 +00:00
eaa835630c
Support Page Up and Page Down in ace
2013-02-03 17:39:49 +00:00
cba001341f
Remove legacy mozilla specific code from ace inner
2013-02-03 14:03:10 +00:00
d30daccb10
Don't handle selections that are not from the inner frame
2013-02-03 13:44:37 +00:00
b9b5ebf661
Update src/static/js/html10n.js
...
Added missing semicolons (#1440 )
2013-02-01 21:28:22 +01:00
f8cc7e0d7b
Merge pull request #1438 from mluto/plugin-search-case-senstive
...
Made plugin search not casesensitive
2013-01-31 10:13:37 -08:00
037478cbcd
Made plugin search not casesensitive
2013-01-31 19:05:23 +01:00
1f348d911f
Merge branch 'develop' into admin-index-plugable
2013-01-30 20:16:51 +01:00
5b285e2ffa
Merge pull request #1430 from mluto/notification-on-startup
...
Don't show notifications when loading the chat-messages.
2013-01-30 06:33:47 -08:00
b5eeeb7dc2
Don't show notifications when loading the chat-messages.
2013-01-30 12:16:32 +01:00
daaa650a1b
remove message about requiring comments
2013-01-29 12:15:11 +00:00
a7361f5ce0
make tinycon update on all chat messages not just ones that mention your name
2013-01-29 12:09:16 +00:00
fa7952523e
spacing
2013-01-29 02:08:37 +00:00
1c7810783c
gritter now implemented
2013-01-29 01:55:36 +00:00
2ae3dae492
introduce gritter files and ensure its available
2013-01-29 00:46:36 +00:00
c6f997981b
Merge pull request #1417 from ether/diff-view
...
Adds an API endpoint for Diff view
2013-01-28 13:50:31 -08:00
e1cd34763d
Merge pull request #1418 from mluto/timeslider-jump-revisions
...
Jump to revisions in timeslider
2013-01-28 13:29:47 -08:00
01fe5c183d
Only set url if the revsion will actually be loaded
2013-01-28 21:44:21 +01:00
a239158b49
Renamed paramSettings to getParameters, to cause less confusion
2013-01-28 20:17:34 +01:00
f974136d0c
Jump to revision given in URL, add current revision to URL
2013-01-28 10:13:37 +01:00
80333d8e0a
Added ability to add menu entries for admin pages.
2013-01-27 23:02:27 +01:00
3fac18f88a
resolve merge conflict
2013-01-27 17:54:26 +00:00
dcfb1b2ea4
Added missing functions to create pad diffs
2013-01-27 15:40:37 +00:00
7432b7aff9
Rewrote getParams() to be more dynamic and shorter
2013-01-27 11:02:15 +01:00
e811037300
Merge pull request #1411 from ether/feature/plugin-update-checker
...
plugin update checker
2013-01-26 13:36:11 -08:00
541aeb3a98
/admin/plugins: Display an update button for all plugins that are outdated
2013-01-26 22:15:19 +01:00
1290fa36c3
typo fix
2013-01-26 20:05:37 +00:00
9d0672c1c8
not a perfect css fix but stops the overflow when screen is less than 1000px
2013-01-26 20:04:33 +00:00
046fac9fa9
Added a comment to clearify *why* this works
2013-01-25 20:38:24 +01:00
763864539f
Use 'html10n' instead of '_', i10nzed "unnamed author(s)"
2013-01-25 17:41:33 +01:00
4a20a26cbf
Merge branch 'develop' of https://github.com/ether/etherpad-lite into hardcoded-i18n
2013-01-25 17:14:56 +01:00
7812d93e74
Fixed "unnamed" and "enter your name" in userlist
2013-01-25 10:32:09 +01:00
3e793b8a63
[/admin/plugins] remove progress history
2013-01-24 23:00:56 +01:00
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
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
ccc06b08ee
Merge pull request #1402 from marcelklehr/feature/uniform-admin-menu
...
Add a unified menu to all admin pages
2013-01-24 10:00:58 -08:00
2eccaa2afd
Add a uniform menu to all admin pages
2013-01-24 18:46:15 +01:00
569fb8d3c8
silly little bug now resolved
2013-01-24 16:48:40 +00:00
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
3719ce7c5d
[admin] Make links prettier
2013-01-24 13:50:49 +01:00
9fa5b9506e
Add links for installed plugins
2013-01-24 13:43:42 +01:00
25e1ed2d0c
Fix Array.prototype.indexOf for IE8! <3
2013-01-23 17:40:10 +01:00
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
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
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
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
77401f2759
prevent empty chat-messages from being sent
2013-01-14 17:11:56 +01: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
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
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
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
c370f779cc
stop enter reloading new page on search result request
2013-01-02 14:01:39 +00:00
ba6e0d2a05
Fix #1307 : Chrome needs console.log to be called on console obj
2012-12-30 10:56:31 +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
f68adc8553
Fix translations in timeslider code
2012-12-23 18:17:05 +01:00
00d7ebc646
Allow html10n to handle import paths relative to the importing file
2012-12-23 18:16:59 +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
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
6446281254
Migrate lang picker and embed param to html10n.js
2012-12-23 18:16:32 +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
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
45b1e3eacb
Merge pull request #1249 from leblanc-simon/develop
...
Fix author colors in chat
2012-12-07 05:59:28 -08:00
b01903202c
Added new strings to translate for js files
2012-12-07 05:24:40 +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
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
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
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
John McLear
