This website requires JavaScript.
75c7877986
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-10 23:34:55 -04:00
2af41ee57b
[fix] absolute links in docs and newmember.php; breaks sub-dir installs
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.
2012-04-10 20:09:51 -07:00
ae9506f21e
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-10 22:51:29 -04:00
640f258f18
cleanup photo menus
2012-04-10 19:33:32 -07:00
19b636e7e8
more backend work on mail2 followers
2012-04-10 19:15:52 -07:00
ed608694ce
make editplain work everywhere
2012-04-10 18:08:06 -07:00
18e225b051
move all fix_mce to one function so it can easily be undone
2012-04-10 17:14:07 -07:00
ab46f95683
duplicate community posts
2012-04-10 16:59:30 -07:00
8f40e8546e
fix_mce_lf contact edit page
2012-04-10 16:32:38 -07:00
9b1bb53234
fix_mce_lf on profiles
2012-04-10 16:31:49 -07:00
703bfcb6d4
Merge https://github.com/friendica/friendica into pull
2012-04-10 16:07:05 -07:00
14d68a0dc0
set default on get_avatar
2012-04-10 15:33:43 -07:00
3c66816938
Merge branch 'libravatar' of https://github.com/dawnbreak/friendica into pull
2012-04-10 15:28:48 -07:00
35b978bb1e
rev update
2012-04-10 15:25:15 -07:00
0e97e2338a
Merge pull request #222 from CatoTH/master
2012-04-10 15:23:04 -07:00
3380ff3240
Merge pull request #223 from campino/master
2012-04-10 15:21:37 -07:00
e1c43c1c1c
Incorrect tranlation (one negation too much)
2012-04-10 20:43:31 +00:00
64cf2d089a
fixed install bug
2012-04-10 17:10:24 +02:00
6db33fc513
diabook-themes: smal fix in bbcode-js
2012-04-10 15:13:34 +02:00
b3f18945ba
diabook-themes: added url and quote to bbcode toolbar under comment box
2012-04-10 14:38:59 +02:00
9fafe64f82
Merge pull request #221 from simonlnu/master
2012-04-10 02:50:42 -07:00
707a5dbae7
aaah, nice asides ;). we'll be updating these soon
2012-04-10 05:48:42 -04:00
514780745f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-10 05:03:32 -04:00
4c3b835307
path to default.php in theme dir was incorrect
2012-04-10 01:51:53 -07:00
61c28e8c2e
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-10 02:49:34 -04:00
9a8c69b024
Merge branch 'pull'
2012-04-09 16:55:06 -07:00
2072fabc78
rev update
2012-04-09 16:54:39 -07:00
2d23c8a246
Merge pull request #218 from campino/master
2012-04-09 16:53:23 -07:00
16c48b2200
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-09 19:20:51 -04:00
0fd05171d0
Merge pull request #220 from tomtom84/master
2012-04-09 15:56:52 -07:00
0d4fab4ee3
bbcode toolbar attached to the comment text field minor css-fixes
2012-04-10 00:55:39 +02:00
1f9fe8b5ee
Remove Gravatar from core and add new hook avatar_lookup.
2012-04-08 23:20:31 +02:00
93ffba58cc
Rename gravatar_img() more generic to avatar_img().
2012-02-21 00:54:34 +01:00
d25a9df996
diabook-themes: small icon fix
2012-04-09 19:56:53 +02:00
2190b95d80
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-09 16:56:37 +02:00
018727aa15
source beautifarming to make review easier
2012-04-09 16:56:01 +02:00
71edd6843f
Merge pull request #217 from tomtom84/master
2012-04-09 07:42:57 -07:00
c27c340de1
diabook-nav-icons with gradient
2012-04-09 16:41:23 +02:00
1370ba5d16
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-09 14:28:21 +02:00
7187516718
fixed some typos
2012-04-09 14:27:52 +02:00
7ac4b83c39
made exceptions from the db optional set address for updae mails correctly
2012-04-09 14:04:49 +02:00
84142076a1
Merge branch 'pull'
2012-04-09 04:56:43 -07:00
92c20895e0
use local_user for tag completion if available. See bug #368
2012-04-09 04:55:52 -07:00
6267da0a29
Merge pull request #216 from zzottel/master
2012-04-09 04:02:29 -07:00
fe257a2032
html2plain: changed behaviour for the "hr" element.
2012-04-09 12:54:02 +02:00
894e126c55
API: Tweetdeck is now working
2012-04-09 11:49:33 +02:00
0bad8de056
Merge remote branch 'upstream/master'
2012-04-09 03:13:54 +02:00
c1e2596807
more sane defaults datetime_convert
2012-04-08 18:09:21 -07:00
129130b0f7
fix empty string timezone
2012-04-08 18:01:49 -07:00
5183d4f77d
Some new German translations
2012-04-09 02:30:18 +02:00
de3b9e9584
send zrl after dfrn_request homecoming for manual entries
2012-04-08 17:28:36 -07:00
7cf946e004
Merge remote branch 'upstream/master'
2012-04-09 02:20:34 +02:00
63c881b50d
Merge branch 'pull'
2012-04-08 16:29:54 -07:00
977625a53b
fix to wall_upload photos default permissions to use cid rather than uid.
2012-04-08 16:19:45 -07:00
0d60dbef31
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
2012-04-09 00:45:10 +02:00
06c0447342
Merge pull request #215 from tomtom84/master
2012-04-08 15:04:59 -07:00
7d018f651d
fixed z-index of youtube-vids fixed bug to hide right_side
2012-04-09 00:02:48 +02:00
315d496290
Merge remote branch 'upstream/master'
2012-04-08 21:50:41 +02:00
269f21ddc1
API: Added Public Timeline
2012-04-08 20:19:14 +02:00
f1db690786
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-08 13:49:52 -04:00
763729f11a
API: Now mentions could work as well - only my client doesn't really work
2012-04-08 17:51:05 +02:00
944f897d30
API: Basic support of the identica client added.
2012-04-08 17:23:38 +02:00
5c04469755
prepare for using a master theme_init()
2012-04-08 06:20:57 -07:00
741a5dba57
provide theme_init() functions
2012-04-08 05:52:00 -07:00
3afc9915e3
rev updates
2012-04-08 05:24:11 -07:00
c3867f4ce4
Merge pull request #214 from annando/master
2012-04-08 05:19:54 -07:00
aaf5a81365
Merge remote branch 'upstream/master'
2012-04-08 10:33:32 +02:00
ce0eac44b5
Merge commit 'upstream/master'
2012-04-08 10:07:39 +02:00
e3b2ac0735
Merge pull request #213 from simonlnu/master
2012-04-07 20:47:37 -07:00
01961f7caa
minor dispy* fixes
2012-04-07 23:46:47 -04:00
cb4c7cdb3e
API: API is now enhanced. mentions, repeat and destroy now works.
2012-04-08 00:02:25 +02:00
cee3608747
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-07 14:47:02 -04:00
f931d5c918
diabook-themes: small fix
2012-04-07 19:56:00 +02:00
17d097124c
"vier": Some design stuff
2012-04-07 18:35:37 +02:00
cb05801a90
Merge commit 'upstream/master'
2012-04-07 18:35:29 +02:00
0fa3b7f348
Merge pull request #212 from tomtom84/master
2012-04-07 07:41:23 -07:00
1c0700f371
changelog 1.014 : image-rezise via jquery-plugin in stream comments under uploaded pictues add Diabook's version-number in head-section
2012-04-07 16:39:43 +02:00
1440786c31
ignore utf8 offset error for unit tests
2012-04-07 02:31:41 -07:00
e575d67969
had arg order backwards
2012-04-07 02:23:11 -07:00
7a7102618b
try assertContains
2012-04-07 02:21:55 -07:00
cf2d8ef7a6
tag tests cont.
2012-04-07 02:11:56 -07:00
f30146b521
fix autonamenegativelength test
2012-04-07 01:20:38 -07:00
3a1c78bd75
some work on tests
2012-04-07 01:04:45 -07:00
bc69a957dc
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-07 03:10:09 -04:00
7308dbae28
"vier": Bookmarks now look better.
2012-04-07 01:19:07 +02:00
ecabe1d505
ignore removed plugins
2012-04-06 05:21:42 -07:00
533e215a96
Merge branch 'pull'
2012-04-06 05:12:18 -07:00
13dfb40128
fix messed up config tables w/ duplicate entries
2012-04-06 05:11:09 -07:00
9cff2e36cf
Merge pull request #211 from tomtom84/master
2012-04-06 04:33:26 -07:00
75bcf42caa
Merge remote-tracking branch 'origin/master'
2012-04-06 13:29:20 +02:00
adf3ad5fd6
Merge pull request #210 from tomtom84/master
2012-04-06 04:29:01 -07:00
0cb2407c94
Merge remote-tracking branch 'origin/master'
2012-04-06 12:58:41 +02:00
4f9588d9ee
Merge branch 'master' of https://github.com/friendica/friendica
2012-04-06 12:43:44 +02:00
eb6370fa41
small fixes for the German strings
2012-04-06 12:43:20 +02:00
0731c177eb
fix bad sql update
2012-04-06 03:25:01 -07:00
52d5ef905e
Merge remote-tracking branch 'origin/master'
2012-04-06 12:24:05 +02:00
91906b1b74
Merge branch 'pull'
2012-04-06 03:12:02 -07:00
665b2c8107
revert config changes, we're getting duplicate keys
2012-04-06 03:10:46 -07:00
f980b79edc
new-contacts-introductions in contacts-drop-down and new-messages in messages-drop-down get each an additional indicator... profile-picture is now scaled right in firefox... fixed broken css on introductions-page in firefox...
2012-04-06 11:19:12 +02:00
Simon L'nu
friendica
Tobias Hößl
Alexander Kampmann
tommy tomson
Simon
tomtom84
Klaus Weidenbach
Michael Vogel
zottel
Tobias Diekershoff