Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | diabook-theme: made boxes at right_aside sortable | tommy tomson | 2012-05-03 | 29 | -57/+122 |
| | |||||
* | use cid rather than uid in perms | friendica | 2012-05-02 | 1 | -3/+12 |
| | |||||
* | Merge pull request #283 from fermionic/private-events-post-correctly-in-diaspora | friendica | 2012-05-02 | 1 | -0/+19 |
|\ | | | | | Fix private-events posts in Diaspora | ||||
| * | Modify events_post() in mod/events.php to set the `private` field to true ↵ | Zach Prezkuta | 2012-05-02 | 1 | -0/+19 |
|/ | | | | when an event is shared with specific people. This is necessary to have event posts show correctly in Diaspora if an event is created visible only to self, but modified later to be visible to others. | ||||
* | use mysql replace on cache items | friendica | 2012-05-02 | 1 | -12/+30 |
| | |||||
* | fixing common friends | friendica | 2012-05-02 | 1 | -6/+7 |
| | |||||
* | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-02 | 7 | -396/+418 |
|\ | |||||
| * | Merge pull request #282 from max-weller/master | friendica | 2012-05-02 | 3 | -1/+9 |
| |\ | | | | | | | Moved <meta viewport> to theme; Diabook style | ||||
| | * | Moved Meta Viewport from global head.tpl to diabook's header | Max Weller | 2012-05-02 | 3 | -1/+9 |
| |/ | | | | | | | | | | | | | | | | | I mistakenly added this <meta> tag to the global header, but it causes problems for other themes, as they have other optimal widths. I also added a style to diabook which makes the jGrowl messages appear below the header bar, so you can still click the menu items without having to close messages first. | ||||
| * | diabook-themes: more improvements in theme.php, add titles to bbcode under ↵ | tommy tomson | 2012-05-02 | 4 | -28/+47 |
| | | | | | | | | coment-box | ||||
| * | diabook-theme: tryied to improve performance a bit | tommy tomson | 2012-05-02 | 2 | -377/+370 |
| | | |||||
| * | diabook-theme: fix footer/impressum | tommy tomson | 2012-05-02 | 1 | -1/+3 |
| | | |||||
* | | rev update | friendica | 2012-05-02 | 2 | -5/+12 |
|/ | |||||
* | missing param | friendica | 2012-05-02 | 1 | -1/+2 |
| | |||||
* | provide "service_class" identifier which will let us provide service_class ↵ | friendica | 2012-05-02 | 3 | -3/+14 |
| | | | | limits such as number of FB friends, etc. | ||||
* | delineate the new profile changes from the rest of the text | friendica | 2012-05-02 | 1 | -1/+1 |
| | |||||
* | how did that happen? | friendica | 2012-05-02 | 1 | -1/+1 |
| | |||||
* | shuffle results of remote_common_friends widget | friendica | 2012-05-02 | 2 | -8/+25 |
| | |||||
* | only validate once | friendica | 2012-05-01 | 1 | -3/+0 |
| | |||||
* | perform basic validation | friendica | 2012-05-01 | 2 | -3/+9 |
| | |||||
* | final touches - show friends in common with total strangers from different sites | friendica | 2012-05-01 | 2 | -7/+13 |
| | |||||
* | fix size | friendica | 2012-05-01 | 1 | -1/+1 |
| | |||||
* | cross fingers | friendica | 2012-05-01 | 1 | -1/+1 |
| | |||||
* | reduce the scope a bit | friendica | 2012-05-01 | 2 | -19/+11 |
| | |||||
* | add template | friendica | 2012-05-01 | 1 | -0/+21 |
| | |||||
* | fn not found | friendica | 2012-05-01 | 1 | -0/+1 |
| | |||||
* | really fat fingers today - though none of this has gone further than my own site | friendica | 2012-05-01 | 1 | -1/+1 |
| | |||||
* | another one | friendica | 2012-05-01 | 1 | -1/+1 |
| | |||||
* | typo | friendica | 2012-05-01 | 1 | -1/+1 |
| | |||||
* | first try common friends for visitors | friendica | 2012-05-01 | 4 | -1/+86 |
| | |||||
* | improve handling of relative feed url's | friendica | 2012-05-01 | 1 | -1/+1 |
| | |||||
* | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-01 | 5 | -11/+13 |
|\ | |||||
| * | More Diabook-dark touch-ups. Should *really* be useable this time...with ↵ | Thomas Willingham | 2012-05-01 | 2 | -5/+7 |
| | | | | | | | | editplain anyway. | ||||
| * | modified: images/smiley-thumbsup.gif | Thomas Willingham | 2012-05-01 | 1 | -0/+0 |
| | | | | | | | | | | | | Restored some yellow where there shouldn't have been transparency. Probably introduced by me in the first place. | ||||
| * | diabook-themes: small fix at "community pages"-box | tommy tomson | 2012-05-01 | 2 | -6/+6 |
| | | |||||
* | | convert html entities to utf-8 before email header encoding | friendica | 2012-05-01 | 3 | -194/+202 |
|/ | |||||
* | link socgraph to zrls | friendica | 2012-05-01 | 2 | -25/+21 |
| | |||||
* | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-01 | 2 | -9/+11 |
|\ | |||||
| * | Merge pull request #281 from simonlnu/master | Simon | 2012-05-01 | 2 | -9/+11 |
| |\ | | | | | | | font and background adjustments | ||||
| | * | lighten bg and darken font on dispy light | Simon L'nu | 2012-05-01 | 2 | -9/+11 |
| | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-01 | 0 | -0/+0 |
| |/ | | | | | | | | | | | | | * remotes/upstream/master: hidden plugins (add .hidden file to dir) * master: | ||||
* / | adding zrl support to social graphs | friendica | 2012-05-01 | 5 | -18/+39 |
|/ | |||||
* | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-30 | 27 | -84/+119 |
|\ | |||||
| * | Merge pull request #280 from simonlnu/master | Simon | 2012-04-30 | 5 | -15/+9 |
| |\ | | | | | | | added a / for consistency's sake ;p | ||||
| | * | sub-minor change to head.tpl | Simon L'nu | 2012-05-01 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-01 | 34 | -462/+1041 |
| | |\ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: diabook-themes: add "community profiles"-box to right_column change api.php in function api_item_get_user to check if $usercache is NULL before checking an element in it make 'aaa joined group bbb' work from the initiating end, new privacy pref to control it also hidewall wasn't properly checked before sending 'xxx is friends with yyy' messages diabook-themes: add "last tweets"-box to right_aside, that searches for #friendica on twitter rev update start adding tooltips to tab menus fix join group notifications * master: | ||||
| * | | diabook-themes: add "community profiles"-box to right_column | tommy tomson | 2012-05-01 | 22 | -69/+110 |
| | | | |||||
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-30 | 18 | -1821/+1750 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: provide "xxx joined yyy" notifications adding META viewport tag for better look on tablets Update Esperanto to 100% DE update to the strings activitystreams schema constants for "join group" missed a db field typo in profile_selectors, fix remote tagging not all profile selector choices have unique or direct translations log db error strings in all cases admin page to manage failed updates improved db error logging close one menu (like the notifications menu) when another one is opened (like it is done when clicking somewhere else) (thx to ^mw) * master: | ||||
| | * \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-29 | 29 | -144/+238 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: the heart should really be red. fix location change notification enhanced profile reporting for single values add db field for removed account, which will also be the first test of update error checking toggle to archive unfriends, though render them useless indicate successful updates diabook-themes: small fix diabook-themes: bug/css-fixes some constants for the db update failure possibilities bring back the email and logging of update failures, but without the transactions * master: | ||||
| | * \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-28 | 4 | -134/+149 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: a few more continues that should be returns small bugfix. sometimes also avatar pics were rescaled * master: |