Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git://github.com/friendica/friendica | Tobias Hößl | 2012-03-09 | 11 | -100/+149 |
|\ | |||||
| * | bug #324 - tinymce used for mail even if editplain being used. | friendica | 2012-03-09 | 1 | -0/+6 |
| | | |||||
| * | reworked fix from unary for bug #323 (due to incorrect use of ↵ | friendica | 2012-03-07 | 1 | -1/+1 |
| | | | | | | | | array_key_exists()) | ||||
| * | fix photos after permissions_sql change | friendica | 2012-03-06 | 2 | -2/+2 |
| | | |||||
| * | [privacy] rework latest fix | friendica | 2012-03-06 | 1 | -3/+0 |
| | | |||||
| * | remove stray debugging | friendica | 2012-03-06 | 1 | -2/+2 |
| | | |||||
| * | fix html reshares when editplain in use | friendica | 2012-03-06 | 1 | -5/+13 |
| | | |||||
| * | search should be ok, but a little extra security won't hurt | friendica | 2012-03-06 | 1 | -1/+1 |
| | | |||||
| * | [PRIVACY] privacy issue bug #314 | friendica | 2012-03-06 | 1 | -2/+5 |
| | | |||||
| * | bugs #312, #313 | friendica | 2012-03-06 | 2 | -35/+33 |
| | | |||||
| * | some admin page fixes and cleanup | friendica | 2012-03-05 | 1 | -3/+7 |
| | | |||||
| * | group: fix create new group form | Fabio Comuni | 2012-03-02 | 1 | -0/+1 |
| | | |||||
| * | Merge remote-tracking branch 'friendica/master' into randomerror | Fabio Comuni | 2012-03-01 | 2 | -4/+25 |
| |\ | |||||
| | * | notification enhancements | friendica | 2012-02-29 | 1 | -1/+3 |
| | | | |||||
| | * | better handling of multiple notifications for same item, and old notifications | friendica | 2012-02-29 | 2 | -4/+23 |
| | | | |||||
| * | | admin: fix small string | Fabio Comuni | 2012-03-01 | 1 | -2/+5 |
| | | | |||||
| * | | Merge remote-tracking branch 'friendica/master' into randomerror | Fabio Comuni | 2012-02-29 | 16 | -193/+432 |
| |\| | |||||
| | * | cleaned up mess created when both people request friendship and one approves ↵ | friendica | 2012-02-28 | 1 | -1/+11 |
| | | | | | | | | | | | | as duplex | ||||
| | * | Merge branch 'pull' | friendica | 2012-02-28 | 1 | -1/+2 |
| | |\ | |||||
| | * | | From Tobias H - catch some irregularities caused by cut/paste code | friendica | 2012-02-28 | 2 | -5/+5 |
| | | | | |||||
| * | | | less html in mod/group.php, template for group members editor, quattro theme ↵ | Fabio Comuni | 2012-02-23 | 1 | -41/+39 |
| | | | | | | | | | | | | | | | | for group edit. | ||||
* | | | | A 'PHP Fatal error: Call to a member function getElementsByTagName() on a ↵ | Tobias Hößl | 2012-03-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | non-object in mod/parse_url.php on line 191' occurred when the linked HTML-File doesn't have a HEAD. The HTML-file couln't be link to in the editor therefore. | ||||
* | | | | Mostly some checks in order to avoid Notices; 1 real bugfix in /mod/network.php | Tobias Hößl | 2012-02-28 | 1 | -6/+8 |
| | | | | |||||
* | | | | Merge remote branch 'upstream/master' | Tobias Hößl | 2012-02-28 | 5 | -27/+43 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | fix url and network display | fabrixxm | 2012-02-28 | 1 | -1/+2 |
| | |/ | |/| | |||||
| * | | update globaldir when page-type changes, add spam date field | friendica | 2012-02-27 | 1 | -1/+3 |
| | | | |||||
| * | | clicking contact on contacts page broken link | friendica | 2012-02-27 | 1 | -0/+1 |
| | | | |||||
| * | | revert 01a2791e3a to avoid random preg internal errors. fix contact_template | Fabio Comuni | 2012-02-27 | 1 | -2/+2 |
| | | | |||||
| * | | tagging missing from wallwall and a couple of themes, star missing from dispy | friendica | 2012-02-26 | 1 | -0/+1 |
| | | | |||||
| * | | Merge pull request #50 from annando/master | friendica | 2012-02-26 | 1 | -22/+31 |
| |\ \ | | | | | | | | | massive changes in mail and design updates in "vier" | ||||
| | * | | Mail: New options for actions after importing mails. | Michael | 2012-02-26 | 1 | -22/+31 |
| | | | | |||||
| * | | | Merge pull request #49 from CatoTH/master | friendica | 2012-02-26 | 4 | -7/+12 |
| |\ \ \ | | |/ / | |/| | | Bugfix for del_config | ||||
| * | | | show experimental and unsupported theme status on theme admin page | friendica | 2012-02-26 | 1 | -2/+4 |
| | | | | |||||
* | | | | Avoid notices | Tobias Hößl | 2012-02-28 | 1 | -1/+1 |
| | | | | |||||
* | | | | contact.network is used later to check if a direct link or a redirect by ↵ | Tobias Hößl | 2012-02-28 | 1 | -1/+1 |
| |/ / |/| | | | | | | | | /redir/contactid should be used | ||||
* | | | is not always defined; but if defined, then always of type integer | Tobias Hößl | 2012-02-26 | 1 | -1/+1 |
| | | | |||||
* | | | necessare fields not loaded from DB | Tobias Hößl | 2012-02-26 | 2 | -3/+6 |
| | | | |||||
* | | | should probably be a->user['hidewall'] instead of profile['hidewall'] | Tobias Hößl | 2012-02-26 | 1 | -3/+5 |
|/ / | |||||
* | | mod/item.php pass 'parent' to notification | Abinoam P. Marques Jr | 2012-02-25 | 1 | -1/+2 |
| | | |||||
* | | scale external images | friendica | 2012-02-25 | 1 | -0/+2 |
| | | |||||
* | | fixed link for toggling plugin from detail page | friendica | 2012-02-25 | 1 | -1/+1 |
| | | |||||
* | | sysnotify count in wrong location, and wrong number | friendica | 2012-02-25 | 1 | -2/+10 |
| | | |||||
* | | theme seen,unseen notifications | friendica | 2012-02-25 | 1 | -14/+14 |
| | | |||||
* | | theme info (like plugin info) | friendica | 2012-02-25 | 1 | -2/+2 |
| | | |||||
* | | notifications to zeros, bug in notify link | friendica | 2012-02-24 | 1 | -3/+3 |
| | | |||||
* | | theme shakeup commences - themes are now administered in admin panel. | friendica | 2012-02-23 | 3 | -7/+197 |
| | | |||||
* | | system notifications to notify module, untranslated string in notifications.tpl | friendica | 2012-02-23 | 2 | -4/+36 |
| | | |||||
* | | implement firehose notify in ping, strip links so notify popup displays ↵ | friendica | 2012-02-23 | 1 | -139/+114 |
|/ | | | | correctly in all themes | ||||
* | quattro post preview, style contacts pages, style for "shiny" class, fix ↵ | Fabio Comuni | 2012-02-23 | 2 | -42/+52 |
| | | | | | | | contacts list in profile aside. remove html from viewcontacts.php and contacts.php use contact_template.tpl to print contacts also in viewcontacts | ||||
* | new notify sort of working in testbubble | friendica | 2012-02-22 | 1 | -0/+35 |
| |