This website requires JavaScript.
093c3a936f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-04-13 04:11:17 -04:00
8be7b5c65b
quattro: work on "like" activitiy items less visible fixes to widths popup notification out of navbar category input in jot
Fabio Comuni
2012-04-13 09:43:38 +02:00
67a2d5be77
validate_url allow naked subdomain if is "localhost"
Fabio Comuni
2012-04-13 09:42:53 +02:00
df1904b204
stray debug statements, forgot to filter pending contacts
friendica
2012-04-12 23:14:41 -07:00
3c4e6d3461
bug #369 - show contacts who are not in any groups
friendica
2012-04-12 23:06:41 -07:00
af68d033e3
extended the "interesting" profile attributes
friendica
2012-04-12 21:58:15 -07:00
446e962bb8
send link directly to profile tab
friendica
2012-04-12 21:38:40 -07:00
2b339d5a6b
stray log statements
friendica
2012-04-12 21:21:35 -07:00
972c01edb3
profile change activities
friendica
2012-04-12 21:10:32 -07:00
32cd62ff0a
allow setting default new friend notify
friendica
2012-04-12 18:15:46 -07:00
7e2d4d4026
turn off new friend activity by default
friendica
2012-04-12 16:51:57 -07:00
15e74402d4
Merge https://github.com/friendica/friendica into pull
friendica
2012-04-12 16:13:10 -07:00
2b01d2b6e0
rev update
friendica
2012-04-12 16:12:51 -07:00
572678fef9
Merge commit 'upstream/master'
Michael Vogel
2012-04-13 00:10:41 +02:00
7384786d44
Merge remote branch 'upstream/master'
Michael
2012-04-13 00:10:13 +02:00
138caa4380
DBA: Deactivation of the mysqli-class for testing purposes.
Michael Vogel
2012-04-13 00:05:52 +02:00
e3af552bbf
diabook-themes: fixed css for settings aside-links
tommy tomson
2012-04-12 22:00:18 +02:00
39009b5ac9
diabook-themes: css-fixes in aside
tommy tomson
2012-04-12 20:23:03 +02:00
2669a13378
Merge pull request #229 from tomtom84/master
tomtom84
2012-04-12 08:39:32 -07:00
3a8e6cbacb
fix css in aside
tommy tomson
2012-04-12 17:37:55 +02:00
73487989c0
query to find un-grouped contacts
friendica
2012-04-12 07:48:28 -07:00
60871555f5
reverting recent db driver changes - won't install cleanly, won't update cleanly, and leaks DB credentials over the web if there's a connection problem
friendica
2012-04-12 06:50:11 -07:00
03563ca35a
Merge https://github.com/friendica/friendica into pull
friendica
2012-04-12 05:48:41 -07:00
23b08e3ea7
Merge pull request #228 from fabrixxm/master
friendica
2012-04-12 05:47:57 -07:00
6fa8b3067f
Merge https://github.com/friendica/friendica into pull
friendica
2012-04-12 05:46:24 -07:00
7eb1fbb41f
turn off update transactions until we figure out how to do them safely.
friendica
2012-04-12 05:45:28 -07:00
5a78400f37
table cleanup
friendica
2012-04-12 05:15:45 -07:00
309f2bfa5f
quattro: icons for "Mark all sys notifs read" and "See all notifs" as icons in a toolbar in notifications menu
Fabio Comuni
2012-04-12 09:17:35 +02:00
a23d46c49b
main.js: set notifications icon "on" with new unread notifcations. Show "Nothing new here" with no notifications at all
Fabio Comuni
2012-04-12 09:15:08 +02:00
18ecac4e93
settings: remove call to profile_load()
Fabio Comuni
2012-04-12 08:42:00 +02:00
6c50eba206
quattro: move center css to style.php. add tpl for generic_links_widget
Fabio Comuni
2012-04-12 08:40:17 +02:00
e992e29685
settings: move tabs to aside. add a new template "generic_links_widget.tpl"
Fabio Comuni
2012-04-12 08:38:55 +02:00
815a727076
Merge pull request #227 from simonlnu/master
Simon
2012-04-11 22:09:09 -07:00
c21244f679
fix the icons a bit
Simon L'nu
2012-04-12 01:08:02 -04:00
a3b2f35c84
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-04-12 01:03:54 -04:00
d52dad3826
Merge https://github.com/friendica/friendica into pull
friendica
2012-04-11 16:45:19 -07:00
8a8702c9cd
extensible item_id table for managing all the different message-ids generated by multiple services
friendica
2012-04-11 16:13:57 -07:00
ee714daf4d
Merge commit 'upstream/master'
Michael Vogel
2012-04-11 19:35:51 +02:00
c88c2515e4
API: Improved the timeline. Several (disabled) tests with caching of photos.
Michael Vogel
2012-04-11 19:31:01 +02:00
a1d5026abf
diabook-themes: small fix
tommy tomson
2012-04-11 18:49:07 +02:00
39405c8056
Merge remote branch 'upstream/master'
Michael
2012-04-11 18:48:58 +02:00
c3139fa0fd
Merge branch 'master' of github.com:annando/friendica
Michael
2012-04-11 18:47:21 +02:00
cdb6510b9f
Merge pull request #226 from simonlnu/master
Simon
2012-04-10 23:01:57 -07:00
c79d1deb92
major refactor. step 1
Simon L'nu
2012-04-11 01:59:33 -04:00
8ec84c5bce
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-04-11 01:57:52 -04:00
967ed8e23f
Merge https://github.com/friendica/friendica into pull
friendica
2012-04-10 20:51:04 -07:00
b02a671494
visit "random profile" feature
friendica
2012-04-10 20:50:31 -07:00
0c4e9912b0
Merge pull request #225 from simonlnu/master
Simon
2012-04-10 20:47:55 -07:00
6b414d3de4
more ' = ' spacing fixes
Simon L'nu
2012-04-10 23:45:47 -04:00
75c7877986
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-04-10 23:34:55 -04:00
2af41ee57b
[fix] absolute links in docs and newmember.php; breaks sub-dir installs
Simon L'nu
2012-04-10 23:34:39 -04:00
0fa932853c
profile redir - goto correct profile page even if contact blocked, you just can't do anything.
friendica
2012-04-10 20:09:51 -07:00
ae9506f21e
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-04-10 22:51:29 -04:00
640f258f18
cleanup photo menus
friendica
2012-04-10 19:33:32 -07:00
19b636e7e8
more backend work on mail2 followers
friendica
2012-04-10 19:15:52 -07:00
ed608694ce
make editplain work everywhere
friendica
2012-04-10 18:08:06 -07:00
18e225b051
move all fix_mce to one function so it can easily be undone
friendica
2012-04-10 17:14:07 -07:00
ab46f95683
duplicate community posts
friendica
2012-04-10 16:59:30 -07:00
8f40e8546e
fix_mce_lf contact edit page
friendica
2012-04-10 16:32:38 -07:00
9b1bb53234
fix_mce_lf on profiles
friendica
2012-04-10 16:31:49 -07:00
703bfcb6d4
Merge https://github.com/friendica/friendica into pull
friendica
2012-04-10 16:07:05 -07:00
14d68a0dc0
set default on get_avatar
friendica
2012-04-10 15:33:43 -07:00
3c66816938
Merge branch 'libravatar' of https://github.com/dawnbreak/friendica into pull
friendica
2012-04-10 15:28:48 -07:00
35b978bb1e
rev update
friendica
2012-04-10 15:25:15 -07:00
0e97e2338a
Merge pull request #222 from CatoTH/master
friendica
2012-04-10 15:23:04 -07:00
3380ff3240
Merge pull request #223 from campino/master
friendica
2012-04-10 15:21:37 -07:00
e1c43c1c1c
Incorrect tranlation (one negation too much)
Tobias Hößl
2012-04-10 20:43:31 +00:00
64cf2d089a
fixed install bug
Alexander Kampmann
2012-04-10 17:10:24 +02:00
6db33fc513
diabook-themes: smal fix in bbcode-js
tommy tomson
2012-04-10 15:13:34 +02:00
b3f18945ba
diabook-themes: added url and quote to bbcode toolbar under comment box
tommy tomson
2012-04-10 14:38:59 +02:00
9fafe64f82
Merge pull request #221 from simonlnu/master
Simon
2012-04-10 02:50:42 -07:00
707a5dbae7
aaah, nice asides ;). we'll be updating these soon
Simon L'nu
2012-04-10 05:48:42 -04:00
514780745f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-04-10 05:03:32 -04:00
4c3b835307
path to default.php in theme dir was incorrect
friendica
2012-04-10 01:51:53 -07:00
61c28e8c2e
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-04-10 02:49:34 -04:00
9a8c69b024
Merge branch 'pull'
friendica
2012-04-09 16:55:06 -07:00
2072fabc78
rev update
friendica
2012-04-09 16:54:39 -07:00
2d23c8a246
Merge pull request #218 from campino/master
friendica
2012-04-09 16:53:23 -07:00
16c48b2200
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-04-09 19:20:51 -04:00
0fd05171d0
Merge pull request #220 from tomtom84/master
tomtom84
2012-04-09 15:56:52 -07:00
0d4fab4ee3
bbcode toolbar attached to the comment text field minor css-fixes
tommy tomson
2012-04-10 00:55:39 +02:00
1f9fe8b5ee
Remove Gravatar from core and add new hook avatar_lookup.
Klaus Weidenbach
2012-04-08 23:20:31 +02:00
93ffba58cc
Rename gravatar_img() more generic to avatar_img().
Klaus Weidenbach
2012-02-21 00:54:34 +01:00
d25a9df996
diabook-themes: small icon fix
tommy tomson
2012-04-09 19:56:53 +02:00
2190b95d80
Merge branch 'master' of https://github.com/friendica/friendica
Alexander Kampmann
2012-04-09 16:56:37 +02:00
018727aa15
source beautifarming to make review easier
Alexander Kampmann
2012-04-09 16:56:01 +02:00
71edd6843f
Merge pull request #217 from tomtom84/master
tomtom84
2012-04-09 07:42:57 -07:00
c27c340de1
diabook-nav-icons with gradient
tommy tomson
2012-04-09 16:41:23 +02:00
1370ba5d16
Merge branch 'master' of https://github.com/friendica/friendica
Alexander Kampmann
2012-04-09 14:28:21 +02:00
7187516718
fixed some typos
Alexander Kampmann
2012-04-09 14:27:52 +02:00
7ac4b83c39
made exceptions from the db optional set address for updae mails correctly
Alexander Kampmann
2012-04-09 14:04:49 +02:00
84142076a1
Merge branch 'pull'
friendica
2012-04-09 04:56:43 -07:00
92c20895e0
use local_user for tag completion if available. See bug #368
friendica
2012-04-09 04:55:52 -07:00
6267da0a29
Merge pull request #216 from zzottel/master
tomtom84
2012-04-09 04:02:29 -07:00
fe257a2032
html2plain: changed behaviour for the "hr" element.
Michael Vogel
2012-04-09 12:54:02 +02:00
894e126c55
API: Tweetdeck is now working
Michael Vogel
2012-04-09 11:49:33 +02:00
0bad8de056
Merge remote branch 'upstream/master'
zottel
2012-04-09 03:13:54 +02:00
c1e2596807
more sane defaults datetime_convert
friendica
2012-04-08 18:09:21 -07:00
129130b0f7
fix empty string timezone
friendica
2012-04-08 18:01:49 -07:00
5183d4f77d
Some new German translations
zottel
2012-04-09 02:30:18 +02:00