Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'pull' | friendica | 2012-04-05 | 92 | -0/+0 |
|\ | |||||
| * | Merge branch 'master' of https://github.com/friendica/friendica | Alexander Kampmann | 2012-04-05 | 98 | -291/+756 |
| |\ | | | | | | | | | | | | | | | | Conflicts: include/config.php update.php | ||||
* | | | add network_tabs hook | friendica | 2012-04-05 | 1 | -2/+6 |
| |/ |/| | |||||
* | | make 'PHP "register_argc_argv"' easier to translate, may require fix for po2php | friendica | 2012-04-05 | 2 | -1/+3 |
| | | |||||
* | | let's catch d* disabled at a higher level and not waste any resources on it. | friendica | 2012-04-04 | 1 | -0/+7 |
| | | |||||
* | | correct some filer dialog weirdness caused by introduction of categories | Michael Johnston | 2012-04-04 | 1 | -1/+2 |
| | | |||||
* | | well that was a stupid mistake... | friendica | 2012-04-04 | 1 | -1/+1 |
| | | |||||
* | | better handling of reshares containing embeds | friendica | 2012-04-04 | 1 | -8/+8 |
| | | |||||
* | | display settings hooks | friendica | 2012-04-03 | 1 | -1/+4 |
| | | |||||
* | | re-opened bug #363 | friendica | 2012-04-03 | 1 | -0/+10 |
| | | |||||
* | | this is better | friendica | 2012-04-03 | 1 | -3/+2 |
| | | |||||
* | | include contact_widgets for categories_widget when doing updates | friendica | 2012-04-03 | 1 | -0/+2 |
| | | |||||
* | | suppress duplicates in search | friendica | 2012-04-03 | 1 | -7/+7 |
| | | |||||
* | | make contact ssl_policy change a function since it is used in a few places | friendica | 2012-04-02 | 1 | -43/+2 |
| | | |||||
* | | more ssl policy fixes and prevent delivery to soapbox when using local delivery | friendica | 2012-04-02 | 1 | -5/+0 |
| | | |||||
* | | don't change ssl settings on local photos for remote contact | friendica | 2012-04-02 | 1 | -9/+0 |
| | | |||||
* | | bug #363 and a couple of other reported ssl link issues | friendica | 2012-04-02 | 1 | -1/+32 |
| | | |||||
* | | make the "new calendar" (javascript interactive) the default | friendica | 2012-04-02 | 1 | -4/+4 |
| | | |||||
* | | allow users to set categories on their posts | Michael Johnston | 2012-04-01 | 3 | -7/+46 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2012-04-02 | 15 | -121/+404 |
|\ \ | |||||
| * | | check for style.php existence before inclusion | friendica | 2012-04-01 | 1 | -1/+2 |
| | | | |||||
| * | | send unverified private mail using zrl | friendica | 2012-04-01 | 3 | -6/+164 |
| | | | |||||
| * | | fix "between yourself and You" in mail list | friendica | 2012-03-31 | 1 | -8/+5 |
| | | | |||||
| * | | ensure all new users get a timezone. We'll use UTC until they choose otherwise. | friendica | 2012-03-31 | 1 | -2/+2 |
| | | | |||||
| * | | handle escaped file chars in display and search | friendica | 2012-03-31 | 3 | -5/+5 |
| | | | |||||
| * | | register hooks for a COPA plugin | friendica | 2012-03-31 | 1 | -0/+7 |
| | | | |||||
| * | | settings for unknown private mail acceptance | friendica | 2012-03-31 | 1 | -14/+26 |
| | | | |||||
| * | | warning cleanup | friendica | 2012-03-30 | 1 | -8/+7 |
| | | | |||||
| * | | Merge branch 'pull' | friendica | 2012-03-30 | 2 | -73/+172 |
| |\ \ | |||||
| | * | | allow themes to use "style.php" instead of "style.css". | Fabio Comuni | 2012-03-30 | 1 | -0/+16 |
| | | | | | | | | | | | | | | | | Load style.php trhu mod/view.php to pass it friendica framework. | ||||
| | * | | settings: add "display settings" tab, with UI-related settings. | Fabio Comuni | 2012-03-30 | 1 | -73/+156 |
| | | | | | | | | | | | | | | | | | | | | Load optional "config.php" from theme folder and show in page. Loading of "config.php" follow theme_info['extends'] property. | ||||
| * | | | don't delete contact from a friend request if friendship was already established | friendica | 2012-03-30 | 1 | -1/+5 |
| |/ / | |||||
| * | | rename "file as" to "save to folder" | friendica | 2012-03-30 | 1 | -1/+1 |
| | | | |||||
| * | | zrl into people searches | friendica | 2012-03-29 | 4 | -5/+5 |
| | | | |||||
| * | | use zrl to get home again | friendica | 2012-03-29 | 1 | -0/+2 |
| | | | |||||
| * | | provide a way to specify an admin account for siteinfo if more than one have ↵ | friendica | 2012-03-29 | 1 | -1/+5 |
| | | | | | | | | | | | | admin email address | ||||
* | | | modified: mod/newmember.php | Thomas Willingham | 2012-04-02 | 1 | -0/+2 |
| | | | | | | | | | | | | Add a link to the quick start | ||||
* | | | Moved Diaspora notes away from top, per user request | Thomas Willingham | 2012-04-02 | 1 | -3/+3 |
|/ / | |||||
* | | Merge pull request #185 from fabrixxm/master | fabrixxm | 2012-03-28 | 1 | -41/+74 |
|\ \ | | | | | | | Updated private message pages | ||||
| * | | message: remove tabs, move new message link to aside, all message with ↵ | Fabio Comuni | 2012-03-28 | 1 | -41/+74 |
| | | | | | | | | | | | | gmail-style | ||||
* | | | wrong var for notify total | friendica | 2012-03-28 | 1 | -1/+1 |
| | | | |||||
* | | | fix notification total | friendica | 2012-03-28 | 1 | -2/+3 |
| | | | |||||
* | | | improved rw notifications | friendica | 2012-03-28 | 1 | -2/+17 |
| | | | |||||
* | | | bug #349 - email notls setting | friendica | 2012-03-28 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'pull' | friendica | 2012-03-28 | 1 | -1/+6 |
|\ \ | |||||
| * | | viewsrc: return only body if page is requested via ajax | Fabio Comuni | 2012-03-28 | 1 | -1/+6 |
| | | | |||||
* | | | Merge branch 'pull' | friendica | 2012-03-28 | 1 | -2/+14 |
|\| | | |||||
| * | | filer: replace "file as" prompt with combobox opened in fancybox | Fabio Comuni | 2012-03-28 | 1 | -2/+14 |
| | | | |||||
* | | | title not updated when editing post | friendica | 2012-03-28 | 1 | -1/+1 |
|/ / | |||||
* | | form security error when using existing photo | friendica | 2012-03-27 | 1 | -1/+1 |
| | |