Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Limiting .directory-photo-wrapper styles to <section> so as not to | Zvi ben Yaakov (a.k.a rdc) | 2012-07-03 | 7 | -7/+7 |
| | | | | interfere with .directory-photo-wrapper in <aside> | ||||
* | Merge pull request #371 from fermionic/option-to-limit-max-image-pixel-length | friendica | 2012-07-02 | 2 | -0/+24 |
|\ | | | | | add ability to set maximum pixel length of uploaded pictures | ||||
| * | add ability to set maximum pixel length of uploaded pictures | Zach Prezkuta | 2012-07-02 | 2 | -0/+24 |
|/ | |||||
* | fix diabook directory pages (only the normal style - any volunteers for the ↵ | friendica | 2012-07-02 | 6 | -24/+318 |
| | | | | wide?) | ||||
* | fix double lines | friendica | 2012-07-02 | 3 | -80/+120 |
| | |||||
* | Merge https://github.com/friendica/friendica into pull | friendica | 2012-07-02 | 4 | -7/+57 |
|\ | |||||
| * | Merge branch 'master' of https://github.com/friendica/friendica | Thomas Willingham | 2012-07-02 | 6 | -14/+23 |
| |\ | |||||
| * | | Various theme stuff. | Thomas Willingham | 2012-07-02 | 4 | -7/+57 |
| | | | | | | | | | | | | | | | | | | Profile group list for testbubble Screenshot for facepark Various niggles in darkzero/NS | ||||
* | | | try and get unadulterated bb2md2html2bb for simple stuff, then we'll work up ↵ | friendica | 2012-07-02 | 4 | -6/+10 |
| | | | | | | | | | | | | to harder stuff | ||||
* | | | "babel" diagnostic - convert bbcode to different formats and back again | friendica | 2012-07-01 | 1 | -0/+56 |
| |/ |/| | |||||
* | | ...and the other bit | friendica | 2012-07-01 | 1 | -1/+1 |
| | | |||||
* | | pagination start off by one | friendica | 2012-07-01 | 2 | -2/+4 |
| | | |||||
* | | config to disable email validation | friendica | 2012-07-01 | 5 | -11/+18 |
|/ | |||||
* | Merge pull request #369 from rdc/master | friendica | 2012-07-01 | 3 | -10/+127 |
|\ | | | | | Added more profile data and CSS styling to the /directory page | ||||
| * | Added more profile data and CSS styling to the /directory page | Zvi ben Yaakov (a.k.a rdc) | 2012-07-01 | 3 | -10/+127 |
| | | |||||
* | | Merge pull request #370 from mschmitt/master | friendica | 2012-07-01 | 3 | -1555/+2127 |
|\ \ | | | | | | | Esperanto at 100% again | ||||
| * | | Esperanto -> 100% | Martin Schmitt | 2012-07-01 | 3 | -1555/+2127 |
|/ / | |||||
* / | rev update | friendica | 2012-06-30 | 2 | -60/+68 |
|/ | |||||
* | bug #437 | friendica | 2012-06-30 | 1 | -0/+8 |
| | |||||
* | restore 'shareable' to feeds after recent feed privacy re-factoring | friendica | 2012-06-30 | 1 | -1/+1 |
| | |||||
* | advanced profile theming | friendica | 2012-06-30 | 1 | -1/+6 |
| | |||||
* | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-29 | 13 | -45/+638 |
|\ | |||||
| * | Merge pull request #368 from fabrixxm/master | friendica | 2012-06-29 | 13 | -45/+638 |
| |\ | | | | | | | Some work on quattro | ||||
| | * | quattro: fix Forum widget, hide edit profile link | Fabrixxm | 2012-06-29 | 3 | -3/+11 |
| | | | |||||
| | * | quattro: some updates | Fabrixxm | 2012-06-29 | 12 | -45/+629 |
| | | | | | | | | | | | | | | | | | | - add makefile to rebuild both css with single command - fix icons in Forums widget - style photos pages | ||||
| | * | nav: pass $baseurl to template | Fabrixxm | 2012-06-29 | 1 | -0/+1 |
| |/ | |||||
* / | convert ent_quotes for jquery calendar title/summary | friendica | 2012-06-29 | 3 | -69/+69 |
|/ | |||||
* | maintain page position when hovering on pop-outs | friendica | 2012-06-28 | 1 | -0/+7 |
| | |||||
* | more pager limits | friendica | 2012-06-28 | 1 | -0/+2 |
| | |||||
* | wrong column name (- vs _) | friendica | 2012-06-28 | 1 | -1/+1 |
| | |||||
* | undefined fn | friendica | 2012-06-28 | 1 | -2/+2 |
| | |||||
* | remote_self feeds are not private | friendica | 2012-06-28 | 1 | -1/+5 |
| | |||||
* | create third privacy state - public post but not searchable or publicly visible | friendica | 2012-06-28 | 9 | -20/+21 |
| | |||||
* | css smiley class | friendica | 2012-06-28 | 1 | -35/+35 |
| | |||||
* | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-28 | 7 | -19/+19 |
|\ | |||||
| * | Merge pull request #367 from simonlnu/master | Simon | 2012-06-28 | 4 | -12/+12 |
| |\ | | | | | | | fix item-delete-selected* css | ||||
| | * | fix item-delete-selected* css | Simon L'nu | 2012-06-28 | 4 | -12/+12 |
| | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | Merge remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-06-28 | 2 | -6/+6 |
| | |\ | | |/ | |/| | | | | | | | * remotes/upstream/master: fix logic for nested lists--should be OR, not AND | ||||
| * | | Merge pull request #366 from fermionic/fix-big-monster-list-logic | fermionic | 2012-06-27 | 2 | -6/+6 |
| |\ \ | | | | | | | | | fix logic for nested lists--should be OR, not AND | ||||
| | * | | fix logic for nested lists--should be OR, not AND | Zach Prezkuta | 2012-06-27 | 2 | -6/+6 |
| |/ / | |||||
| | * | Merge remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-06-27 | 4 | -64/+119 |
| | |\ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: Friendicaland - couple of new 'countries' insidious little parsing bug have no idea why the if/endif macro block was getting printed and not processed. highlight js events-reminder on birthday events moved api direct message formating to own function. added same formating to direct reply message, when posting a new message. fixed direct message reply in api call. modified api message reply to set title to conversion title, when replying. add reliable way to get server version make it selectable I want HTML code! new param getUserObjects to avoid retransmitting the whole user info objects bugfix changes on api_direct_messages_box to allow to retrieve conversations and all messages modified direct_messages added replyto and subject to direct messages. modified conversion to use x function for parameter checking. | ||||
| * | | Friendicaland - couple of new 'countries' | Thomas Willingham | 2012-06-27 | 1 | -1/+1 |
| | | | |||||
| | * | Merge remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-06-26 | 22 | -439/+741 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: service class restrict the email connector stray s typos add event titles to discovered birthday events change required doco change event behaviour so that title is required but description is not event summary/title propagate remote deletes remove possibly unnecessary checks for likes or comments created by Diaspora users store signature info for remote users too was passing the wrong arguments to the signature storage function add some debug logging revert extra Diaspora disabling changes to try to eliminate Mustard double-posting Clean up the Diaspora connectivity: improve remote delete forwarding typos in bbcode, add service class restrictions to jot uploads rev update | ||||
| | * \ | Merge remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-06-25 | 0 | -0/+0 |
| | |\ \ | | | | | | | | | | | | | | | | * remotes/upstream/master: | ||||
* | | | | | remove titles in ostatus even when edited date differs from created date | friendica | 2012-06-28 | 3 | -143/+147 |
|/ / / / | |||||
* | | | | Merge pull request #365 from ridcully/master | friendica | 2012-06-27 | 1 | -63/+108 |
|\ \ \ \ | | | | | | | | | | | Direct-Message Api-Modified | ||||
| * | | | | moved api direct message formating to own function. | Sebastian Egbers | 2012-06-26 | 1 | -54/+54 |
| | | | | | | | | | | | | | | | | | | | | added same formating to direct reply message, when posting a new message. | ||||
| * | | | | Merge branch 'master' of https://github.com/friendica/friendica | Sebastian Egbers | 2012-06-26 | 27 | -435/+709 |
| |\ \ \ \ | |||||
| * | | | | | fixed direct message reply in api call. | Sebastian Egbers | 2012-06-25 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | modified api message reply to set title to conversion title, when replying. | Sebastian Egbers | 2012-06-25 | 1 | -8/+12 |
| | | | | | |