aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* profile change activitiesfriendica2012-04-124-7/+104
|
* allow setting default new friend notifyfriendica2012-04-123-2/+17
|
* turn off new friend activity by defaultfriendica2012-04-121-1/+1
|
* Merge https://github.com/friendica/friendica into pullfriendica2012-04-1261-10753/+560
|\
| * diabook-themes: fixed css for settings aside-linkstommy tomson2012-04-1220-10546/+194
| |
| * diabook-themes: css-fixes in asidetommy tomson2012-04-1234-140/+261
| |
| * Merge pull request #229 from tomtom84/mastertomtom842012-04-1212-68/+106
| |\ | | | | | | fixes in theme diabook
| | * fix css in asidetommy tomson2012-04-1212-68/+106
| |/
* / rev updatefriendica2012-04-122-214/+198
|/
* query to find un-grouped contactsfriendica2012-04-121-1/+12
|
* reverting recent db driver changes - won't install cleanly, won't update ↵friendica2012-04-123-736/+825
| | | | cleanly, and leaks DB credentials over the web if there's a connection problem
* Merge https://github.com/friendica/friendica into pullfriendica2012-04-1217-130/+143
|\
| * 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 https://github.com/friendica/friendica into pullfriendica2012-04-122-6/+6
|\|
| * 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:
* | turn off update transactions until we figure out how to do them safely.friendica2012-04-121-23/+23
| |
* | table cleanupfriendica2012-04-122-0/+19
| |
* | Merge https://github.com/friendica/friendica into pullfriendica2012-04-114-11/+11
|\|
| * diabook-themes: small fixtommy tomson2012-04-114-11/+11
| |
* | extensible item_id table for managing all the different message-ids ↵friendica2012-04-114-421/+494
|/ | | | generated by multiple services
* 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
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 06:45:40 +0000