summaryrefslogtreecommitdiffstats
path: root/etherpad/src/static
Commit message (Collapse)AuthorAgeFilesLines
* removed ip/user-agent from tooltipsHEADmasterAlexander Sulfrian2011-02-012-4/+0
|
* fixed headlinesAlexander Sulfrian2010-06-082-2/+3
|
* fix startpageAlexander Sulfrian2010-06-081-2/+2
|
* ported changes from old versionAlexander Sulfrian2010-06-0810-16/+20
|
* Merge remote branch 'upstream/master'Alexander Sulfrian2010-06-08144-0/+19763
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: etherpad/src/etherpad/control/pro/admin/pro_admin_control.js etherpad/src/etherpad/control/pro/pro_main_control.js etherpad/src/etherpad/control/pro_help_control.js etherpad/src/etherpad/globals.js etherpad/src/etherpad/legacy_urls.js etherpad/src/etherpad/pne/pne_utils.js etherpad/src/etherpad/pro/pro_utils.js etherpad/src/main.js etherpad/src/plugins/fileUpload/templates/fileUpload.ejs etherpad/src/plugins/testplugin/templates/page.ejs etherpad/src/static/css/pad2_ejs.css etherpad/src/static/css/pro-help.css etherpad/src/static/img/jun09/pad/protop.gif etherpad/src/static/js/store.js etherpad/src/themes/default/templates/framed/framedheader-pro.ejs etherpad/src/themes/default/templates/main/home.ejs etherpad/src/themes/default/templates/pro-help/main.ejs etherpad/src/themes/default/templates/pro-help/pro-help-template.ejs infrastructure/com.etherpad/licensing.scala trunk/etherpad/src/etherpad/collab/ace/contentcollector.js trunk/etherpad/src/etherpad/collab/ace/linestylefilter.js trunk/etherpad/src/static/css/home-opensource.css trunk/etherpad/src/static/js/ace.js trunk/etherpad/src/static/js/linestylefilter_client.js trunk/etherpad/src/templates/email/eepnet_license_info.ejs trunk/etherpad/src/templates/pad/pad_body2.ejs trunk/etherpad/src/templates/pad/pad_content.ejs trunk/etherpad/src/templates/pad/padfull_body.ejs trunk/etherpad/src/templates/pro/admin/pne-license-manager.ejs
| * Change executable bit of two files to much the intent of the files.Mikko Rantalainen2010-05-061-0/+0
| | | | | | | | Make lintian happier.
| * Merge commit 'mainline/master'Simon B @piratpartiet2010-04-212-12/+12
| |\
| | * Bugfixes to the docbar css for buttons w/o imageEgil Moeller2010-04-201-9/+9
| | |
| | * Merge commit 'cd2bbd0e602244403ca379f9f4d9d15bbde545a7'Michael Prasuhn2010-04-161-1/+1
| | |\
| | * \ Merge branch 'master' of http://github.com/ether/padPeter Martischka2010-04-151-0/+1
| | |\ \
| | * | | Fixed a a serious Security Bug, HTML injection!Peter Martischka2010-04-111-1/+1
| | | | |
| | * | | Fixed a little design bug of the save buttonPeter Martischka2010-04-101-2/+2
| | | | |
| * | | | Remove unused fileSimon Bohlin2010-04-211-1984/+0
| | | | |
| * | | | Drive-by optimization. Motivation: every keypress invokes callHooks()Simon Bohlin2010-04-211-4/+5
| | | | |
| * | | | Add code origin commentsSimon Bohlin2010-04-211-0/+3
| | |_|/ | |/| |
| * | | Replacing 'etherpad.com' with 'main site' in some code commentsSimon Bohlin2010-04-151-1/+1
| | |/ | |/|
| * | Add forgotten static file robots.txtSimon Bohlin2010-04-141-0/+1
| |/
| * Merge branch 'jefferai' of git://github.com/jefferai/padPeter Martischka2010-04-081-2/+16
| |\
| | * Actually use the new teamsite color.Jeff Mitchell2010-04-071-4/+4
| | |
| | * Put in CSS to show the new teamsite link in a different color. I think the ↵Jeff Mitchell2010-04-071-0/+14
| | | | | | | | | | | | | | | | | | color chosen goes together pretty well, but more importantly it makes it immediately obvious that they are two buttons that do two different things. Plus, variety is the spice of life :-)
| * | Reduced the height of the docbar about 5pxPeter Martischka2010-04-088-10/+13
| | |
| * | Fixed some little design bugs of editbarPeter Martischka2010-04-071-3/+7
| |/
| * Fixed little design bug of the save buttonPeter Martischka2010-04-071-2/+1
| |
| * Merge branch 'master' of git://github.com/redhog/padPeter Martischka2010-04-072-1/+63
| |\
| | * More plugin manager stylingEgil Moeller2010-04-061-0/+18
| | |
| | * Changed button-specific coloring to a classEgil Moeller2010-04-061-1/+1
| | |
| | * Styling for plugin managerEgil Moeller2010-04-061-0/+44
| | |
| * | Redesign of the editbarPeter Martischka2010-04-0718-47/+52
| |/
| * Little fix of topbar layout, using nowrap insted of tablesPeter Martischka2010-04-051-0/+3
| |
| * added some picturesPeter Martischka2010-04-059-0/+0
| |
| * Redesign of the topbar + deleted unused css & imagesPeter Martischka2010-04-05295-2383/+37
| |
| * Removed some unused templatesPeter Martischka2010-04-041-0/+0
| |
| * Opportunity to enable/disable the Pro Feature with a config flagPeter Martischka2010-04-041-2/+2
| |
| * add 32 user color support on padsPeter Martischka2010-03-302-3/+31
| |
| * Removed files auto-generated by infrastructure/ace/bin/makeEgil Moeller2010-03-256-2441/+0
| |
| * Made the client side plugin API more similar to the server side oneEgil Moeller2010-03-221-18/+20
| |
| * Updated changes to adhere to new directory layoutEgil Moeller2010-03-221-0/+19
| |
| * reorganizing the first level of folders (trunk/branch folders are not the ↵Elliot Kroo2010-03-11418-0/+26408
| | | | git way :)
* reverted folder structure change for better mergeing with upstreamAlexander Sulfrian2010-06-08423-26420/+0
|
* added tos to homepageAlexander Sulfrian2010-04-271-0/+14
|
* Fixed a a serious Security Bug, HTML injection!Alexander Sulfrian2010-04-271-2/+2
| | | | (see: http://github.com/Pita/pad/commit/6f0061961975df9a0c3ebab68386d8d65b706959)
* added lineheight to headlines, to have some spaces aroundAlexander Sulfrian2010-02-163-4/+4
|
* rebranded for pad.spline.inf.fu-berlin.deAlexander Sulfrian2010-02-163-4/+4
|
* changed from infrastucture to public dirsAlexander Sulfrian2010-02-162-4/+10
|
* display h1,h2,h3,h4,h5,h6 as inlineAlexander Sulfrian2010-02-162-6/+5
|
* remove other headline properties on setting (no sense in setting two ↵Alexander Sulfrian2010-02-051-1/+1
| | | | headlines at one region)
* fixed linenumber height if first line in source has a marginAlexander Sulfrian2010-02-051-1/+1
|
* fixed minimal width with new buttonsAlexander Sulfrian2010-02-051-3/+3
|
* added header buttons and used backend functionalityAlexander Sulfrian2010-02-055-14/+19
|
* try to implement headlinesAlexander Sulfrian2010-02-052-2/+3
|
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-06-26 19:22:51 +0000