Commit Graph

2619 Commits (90837437c58f3510a17ef4807d84ead267f81a25)

Author SHA1 Message Date
cohitre 90837437c5 Moving the toolbar plugin calls. 2013-04-13 12:06:51 -07:00
cohitre 988653b8ce Toolbar hooks 2013-03-12 19:36:04 -07:00
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
cohitre c57bc444cd basic toolbar setup 2013-03-03 16:06:14 -08:00
Marcel Klehr 7a0ad3235a Merge pull request #1433 from ether/release/1.2.7
Release 1.2.7
2013-01-30 07:29:49 -08:00
John McLear 594d53ee8b changelog and package file 2013-01-30 14:58:23 +00:00
John McLear 8012e1b668 Merge branch 'release/1.2.7' 2013-01-30 14:50:28 +00:00
John McLear 037ca9b3fd Merge pull request #1432 from mluto/rename-save-revision
Renamed "Saved Revisions" to "Save Revision"
2013-01-30 06:47:10 -08:00
mluto d669779eb8 Renamed "Saved Revisions" to "Save Revision" since it saves a revision.. 2013-01-30 15:45:48 +01:00
John McLear 1814c756ad Merge pull request #1431 from mluto/fix-userinfo-crash
Fix USERINFO_UPDATE crash
2013-01-30 06:43:37 -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 7e48e025c7 Check for missing payload on CLIENT_MESSAGE 2013-01-30 15:28:54 +01:00
mluto f2742c5b63 Check for missing userInfo 2013-01-30 15:21:25 +01:00
mluto b5eeeb7dc2 Don't show notifications when loading the chat-messages. 2013-01-30 12:16:32 +01:00
John McLear e7cb7c46c1 Merge pull request #1428 from ether/padUsers-authorID
Include author ID in padUsers response
2013-01-29 09:41:39 -08:00
John McLear 9ed2a2bb8f Merge pull request #1426 from ether/notifications
Modularize Notifications
2013-01-29 08:50:34 -08:00
John McLear a19ad983f1 docs for api change 2013-01-29 16:48:56 +00:00
John McLear edd8b12049 push authorID to author object and return via api... 2013-01-29 16:45:09 +00: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 4c5ef1f814 Merge branch 'develop' of github.com:ether/etherpad-lite into develop 2013-01-28 21:53:11 +00:00
John McLear 10c2ac2a69 have a nice changelog makes it easier for when we release 2013-01-28 21:52:14 +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 0b90e5752b Added a test to check the export-url 2013-01-28 21:38:56 +01:00
mluto 3002807741 Added tests for revision-jumping 2013-01-28 21:12:50 +01:00
Marcel Klehr dcff3bddda Merge pull request #1413 from mluto/clean-getParams
Rewrote getParams() to be more dynamic and shorter
2013-01-28 12:03:31 -08:00
mluto a239158b49 Renamed paramSettings to getParameters, to cause less confusion 2013-01-28 20:17:34 +01:00
John McLear 51eff0d659 change to createDiffHTML 2013-01-28 16:53:29 +00:00
John McLear 4378561882 change to createDiffHTML 2013-01-28 16:52:23 +00:00
mluto f974136d0c Jump to revision given in URL, add current revision to URL 2013-01-28 10:13:37 +01:00
Siebrand Mazeland 75b861e93b Localisation updates from http://translatewiki.net. 2013-01-27 19:41:00 +00:00
John McLear 3fac18f88a resolve merge conflict 2013-01-27 17:54:26 +00:00
John McLear ed5644d4e5 docs 2013-01-27 17:51:40 +00:00
Peter 'Pita' Martischka 878fd7631c Fixed HTML export 2013-01-27 17:25:50 +00:00
John McLear 189f4347b1 Merge pull request #1412 from ether/fix-doc-build
fix make file issue
2013-01-27 09:08:58 -08:00
John McLear d478ae2386 take two at fixin Mac issue 2013-01-27 16:59:52 +00:00
Peter 'Pita' Martischka 07a267be7a Added colors to pad diff 2013-01-27 16:45:09 +00:00
John McLear 6f743c6ee2 make makefile work for darwin(mac) 2013-01-27 16:45:01 +00:00
Peter 'Pita' Martischka dcfb1b2ea4 Added missing functions to create pad diffs 2013-01-27 15:40:37 +00:00
Peter 'Pita' Martischka f4690dda9d fixed indent 2013-01-27 15:40:05 +00:00
mluto 7432b7aff9 Rewrote getParams() to be more dynamic and shorter 2013-01-27 11:02:15 +01:00
John McLear 77403942ee fix make file issue 2013-01-27 03:08:21 +00: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