aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'zottel2014-02-2020-1258/+1468
|\
| * Merge pull request #324 from tonybaldwin/masterfriendica2014-02-206-6/+6
| |\ | | | | | | Do not view remote profiles in frames. (changed description for display->settings), in ALL relevant files
| | * s/View remote profiles as webpages/Do not view remote profiles intony baldwin2014-02-196-6/+6
| | | | | | | | | | | | frames/g
| * | use a "fullscreen" icon for chanview full screen mode; add channel_menu ↵friendica2014-02-196-5/+53
| |/ | | | | | | selection and setting to the settings page.
| * Merge pull request #322 from dawnbreak/masterfriendica2014-02-201-70/+126
| |\ | | | | | | Doxygen include/attach.php
| | * Doxygen include/attach.phpKlaus2014-02-191-70/+126
| | | | | | | | | Some Doxygen as far as I understood and some styleguides.
| * | Merge pull request #321 from git-marijus/masterfriendica2014-02-208-250/+308
| |\ \ | | | | | | | | bootstrapify the nav
| | * | another correctionmarijus2014-02-191-1/+1
| | | |
| | * | Merge branch 'master' of https://github.com/friendica/redmarijus2014-02-196-22/+84
| | |\ \
| | * | | one pixel to much...marijus2014-02-191-1/+1
| | | | |
| | * | | bootstrapify the navmarijus2014-02-198-250/+308
| | | | |
| * | | | Merge pull request #323 from tuscanhobbit/masterPaolo T2014-02-192-929/+977
| |\ \ \ \ | | |_|/ / | |/| | | IT: update to the strings
| | * | | IT: update to the stringstuscanhobbit2014-02-192-929/+977
| | | | |
* | | | | Merge remote-tracking branch 'upstream/master'zottel2014-02-1933-349/+1949
|\| | | |
| * | | | introduce a new privacy level "PERMS_AUTHED" to indicate somebody that is ↵friendica2014-02-186-22/+84
| | |/ / | |/| | | | | | | | | | able to successfully authenticate (but is not necessarily in this network).
| * | | fix zrl bookmarks which broke with this checkin: c9192991c95a5145friendica2014-02-181-27/+6
| | | | | | | | | | | | | | | | | | | | | | | | It was documented that: Issues: Currently the order of HTML parameters in the text is somewhat rigid and inflexible. but as that was in a different function it was easy to overlook.
| * | | Merge https://github.com/friendica/red into zpullfriendica2014-02-181-2/+5
| |\ \ \
| | * \ \ Merge pull request #320 from dawnbreak/masterfriendica2014-02-191-2/+5
| | |\ \ \ | | | | |/ | | | |/| Let user cancel the red_encrypt dialogue
| | | * | Let user cancel the red_encrypt dialogueKlaus2014-02-181-2/+5
| | | | | | | | | | | | | | | If the user press cancel on the prompt also cancel the encryption. Maybe should also add this to passhint promt.
| * | | | change edit/delete to icons on filestorage pagefriendica2014-02-181-3/+4
| |/ / /
| * | | some more snakebite and fix up include/account - forgot about that inline ↵friendica2014-02-184-21/+57
| | | | | | | | | | | | | | | | array stuff
| * | | service class downgrade to the default service class on account expiration ↵friendica2014-02-182-10/+55
| | | | | | | | | | | | | | | | if using a non-default service class and account has expired.
| * | | edit bookmarksfriendica2014-02-187-7/+18
| | | |
| * | | get_theme_uid() - if no uid, look for a system channel and use that. This ↵friendica2014-02-171-0/+5
| | | | | | | | | | | | | | | | allows default theme/scheme tweaks at the server level.
| * | | update the donation linkfriendica2014-02-172-4/+4
| | | |
| * | | remove the exit clausefriendica2014-02-171-6/+0
| | | |
| * | | snakebite, cont. magic-auth via openid is now possible, with the caveat that ↵friendica2014-02-172-3/+21
| | | | | | | | | | | | | | | | one needs a hand-crafted xchan at the moment to make use of it and if you wish to do so, there will be no assistance or help provided. The risk of system instability and mangled DBs now and going forward is significant if you try this.
| * | | operation snakebite continued. openid now works for local accounts using the ↵friendica2014-02-174-2/+125
| | | | | | | | | | | | | | | | rmagic module and after storing your openid in pconfig. This is just an interesting but trivial (in the bigger scheme of things) side effect of snakebite. The snake hasn't even waken up yet.
| * | | update openid for snakebitefriendica2014-02-177-106/+1350
| | | |
| * | | more snakebite stufffriendica2014-02-172-25/+40
| | | |
| * | | Merge https://github.com/friendica/red into zpullfriendica2014-02-171-84/+87
| |\ \ \
| | * | | Merge pull request #319 from dawnbreak/masterfriendica2014-02-181-84/+87
| | |\| | | | | | | | | | | | Commenting language.php and some changes
| | | * | Commenting language.php and some changesKlaus2014-02-181-84/+87
| | | | | | | | | | | | | | | Some commenting for Doxygen, simplified detect_language() a bit, added a new function get_language_name() that I will use soon or can be used in general to display localized language names from language codes.
| * | | | project "snakebite"friendica2014-02-171-61/+70
| |/ / /
| * | | project "snakebite"friendica2014-02-173-8/+60
| | | |
* | | | Merge remote-tracking branch 'upstream/master'zottel2014-02-1716-1603/+1674
|\| | |
| * | | Merge pull request #316 from dawnbreak/masterfriendica2014-02-172-21/+1
| |\| | | | | | | | | | Make asset icons work in subdir installs as well.
| | * | removed unused function posted_date_widgetKlaus2014-02-161-20/+0
| | | | | | | | | | | | This functions seems not to be used anywhere. include/widgets.php contains widget_archive($arr) which has the same functionality.
| | * | Make asset icons work in subdir installs as well.Klaus2014-02-151-1/+1
| | | | | | | | | | | | This should be the right way I guess, especially if red# is installed in a subdirectory. (untested)
| * | | Merge pull request #314 from zzottel/masterfriendica2014-02-171-0/+6
| |\ \ \ | | | | | | | | | | Make @!-tags safer
| * | | | several things were not working correctly w/r/t community tagging. The ↵friendica2014-02-164-5/+19
| | | | | | | | | | | | | | | | | | | | preference vanished from settings at some point, and we also weren't updating the original post timestamp so that the changed taxonomy would propagate correctly as an edit.
| * | | | don't include deleted channels in number of channels service class checksfriendica2014-02-162-6/+11
| | | | |
| * | | | don't show deleted channels on admin account summary pagefriendica2014-02-161-2/+3
| | | | |
| * | | | Merge https://github.com/friendica/red into zpullfriendica2014-02-164-1558/+1621
| |\ \ \ \
| | * | | | Windows hack for proc_run() from MarshallThomas Willingham2014-02-161-2/+7
| | | | | |
| | * | | | Merge pull request #318 from tobiasd/20140216tobiasd2014-02-162-1556/+1604
| | |\ \ \ \ | | | | | | | | | | | | | | DE: update to the strings
| | | * | | | DE: update to the stringsTobias Diekershoff2014-02-162-1556/+1604
| | |/ / / /
| | * | | | Merge pull request #315 from dawnbreak/masterfriendica2014-02-161-0/+10
| | |\ \ \ \ | | | | |/ / | | | |/| | Fix call to asset icons in RedBrowser.
| | | * | | Fix call to asset icons in RedBrowser.Klaus2014-02-151-0/+10
| | |/ / / | | | | | | | | | | RedBrowser was not displaying asset icons correctly, because the URL was wrong.
| * / / / strip hard-wired zids from posted links as they will have the wrong identity ↵friendica2014-02-166-12/+20
| |/ / / | | | | | | | | | | | | when somebody tries to view the link
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 13:21:55 +0000