public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,742 Commits
190 Branches
71 Tags
55 MiB
Commit Graph

2742 Commits (26699618ac44238a08d44b99e7e2a3b77978bb33)

Author SHA1 Message Date
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
spcsser 80333d8e0a Added ability to add menu entries for admin pages. 2013-01-27 23:02:27 +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
Marcel Klehr 0549a4fec7 Add checkUpdates endpoinnt for /admin/plugins 2013-01-26 22:13:28 +01:00
John McLear 4dab76f78a Merge pull request #1410 from ether/admin-css-fix 
Admin css fix
 2013-01-26 12:07:42 -08:00
John McLear 1290fa36c3 typo fix 2013-01-26 20:05:37 +00:00
John McLear 9d0672c1c8 not a perfect css fix but stops the overflow when screen is less than 1000px 2013-01-26 20:04:33 +00:00
John McLear 090508909e Merge pull request #1389 from ether/disconnect-eejs-block 
add eejs block for disconnect
 2013-01-26 09:06:53 -08:00
John McLear 0ccd1a30e9 Merge pull request #1390 from ether/html-head-block-eejs 
add a html block eejs so you can add a cache manifest
 2013-01-26 09:06:38 -08:00
John McLear 51daaf02ce Merge pull request #1407 from mluto/hardcoded-i18n 
i10ze hardcoded message, update some messages on lang-change
 2013-01-26 07:19:04 -08:00
John McLear 994366750f Merge pull request #1408 from mluto/chat-api 
Added API-Endpoints for chat
 2013-01-26 07:15:24 -08:00
mluto cb2b93b133 Added getChatHistory and getChatHead (api+code+doc) 2013-01-26 14:35:26 +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
Marcel Klehr cf1bba8e65 Merge pull request #1406 from mluto/fix-en-json 
Re-Formatted en.json
 2013-01-25 08:11:56 -08:00
mluto 509f564cd7 re-formated onelined en.json 2013-01-25 17:06:57 +01:00
Marcel Klehr 2841bfc009 Merge branch 'feature/real-time-plugin-search' into develop 2013-01-25 14:50:51 +01:00
mluto 7812d93e74 Fixed "unnamed" and "enter your name" in userlist 2013-01-25 10:32:09 +01:00
John McLear 82e681fb14 Update settings.json.template 2013-01-24 22:39:32 +00:00
John McLear 568b641ee9 Merge pull request #1404 from ether/feature/real-time-plugin-search 
real-time plugin search
 2013-01-24 14:09:30 -08: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 19e112f160 Merge pull request #1403 from ether/index-wrapper-block 
index wrapper block
 2013-01-24 13:37:00 -08:00
John McLear 1f7140345a index wrapper block 2013-01-24 20:03:07 +00:00
John McLear 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
Marcel Klehr 7c06dc750c Unify admin page titles 2013-01-24 18:46:32 +01:00
Marcel Klehr 2eccaa2afd Add a uniform menu to all admin pages 2013-01-24 18:46:15 +01:00
Marcel Klehr 0c3d90b753 Merge pull request #1401 from ether/slider-position 
Fix #1360 -- slider pin position
 2013-01-24 09:00:46 -08:00
John McLear 569fb8d3c8 silly little bug now resolved 2013-01-24 16:48:40 +00:00