This website requires JavaScript.
b3750ab54e
Merge https://github.com/friendica/friendica into pull
2012-04-27 15:56:28 -07:00
c7cbff6fbb
rev update
2012-04-27 15:55:56 -07:00
455973180b
Merge pull request #274 from cvogeley/master
2012-04-27 15:55:38 -07:00
731379fa25
another attempt to fix lower tab behaviour on small screens, community back in tab area
2012-04-27 23:48:44 +02:00
edc7e571b7
Merge remote branch 'upstream/master'
2012-04-27 23:05:38 +02:00
a632f03531
Merge pull request #273 from simonlnu/master
2012-04-27 11:38:19 -07:00
64f3af49fa
remove extra netsearch-box and fix
2012-04-27 14:33:56 -04:00
fcbe78f9aa
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-27 14:33:11 -04:00
e315b01f86
Merge pull request #272 from simonlnu/master
2012-04-27 10:31:55 -07:00
d0d79196ba
fix contact-friend stuff on profile sidebar
2012-04-27 13:31:06 -04:00
263836ad54
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-27 13:29:07 -04:00
214ec91a3f
Merge branch 'master' of git://github.com/friendica/friendica
2012-04-27 22:43:26 +05:30
4b92e3543c
Merge https://github.com/friendica/friendica into pull
2012-04-27 02:31:37 -07:00
266eaae439
put community back on the lower tab. It belongs with message streams
2012-04-27 02:30:49 -07:00
d16c93c7cd
Merge pull request #271 from simonlnu/master
2012-04-27 01:43:32 -07:00
deae1df3be
fix some css errors
2012-04-27 04:42:38 -04:00
014e832db0
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-27 04:15:27 -04:00
153534bc70
Merge https://github.com/friendica/friendica into pull
2012-04-27 01:10:33 -07:00
f06a554e05
fix view contacts
2012-04-27 01:10:09 -07:00
8aead9e517
Merge pull request #270 from simonlnu/master
2012-04-26 23:36:11 -07:00
b936e3a18a
fix 2 issues. contacts img in finder; wall filer title
2012-04-27 02:33:58 -04:00
bd1b38381d
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-27 02:28:44 -04:00
17aba3033f
Merge remote branch 'upstream/master'
2012-04-27 08:10:04 +02:00
a1f94ac59f
reset qcomment selector after insert.
2012-04-26 21:53:40 -07:00
d3992b78e6
put fakelink back in birthday notice
2012-04-26 20:08:57 -07:00
dee36c1b04
birthday contact link goes to event page instead of remote profile
2012-04-26 20:02:42 -07:00
dd33599a1d
Merge https://github.com/friendica/friendica into pull
2012-04-26 19:56:25 -07:00
3c6cf1f19c
make comment edit icons look more like base theme
2012-04-26 19:55:20 -07:00
6c1ab27626
Merge pull request #269 from simonlnu/master
2012-04-26 17:15:14 -07:00
8834944952
fix s/color/colour/g issue
2012-04-26 20:13:11 -04:00
7b5bab445d
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-26 20:07:54 -04:00
2d94d216a3
Merge https://github.com/friendica/friendica into pull
2012-04-26 15:35:25 -07:00
f8e7f28f40
rev update
2012-04-26 15:35:00 -07:00
3ee998dbaf
Merge pull request #267 from tomtom84/master
2012-04-26 15:33:34 -07:00
552895001c
Merge pull request #268 from simonlnu/master
2012-04-26 13:23:23 -07:00
d6116b6979
announced dipsy change. re-tie your boots, we're in for a wee ride ;)
2012-04-26 16:14:42 -04:00
bd14fdec6e
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-26 16:10:17 -04:00
328568943e
diabook-themes: small-fix
2012-04-26 21:07:46 +02:00
77a0570162
add link "remove account" to /mod/settings.php
2012-04-26 17:21:27 +02:00
82abb14bf9
Merge pull request #265 from cvogeley/master
2012-04-26 01:35:50 -07:00
bf97ad2010
Merge https://github.com/friendica/friendica into pull
2012-04-26 01:34:21 -07:00
78579627ce
rev update, fix autoname test "random" failure
2012-04-26 01:33:41 -07:00
f6f666e38a
Merge pull request #266 from simonlnu/master
2012-04-25 23:45:32 -07:00
c1f1974e44
convert stylesheets to less, and compress output css
2012-04-26 02:38:18 -04:00
6b830bfa97
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-26 00:20:00 -04:00
20a9cdfc90
Diabook-dark more CSS fixes.
2012-04-25 23:40:40 +01:00
43a257f2f6
duepuntozero: move community and manage link to upper right area + css fixes to avoid breaking of design
2012-04-25 21:30:04 +02:00
28370e320f
duepuntozero: move community and manage link to upper right area + css fixes to avoid breaking of design
2012-04-25 21:28:13 +02:00
c0d4e39052
added BBCODE thing in comments
2012-04-25 21:08:31 +02:00
78280bdfed
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-25 13:47:20 -04:00
4c1398c6b1
add cleanzero theme
2012-04-25 19:09:46 +02:00
c9e5609cbf
bug #307 , explaining decentralised private photos is impossible.
2012-04-25 05:41:32 -07:00
37bc00094e
this turns out to be harder than I thought
2012-04-25 01:36:22 -07:00
38e822320c
Merge pull request #264 from mschmitt/master
2012-04-25 00:25:05 -07:00
50f10a4fd7
Merge https://github.com/friendica/friendica into pull
2012-04-25 00:14:20 -07:00
ba0ade3380
cleanup - make bb-buttons vanish when comment closed
2012-04-25 00:13:36 -07:00
0116426a0e
Merge remote branch 'upstream/master'
2012-04-25 09:07:36 +02:00
1a1efc7e46
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-25 03:05:47 -04:00
15f7125df2
Esperanto at 100% again
2012-04-25 08:50:02 +02:00
5187faa595
Merge pull request #263 from tomtom84/master
2012-04-24 18:42:32 -07:00
9fe6333fd4
diabook-themes: fix css to login.tpl
2012-04-25 03:38:21 +02:00
5af80dbb89
restore qcomment selector
2012-04-24 18:23:48 -07:00
139c2c1bbd
Merge https://github.com/friendica/friendica into pull
2012-04-24 17:55:56 -07:00
a5f9e67c9f
rev update
2012-04-24 17:55:35 -07:00
75828b4750
Merge pull request #262 from tomtom84/master
2012-04-24 17:54:41 -07:00
e72eaf2408
zero-themes: add bbcode-toolbar to commentbox
2012-04-25 02:43:50 +02:00
08b990a314
diabook-themes: small fix
2012-04-25 00:19:57 +02:00
5ebc221c28
Merge pull request #261 from fabrixxm/eventspage
2012-04-24 14:50:22 -07:00
a28fea987e
Diabook-dark css fix
2012-04-24 20:07:08 +01:00
fade45ca76
Diabook-dark, couple of new icons, and another css fix.
2012-04-24 20:00:49 +01:00
912e008ded
Merge remote branch 'upstream/master'
2012-04-24 10:38:23 +02:00
fbdb8fc43a
fix tags test with new url
2012-04-24 01:02:22 -07:00
c9a8dbc322
quattro: small week calendar view for event/birthday reminders
2012-04-24 09:50:44 +02:00
62ad5043d6
remove html from get_birthdays() and get_events()
2012-04-24 09:50:10 +02:00
0e2c6c2819
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-24 03:33:46 -04:00
fc61616c53
events page: set calendar start date from url (events/[year]/[month]/) and show event popup from url anchor (#link-[event id])
2012-04-24 08:12:30 +02:00
7923404c83
Merge https://github.com/friendica/friendica into pull
2012-04-23 22:42:48 -07:00
2064d86cb3
separate tag search from body search
2012-04-23 22:41:32 -07:00
3299365c76
Merge pull request #260 from mschmitt/master
2012-04-23 22:22:05 -07:00
c85fd87df1
Esperanto at 100% again
2012-04-24 06:52:36 +02:00
822ecf41bd
Merge pull request #259 from beardy-unixer/master
2012-04-23 21:10:53 -07:00
9443248fad
Improvements to diabook-dark
2012-04-24 04:55:39 +01:00
92820c5181
Merge remote-tracking branch 'upstream/master'
2012-04-24 04:54:14 +01:00
3637534119
move unfriend to standalone function for use in account removal
2012-04-23 19:42:57 -07:00
f265863435
more work on mail2 (introductions), added 'm' (mail) flag to ACL backend for autocomplete of PM recips
2012-04-23 18:28:33 -07:00
8a80ea24d1
Merge remote-tracking branch 'upstream/master'
2012-04-24 02:18:51 +01:00
6e9485605f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-23 18:25:14 -04:00
af7abcea27
DE strings, correction of a typo
2012-04-23 20:55:48 +02:00
a305cf9f5c
diabok-themes: fixed bug in green-wide and dark-wide
2012-04-23 18:42:37 +02:00
c5c419a785
diabook-themes: small fix in nets_aside, group_aside and delete obsolete .tpls in subfolders
2012-04-23 17:22:22 +02:00
d072c12e7d
diabook-themes: bugfix in admin-section
2012-04-23 15:47:18 +02:00
e9e4fb664a
allow bbcode representation of html symbols such as © by wrapping in bb brackets
2012-04-23 05:42:46 -07:00
8f0f644295
protect jappixmini/proxy from typo check, more work on email2 connector
2012-04-23 05:16:57 -07:00
e6847cdd3f
Merge remote branch 'upstream/master'
2012-04-23 08:57:49 +02:00
29d7f260d7
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-04-22 22:22:52 -04:00
2170df897b
bug #388 - notify_comment received after post deleted
2012-04-22 19:19:02 -07:00
724e1d15d0
Merge https://github.com/friendica/friendica into pull
2012-04-22 16:25:02 -07:00
00cb7f9efb
don't allow non-existent themes as choices
2012-04-22 16:24:29 -07:00
c0dffa7442
Merge pull request #258 from unary/api
2012-04-22 15:43:24 -07:00
3c6c5d4749
Merge pull request #257 from CatoTH/master
2012-04-22 15:41:47 -07:00
friendica
Christian Vogeley
zottel
Simon
Simon L'nu
Vasudev Kamath
tommy tomson
Thomas Willingham
Martin Schmitt
tomtom84
Fabio Comuni
Tobias Diekershoff