Commit Graph

4967 Commits (03563ca35a0c40224e3159c664c596691078df90)
 

Author SHA1 Message Date
friendica 03563ca35a Merge https://github.com/friendica/friendica into pull
11 years ago
friendica 23b08e3ea7 Merge pull request #228 from fabrixxm/master
11 years ago
friendica 6fa8b3067f Merge https://github.com/friendica/friendica into pull
11 years ago
friendica 7eb1fbb41f turn off update transactions until we figure out how to do them safely.
11 years ago
friendica 5a78400f37 table cleanup
11 years ago
Fabio Comuni 309f2bfa5f quattro: icons for "Mark all sys notifs read" and "See all notifs" as icons in a toolbar in notifications menu
11 years ago
Fabio Comuni a23d46c49b main.js: set notifications icon "on" with new unread notifcations. Show "Nothing new here" with no notifications at all
11 years ago
Fabio Comuni 18ecac4e93 settings: remove call to profile_load()
11 years ago
Fabio Comuni 6c50eba206 quattro: move center css to style.php. add tpl for generic_links_widget
11 years ago
Fabio Comuni e992e29685 settings: move tabs to aside. add a new template "generic_links_widget.tpl"
11 years ago
Simon 815a727076 Merge pull request #227 from simonlnu/master
11 years ago
Simon L'nu c21244f679 fix the icons a bit
11 years ago
Simon L'nu a3b2f35c84 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
11 years ago
friendica d52dad3826 Merge https://github.com/friendica/friendica into pull
11 years ago
friendica 8a8702c9cd extensible item_id table for managing all the different message-ids generated by multiple services
11 years ago
tommy tomson a1d5026abf diabook-themes: small fix
11 years ago
Simon cdb6510b9f Merge pull request #226 from simonlnu/master
11 years ago
Simon L'nu c79d1deb92 major refactor. step 1
11 years ago
Simon L'nu 8ec84c5bce Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
11 years ago
friendica 967ed8e23f Merge https://github.com/friendica/friendica into pull
11 years ago
friendica b02a671494 visit "random profile" feature
11 years ago
Simon 0c4e9912b0 Merge pull request #225 from simonlnu/master
11 years ago
Simon L'nu 6b414d3de4 more ' = ' spacing fixes
11 years ago
Simon L'nu 75c7877986 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
11 years ago
Simon L'nu 2af41ee57b [fix] absolute links in docs and newmember.php; breaks sub-dir installs
11 years ago
friendica 0fa932853c profile redir - goto correct profile page even if contact blocked, you just can't do anything.
11 years ago
Simon L'nu ae9506f21e Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
11 years ago
friendica 640f258f18 cleanup photo menus
11 years ago
friendica 19b636e7e8 more backend work on mail2 followers
11 years ago
friendica ed608694ce make editplain work everywhere
11 years ago
friendica 18e225b051 move all fix_mce to one function so it can easily be undone
11 years ago
friendica ab46f95683 duplicate community posts
11 years ago
friendica 8f40e8546e fix_mce_lf contact edit page
11 years ago
friendica 9b1bb53234 fix_mce_lf on profiles
11 years ago
friendica 703bfcb6d4 Merge https://github.com/friendica/friendica into pull
11 years ago
friendica 14d68a0dc0 set default on get_avatar
11 years ago
friendica 3c66816938 Merge branch 'libravatar' of https://github.com/dawnbreak/friendica into pull
11 years ago
friendica 35b978bb1e rev update
11 years ago
friendica 0e97e2338a Merge pull request #222 from CatoTH/master
11 years ago
friendica 3380ff3240 Merge pull request #223 from campino/master
11 years ago
Tobias Hößl e1c43c1c1c Incorrect tranlation (one negation too much)
11 years ago
Alexander Kampmann 64cf2d089a fixed install bug
11 years ago
tommy tomson 6db33fc513 diabook-themes: smal fix in bbcode-js
11 years ago
tommy tomson b3f18945ba diabook-themes: added url and quote to bbcode toolbar under comment box
11 years ago
Simon 9fafe64f82 Merge pull request #221 from simonlnu/master
11 years ago
Simon L'nu 707a5dbae7 aaah, nice asides ;). we'll be updating these soon
11 years ago
Simon L'nu 514780745f Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
11 years ago
friendica 4c3b835307 path to default.php in theme dir was incorrect
11 years ago
Simon L'nu 61c28e8c2e Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
11 years ago
friendica 9a8c69b024 Merge branch 'pull'
11 years ago