aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #228 from fabrixxm/masterfriendica2012-04-1217-130/+143
|\ | | | | settings tabs, notifications js and quattro
| * quattro: icons for "Mark all sys notifs read" and "See all notifs" as icons ↵Fabio Comuni2012-04-125-39/+54
| | | | | | | | in a toolbar in notifications menu
| * main.js: set notifications icon "on" with new unread notifcations. Show ↵Fabio Comuni2012-04-121-9/+10
| | | | | | | | "Nothing new here" with no notifications at all
| * settings: remove call to profile_load()Fabio Comuni2012-04-121-4/+0
| |
| * quattro: move center css to style.php. add tpl for generic_links_widgetFabio Comuni2012-04-123-21/+26
| |
| * settings: move tabs to aside. add a new template "generic_links_widget.tpl"Fabio Comuni2012-04-128-57/+53
|/
* Merge pull request #227 from simonlnu/masterSimon2012-04-112-6/+6
|\ | | | | minor css fixes
| * fix the icons a bitSimon L'nu2012-04-122-6/+6
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-120-0/+0
|/ | | | | | | * remotes/upstream/master: diabook-themes: small fix * master:
* diabook-themes: small fixtommy tomson2012-04-114-11/+11
|
* Merge pull request #226 from simonlnu/masterSimon2012-04-104-71/+108
|\ | | | | re-factor default.php
| * major refactor. step 1Simon L'nu2012-04-114-71/+108
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-110-0/+0
|/ | | | | | | * remotes/upstream/master: visit "random profile" feature * master:
* Merge https://github.com/friendica/friendica into pullfriendica2012-04-1010-34/+38
|\
| * Merge pull request #225 from simonlnu/masterSimon2012-04-1010-34/+38
| |\ | | | | | | [fixes] absolute links in docs and newmember.php; breaks sub-dir installs
| | * more ' = ' spacing fixesSimon L'nu2012-04-106-17/+17
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-101-2/+4
| | |\ | | |/ | |/| | | | | | | | | | | | | * remotes/upstream/master: profile redir - goto correct profile page even if contact blocked, you just can't do anything. * master:
| | * [fix] absolute links in docs and newmember.php; breaks sub-dir installsSimon L'nu2012-04-108-25/+29
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-100-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: cleanup photo menus more backend work on mail2 followers make editplain work everywhere move all fix_mce to one function so it can easily be undone duplicate community posts fix_mce_lf contact edit page fix_mce_lf on profiles set default on get_avatar rev update Incorrect tranlation (one negation too much) fixed install bug diabook-themes: smal fix in bbcode-js diabook-themes: added url and quote to bbcode toolbar under comment box Remove Gravatar from core and add new hook avatar_lookup. Rename gravatar_img() more generic to avatar_img(). * master:
* | | visit "random profile" featurefriendica2012-04-105-1/+22
|/ /
* / profile redir - goto correct profile page even if contact blocked, you just ↵friendica2012-04-101-2/+4
|/ | | | can't do anything.
* cleanup photo menusfriendica2012-04-102-11/+11
|
* more backend work on mail2 followersfriendica2012-04-102-9/+57
|
* make editplain work everywherefriendica2012-04-105-9/+25
|
* move all fix_mce to one function so it can easily be undonefriendica2012-04-102-4/+2
|
* duplicate community postsfriendica2012-04-101-4/+4
|
* fix_mce_lf contact edit pagefriendica2012-04-101-1/+1
|
* fix_mce_lf on profilesfriendica2012-04-102-10/+16
|
* Merge https://github.com/friendica/friendica into pullfriendica2012-04-1034-278/+352
|\
| * Merge pull request #222 from CatoTH/masterfriendica2012-04-102-2/+2
| |\ | | | | | | Translation bugfix
| | * Incorrect tranlation (one negation too much)Tobias Hößl2012-04-102-2/+2
| | |
| * | Merge pull request #223 from campino/masterfriendica2012-04-101-3/+2
| |\ \ | | |/ | |/| bug fix
| | * fixed install bugAlexander Kampmann2012-04-101-3/+2
| | |
| * | diabook-themes: smal fix in bbcode-jstommy tomson2012-04-104-1/+25
| | |
| * | diabook-themes: added url and quote to bbcode toolbar under comment boxtommy tomson2012-04-1016-4/+45
| | |
| * | Merge pull request #221 from simonlnu/masterSimon2012-04-1011-268/+278
| |\ \ | | | | | | | | aaah, nice asides ;). we'll be updating these soon
| | * | aaah, nice asides ;). we'll be updating these soonSimon L'nu2012-04-1011-268/+278
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-101-2/+2
| | |\ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | * remotes/upstream/master: path to default.php in theme dir was incorrect * master:
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-106-1067/+1227
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: rev update source beautifarming to make review easier fixed some typos made exceptions from the db optional set address for updae mails correctly added exceptions to dba class added exception handling to index.php, please mind that there is no recovery at the moment added transactions to db update. Please mind that they might not be supported by db table engines. added admin email on failed updates * master:
| | * \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-0970-415/+947
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: bbcode toolbar attached to the comment text field minor css-fixes diabook-themes: small icon fix diabook-nav-icons with gradient use local_user for tag completion if available. See bug #368 more sane defaults datetime_convert fix empty string timezone Some new German translations send zrl after dfrn_request homecoming for manual entries fix to wall_upload photos default permissions to use cid rather than uid. fixed z-index of youtube-vids fixed bug to hide right_side * master:
| | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-080-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: prepare for using a master theme_init() provide theme_init() functions rev updates API: API is now enhanced. mentions, repeat and destroy now works. "vier": Some design stuff "vier": Bookmarks now look better. API: template for test function added The "vier"-theme is now working again. But there is still work needed New script that checks if a script is running poller: An optional lockfile is used to check if the poller is already running Several improvements * master:
* | | | | | set default on get_avatarfriendica2012-04-101-1/+8
| | | | | |
* | | | | | Merge branch 'libravatar' of https://github.com/dawnbreak/friendica into pullfriendica2012-04-107-40/+24
|\ \ \ \ \ \
| * | | | | | Remove Gravatar from core and add new hook avatar_lookup.Klaus Weidenbach2012-04-096-34/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes all occurances of Gravatar from friendica's core and adds a new hook "avatar_lookup" inside the function avatar_img($email) where the new *avatar-plugins should hook in. I haven't touched the language files yet. Are they updated automatically somehow?
| * | | | | | Rename gravatar_img() more generic to avatar_img().Klaus Weidenbach2012-04-093-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I would like to extend the Gravatar support to also use Libravatar, a decentralized avatar service. First step to extract Gravatar from core and put it into its own plugin. Later the Libravatar plugin can be done, too as a plugin.
* | | | | | | rev updatefriendica2012-04-102-42/+101
| |/ / / / / |/| | | | |
* | | | | | path to default.php in theme dir was incorrectfriendica2012-04-101-2/+2
| |_|_|/ / |/| | | |
* | | | | Merge branch 'pull'friendica2012-04-0961-1063/+1580
|\ \ \ \ \
| * \ \ \ \ Merge pull request #218 from campino/masterfriendica2012-04-095-1037/+1197
| |\ \ \ \ \ | | |_|_|/ / | |/| | | / | | | |_|/ | | |/| | db errors and update error mail
| | * | | Merge branch 'master' of https://github.com/friendica/friendicaAlexander Kampmann2012-04-098-0/+0
| | |\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 04:18:00 +0000