Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fixed headlines | Alexander Sulfrian | 2010-06-08 | 2 | -2/+3 |
| | |||||
* | fix startpage | Alexander Sulfrian | 2010-06-08 | 1 | -2/+2 |
| | |||||
* | ported changes from old version | Alexander Sulfrian | 2010-06-08 | 1 | -16/+20 |
| | |||||
* | Merge remote branch 'upstream/master' | Alexander Sulfrian | 2010-06-08 | 15 | -0/+3793 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Bugfixes to the docbar css for buttons w/o image | Egil Moeller | 2010-04-20 | 1 | -9/+9 |
| | | |||||
| * | Fixed a little design bug of the save button | Peter Martischka | 2010-04-10 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'jefferai' of git://github.com/jefferai/pad | Peter Martischka | 2010-04-08 | 1 | -2/+16 |
| |\ | |||||
| | * | Actually use the new teamsite color. | Jeff Mitchell | 2010-04-07 | 1 | -4/+4 |
| | | | |||||
| | * | Put in CSS to show the new teamsite link in a different color. I think the ↵ | Jeff Mitchell | 2010-04-07 | 1 | -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 5px | Peter Martischka | 2010-04-08 | 1 | -10/+13 |
| | | | |||||
| * | | Fixed some little design bugs of editbar | Peter Martischka | 2010-04-07 | 1 | -3/+7 |
| |/ | |||||
| * | Fixed little design bug of the save button | Peter Martischka | 2010-04-07 | 1 | -2/+1 |
| | | |||||
| * | Merge branch 'master' of git://github.com/redhog/pad | Peter Martischka | 2010-04-07 | 2 | -1/+63 |
| |\ | |||||
| | * | More plugin manager styling | Egil Moeller | 2010-04-06 | 1 | -0/+18 |
| | | | |||||
| | * | Changed button-specific coloring to a class | Egil Moeller | 2010-04-06 | 1 | -1/+1 |
| | | | |||||
| | * | Styling for plugin manager | Egil Moeller | 2010-04-06 | 1 | -0/+44 |
| | | | |||||
| * | | Redesign of the editbar | Peter Martischka | 2010-04-07 | 1 | -47/+52 |
| |/ | |||||
| * | Little fix of topbar layout, using nowrap insted of tables | Peter Martischka | 2010-04-05 | 1 | -0/+3 |
| | | |||||
| * | Redesign of the topbar + deleted unused css & images | Peter Martischka | 2010-04-05 | 13 | -2383/+37 |
| | | |||||
| * | Opportunity to enable/disable the Pro Feature with a config flag | Peter Martischka | 2010-04-04 | 1 | -2/+2 |
| | | |||||
| * | add 32 user color support on pads | Peter Martischka | 2010-03-30 | 1 | -3/+31 |
| | | |||||
| * | reorganizing the first level of folders (trunk/branch folders are not the ↵ | Elliot Kroo | 2010-03-11 | 27 | -0/+6041 |
| | | | | git way :) | ||||
* | reverted folder structure change for better mergeing with upstream | Alexander Sulfrian | 2010-06-08 | 26 | -6045/+0 |
| | |||||
* | added tos to homepage | Alexander Sulfrian | 2010-04-27 | 1 | -0/+14 |
| | |||||
* | added lineheight to headlines, to have some spaces around | Alexander Sulfrian | 2010-02-16 | 2 | -2/+2 |
| | |||||
* | display h1,h2,h3,h4,h5,h6 as inline | Alexander Sulfrian | 2010-02-16 | 2 | -6/+5 |
| | |||||
* | fixed minimal width with new buttons | Alexander Sulfrian | 2010-02-05 | 1 | -3/+3 |
| | |||||
* | added header buttons and used backend functionality | Alexander Sulfrian | 2010-02-05 | 1 | -12/+17 |
| | |||||
* | try to implement headlines | Alexander Sulfrian | 2010-02-05 | 1 | -0/+1 |
| | |||||
* | fixed css for spline branding | Alexander Sulfrian | 2010-02-04 | 1 | -5/+5 |
| | |||||
* | dded branding to padtop4.png (css needs work) | nehls@b2ef00c0-3703-41da-baef-cfe82387ac0c | 2010-02-04 | 1 | -3/+3 |
| | | | | | --HG-- extra : convert_revision : svn%3Ab2ef00c0-3703-41da-baef-cfe82387ac0c/trunk%4030 | ||||
* | styling of mainpage | alexanders@b2ef00c0-3703-41da-baef-cfe82387ac0c | 2010-02-03 | 1 | -6/+10 |
| | | | | | --HG-- extra : convert_revision : svn%3Ab2ef00c0-3703-41da-baef-cfe82387ac0c/trunk%4029 | ||||
* | modified background position for spline header logo | alexanders@b2ef00c0-3703-41da-baef-cfe82387ac0c | 2010-02-03 | 1 | -4/+4 |
| | | | | | --HG-- extra : convert_revision : svn%3Ab2ef00c0-3703-41da-baef-cfe82387ac0c/trunk%4028 | ||||
* | Added spline Pad [beta] branding | nehls@b2ef00c0-3703-41da-baef-cfe82387ac0c | 2010-02-03 | 2 | -20/+20 |
| | | | | | --HG-- extra : convert_revision : svn%3Ab2ef00c0-3703-41da-baef-cfe82387ac0c/trunk%4025 | ||||
* | removed unused export buttons and make popup smaler | alexanders@b2ef00c0-3703-41da-baef-cfe82387ac0c | 2010-02-03 | 1 | -1/+1 |
| | | | | | --HG-- extra : convert_revision : svn%3Ab2ef00c0-3703-41da-baef-cfe82387ac0c/trunk%4020 | ||||
* | fixed handling of superdomains | alexanders@b2ef00c0-3703-41da-baef-cfe82387ac0c | 2010-02-03 | 1 | -19/+0 |
| | | | | | --HG-- extra : convert_revision : svn%3Ab2ef00c0-3703-41da-baef-cfe82387ac0c/trunk%4015 | ||||
* | removed obsolete svn folder from hg tree | alexanders@b2ef00c0-3703-41da-baef-cfe82387ac0c | 2010-02-03 | 27 | -0/+6041 |
--HG-- extra : convert_revision : svn%3Ab2ef00c0-3703-41da-baef-cfe82387ac0c/trunk%408 |