Commit graph

379 commits

Author SHA1 Message Date
cohitre
52aa7d3997 Registering commands on the ace toolbar 2013-03-10 15:42:12 -07:00
cohitre
292a3bd7b7 Setting up the right toolbar. 2013-03-09 14:57:42 -08:00
John McLear
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
mluto
b5eeeb7dc2 Don't show notifications when loading the chat-messages. 2013-01-30 12:16:32 +01:00
John McLear
daaa650a1b remove message about requiring comments 2013-01-29 12:15:11 +00:00
John McLear
a7361f5ce0 make tinycon update on all chat messages not just ones that mention your name 2013-01-29 12:09:16 +00:00
John McLear
fa7952523e spacing 2013-01-29 02:08:37 +00:00
John McLear
1c7810783c gritter now implemented 2013-01-29 01:55:36 +00:00
John McLear
2ae3dae492 introduce gritter files and ensure its available 2013-01-29 00:46:36 +00:00
John McLear
c6f997981b Merge pull request #1417 from ether/diff-view
Adds an API endpoint for Diff view
2013-01-28 13:50:31 -08:00
John McLear
e1cd34763d Merge pull request #1418 from mluto/timeslider-jump-revisions
Jump to revisions in timeslider
2013-01-28 13:29:47 -08:00
mluto
01fe5c183d Only set url if the revsion will actually be loaded 2013-01-28 21:44:21 +01:00
mluto
a239158b49 Renamed paramSettings to getParameters, to cause less confusion 2013-01-28 20:17:34 +01:00
mluto
f974136d0c Jump to revision given in URL, add current revision to URL 2013-01-28 10:13:37 +01:00
John McLear
3fac18f88a resolve merge conflict 2013-01-27 17:54:26 +00:00
Peter 'Pita' Martischka
dcfb1b2ea4 Added missing functions to create pad diffs 2013-01-27 15:40:37 +00:00
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