summaryrefslogtreecommitdiff
path: root/src/templates
AgeCommit message (Collapse)Author
2015-01-19semi working exampleJohn McLear
2014-12-31Merge pull request #2418 from ether/etherpad-export-and-importJohn McLear
Full Pad portability (Export/Import)
2014-12-29semi working requires browser refreshJohn McLear
2014-12-28Use camel caseGared
2014-12-28Notify user if cookies can't be createdGared
2014-12-27removing dokuwikiJohn McLear
2014-11-23Merge pull request #2335 from ether/javascript-bowerJohn McLear
swap out jquery browser for bower but expose browser object to all pages...
2014-11-22swap out jquery browser for bower but expose browser object to all pages ↵John McLear
also enable minification.. Seems to work well
2014-11-22Changed relative path to Etherpad main page in admin settings.l-y-n-x
There was one '../' too much.
2014-11-19Merge branch 'develop' of github.com:ether/etherpad-lite into new-iconsJohn McLear
2014-11-19move tiny bit of font awesome we actually use into pad.cssJohn McLear
2014-11-18working blocksJohn McLear
2014-11-18no image on timesliderJohn McLear
2014-11-18remove connecting bar imageJohn McLear
2014-11-18spinning loading iconsJohn McLear
2014-11-18remove stuff, new filesJohn McLear
2014-10-14Add a subset of FontAwesome icons using FontelloPrateek Saxena
Most of the code here has been taken from @LaKing's #2554. Only icons required for etherpad have been added. Here is a list of the code points that are being used: 0xe800 0xe801 0xe802 0xe803 0xe804 0xe805 0xe806 0xe807 0xe808 0xe809 0xe80a 0xe80b 0xe80c 0xe80d 0xe80e 0xe80f 0xe810 0xe811 0xe812 0xe813 0xe814 0xe815 0xe816 0xe817 Their related icon names can be seen in: /src/static/css/fontawesome-etherpad.css Even though this patch *adds* all the required icons it only uses them in the in toolbar. The switch to using only FontAwesome icons and the removal of old PNG files will only happen after the timeslider interface has been updated. This is the first step for #2253
2014-10-03Fix active button ui0ip
2014-03-30Create a customizable timeslider toolbarMarcel Klehr
2014-03-30Fix timeslider export dropdownMarcel Klehr
2014-03-16Merge branch 'pr/1579' into toolbar-testMarcel Klehr
Conflicts: settings.json.template src/static/js/pad_editbar.js
2013-12-09Merge pull request #2028 from webzwo0i/remove-deadcodeJohn McLear
Remove deadcode
2013-12-08remove hidden input field padId which is send on every import but not usedwebzwo0i
2013-12-07Merge pull request #2026 from ether/afterEditHookJohn McLear
after Edit eejs block
2013-12-05Replace tabs indentation with spaces indentationLuc Didry
Some files are obviously external libraries, I didn't touch them
2013-12-04after Edit eejs blockJohn McLear
2013-12-02Update pad.htmlEloy
Select the URL when click at the text.
2013-10-10Add explanations for more disconnect scenariosMarcel Klehr
2013-09-21make export clearly seperated from importJohn McLear
2013-09-12Beautify infinite scrollMarcel Klehr
2013-08-14utf-8 without BOM; removed trailing white spacesWikinaut
2013-08-14adding backlinks to main page in Admin pages; fix for ↵Wikinaut
https://github.com/ether/etherpad-lite/issues/1277
2013-04-13Moving the toolbar plugin calls.cohitre
2013-04-09no need to declare var twiceJohn McLear
2013-04-09expose broadcast slider so plugins can interact with itJohn McLear
2013-04-05 no need for the language string on that divJohn McLear
2013-03-28Merge pull request #1681 from ether/loading_blockJohn McLear
Loading blocks
2013-03-29Loading blocksJohn McLear
2013-03-27Merge pull request #1672 from ether/feature/admin-plugins-revampJohn McLear
/admin/plugins revamp
2013-03-27/admin/plugins: Add a loading indicator to some messagesMarcel Klehr
2013-03-27/admin/plugins: Fix update checkMarcel Klehr
2013-03-26/admin/plugins: Dry up displaying of info messagesMarcel Klehr
2013-03-26Disable search until registry is loaded and fix sorting by versionMarcel Klehr
... and always display a scrollbar.
2013-03-26/admin/plugins: Show some text if nothing is display otherwiseMarcel Klehr
2013-03-26Install and uninstall plugins with styleMarcel Klehr
- 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/admin/plugins: Add progress indicators and report errorsMarcel Klehr
2013-03-25admin/plugins: Allow people to sort search resultsMarcel Klehr
2013-03-25Revamp /admin/pluginsMarcel Klehr
- 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-24option to show sticky chat on screen, note i use a literal string, how am i ↵John McLear
supposed to add a l10n title?
2013-03-12Toolbar hookscohitre