This website requires JavaScript.
9f18c9d664
Merge pull request #277 from mschmitt/master
friendica
2012-04-30 01:29:50 -07:00
6b9ac25398
Merge pull request #278 from max-weller/meta_viewport
friendica
2012-04-30 01:29:35 -07:00
52e4098a3d
Merge https://github.com/friendica/friendica into pull
friendica
2012-04-30 01:26:06 -07:00
3ff8fe53a2
provide "xxx joined yyy" notifications
friendica
2012-04-30 01:25:25 -07:00
9d8a0553ac
adding META viewport tag for better look on tablets
Max Weller
2012-04-30 09:48:21 +02:00
5b9f01c3ab
Update Esperanto to 100%
Martin Schmitt
2012-04-30 09:00:03 +02:00
36522c4341
Merge branch 'master' of https://github.com/friendica/friendica
Tobias Diekershoff
2012-04-30 08:40:06 +02:00
f08dc392df
DE update to the strings
Tobias Diekershoff
2012-04-30 08:39:12 +02:00
0639f645d2
activitystreams schema constants for "join group"
friendica
2012-04-29 23:15:12 -07:00
384d28a6bd
Merge pull request #276 from tomtom84/master
friendica
2012-04-29 22:39:29 -07:00
da555286d6
missed a db field
friendica
2012-04-29 22:36:26 -07:00
928faf3b97
typo in profile_selectors, fix remote tagging
friendica
2012-04-29 22:34:05 -07:00
ae2aa74444
not all profile selector choices have unique or direct translations
friendica
2012-04-29 20:05:29 -07:00
1ebde08415
log db error strings in all cases
friendica
2012-04-29 19:41:17 -07:00
0153d86b7f
admin page to manage failed updates
friendica
2012-04-29 19:10:07 -07:00
34eb843fb4
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-04-29 22:06:16 -04:00
e3fecb2557
improved db error logging
friendica
2012-04-29 17:34:54 -07:00
ab908469ae
close one menu (like the notifications menu) when another one is opened (like it is done when clicking somewhere else) (thx to ^mw)
tommy tomson
2012-04-30 02:00:41 +02:00
def6f0b408
the heart should really be red.
friendica
2012-04-29 02:11:33 -07:00
735f518fd8
fix location change notification
friendica
2012-04-29 01:49:54 -07:00
a9dba2720b
enhanced profile reporting for single values
friendica
2012-04-29 01:42:48 -07:00
249a6814cd
add db field for removed account, which will also be the first test of update error checking
friendica
2012-04-29 01:08:28 -07:00
64060f82dc
toggle to archive unfriends, though render them useless
friendica
2012-04-28 21:56:17 -07:00
b3a71e4327
indicate successful updates
friendica
2012-04-28 21:35:14 -07:00
920d40acf4
diabook-themes: small fix
tommy tomson
2012-04-29 05:58:23 +02:00
3d054341ef
diabook-themes: bug/css-fixes
tommy tomson
2012-04-29 04:12:04 +02:00
356bd9b04a
some constants for the db update failure possibilities
friendica
2012-04-28 17:53:19 -07:00
7919d00399
bring back the email and logging of update failures, but without the transactions
friendica
2012-04-28 17:50:28 -07:00
ecd1dab373
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-04-28 20:16:25 -04:00
8a112aee00
Merge https://github.com/friendica/friendica into pull
friendica
2012-04-28 16:55:07 -07:00
4ff2e9a103
a few more continues that should be returns
friendica
2012-04-28 16:54:33 -07:00
a757afc6bd
Merge pull request #275 from cvogeley/master
friendica
2012-04-28 16:46:12 -07:00
9413900a9f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-04-28 15:46:16 -04:00
3f586bb962
small bugfix. sometimes also avatar pics were rescaled
Christian Vogeley
2012-04-28 20:15:10 +02:00
44700b914d
poller refactor: continue not valid in this context
friendica
2012-04-28 04:20:38 -07:00
c661dc502f
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-04-28 05:29:03 -04:00
f163aed66d
break up poller into separate processes
friendica
2012-04-27 23:17:40 -07:00
3bb06cc3e4
add tooltip title to common_tabs
friendica
2012-04-27 19:47:52 -07:00
e356920e14
Merge https://github.com/friendica/friendica into pull
friendica
2012-04-27 19:40:24 -07:00
39d0926d09
PRIVACY: if wall is blocked, don't provide public keywords in HTML meta
friendica
2012-04-27 19:39:19 -07:00
4b553de79f
Diabook-dark update, it's almost useable now (if you're lenient).
Thomas Willingham
2012-04-28 03:01:27 +01:00
3bfa3f2a13
fix #search-text
Simon L'nu
2012-04-27 21:02:57 -04:00
b618715fc6
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-04-27 21:00:56 -04:00
43f9ea7cfc
Merge remote branch 'upstream/master'
zottel
2012-04-28 02:30:20 +02:00
adc2fc18a5
Added "important changes" to admin menu for admins who don't follow the github properly.
Thomas Willingham
2012-04-28 01:25:55 +01:00
c3f70a9e56
string update
friendica
2012-04-27 17:19:10 -07:00
26c53580d1
implement contact archival
friendica
2012-04-27 17:17:58 -07:00
0ab6b60a52
archive contact flag
friendica
2012-04-27 16:46:28 -07:00
ecc4962bd1
pass zrl to dfrn_request as fallback
friendica
2012-04-27 16:23:25 -07:00
b3750ab54e
Merge https://github.com/friendica/friendica into pull
friendica
2012-04-27 15:56:28 -07:00
c7cbff6fbb
rev update
friendica
2012-04-27 15:55:56 -07:00
455973180b
Merge pull request #274 from cvogeley/master
friendica
2012-04-27 15:55:38 -07:00
731379fa25
another attempt to fix lower tab behaviour on small screens, community back in tab area
Christian Vogeley
2012-04-27 23:48:44 +02:00
edc7e571b7
Merge remote branch 'upstream/master'
zottel
2012-04-27 23:05:38 +02:00
a632f03531
Merge pull request #273 from simonlnu/master
Simon
2012-04-27 11:38:19 -07:00
64f3af49fa
remove extra netsearch-box and fix
Simon L'nu
2012-04-27 14:33:56 -04:00
fcbe78f9aa
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-04-27 14:33:11 -04:00
e315b01f86
Merge pull request #272 from simonlnu/master
Simon
2012-04-27 10:31:55 -07:00
d0d79196ba
fix contact-friend stuff on profile sidebar
Simon L'nu
2012-04-27 13:31:06 -04:00
263836ad54
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-04-27 13:29:07 -04:00
214ec91a3f
Merge branch 'master' of git://github.com/friendica/friendica
Vasudev Kamath
2012-04-27 22:43:26 +05:30
4b92e3543c
Merge https://github.com/friendica/friendica into pull
friendica
2012-04-27 02:31:37 -07:00
266eaae439
put community back on the lower tab. It belongs with message streams
friendica
2012-04-27 02:30:49 -07:00
d16c93c7cd
Merge pull request #271 from simonlnu/master
Simon
2012-04-27 01:43:32 -07:00
deae1df3be
fix some css errors
Simon L'nu
2012-04-27 04:42:38 -04:00
014e832db0
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-04-27 04:15:27 -04:00
153534bc70
Merge https://github.com/friendica/friendica into pull
friendica
2012-04-27 01:10:33 -07:00
f06a554e05
fix view contacts
friendica
2012-04-27 01:10:09 -07:00
8aead9e517
Merge pull request #270 from simonlnu/master
Simon
2012-04-26 23:36:11 -07:00
b936e3a18a
fix 2 issues. contacts img in finder; wall filer title
Simon L'nu
2012-04-27 02:33:58 -04:00
bd1b38381d
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-04-27 02:28:44 -04:00
17aba3033f
Merge remote branch 'upstream/master'
zottel
2012-04-27 08:10:04 +02:00
a1f94ac59f
reset qcomment selector after insert.
friendica
2012-04-26 21:53:40 -07:00
d3992b78e6
put fakelink back in birthday notice
friendica
2012-04-26 20:08:57 -07:00
dee36c1b04
birthday contact link goes to event page instead of remote profile
friendica
2012-04-26 20:02:42 -07:00
dd33599a1d
Merge https://github.com/friendica/friendica into pull
friendica
2012-04-26 19:56:25 -07:00
3c6cf1f19c
make comment edit icons look more like base theme
friendica
2012-04-26 19:55:20 -07:00
6c1ab27626
Merge pull request #269 from simonlnu/master
Simon
2012-04-26 17:15:14 -07:00
8834944952
fix s/color/colour/g issue
Simon L'nu
2012-04-26 20:13:11 -04:00
7b5bab445d
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-04-26 20:07:54 -04:00
2d94d216a3
Merge https://github.com/friendica/friendica into pull
friendica
2012-04-26 15:35:25 -07:00
f8e7f28f40
rev update
friendica
2012-04-26 15:35:00 -07:00
3ee998dbaf
Merge pull request #267 from tomtom84/master
friendica
2012-04-26 15:33:34 -07:00
552895001c
Merge pull request #268 from simonlnu/master
Simon
2012-04-26 13:23:23 -07:00
d6116b6979
announced dipsy change. re-tie your boots, we're in for a wee ride ;)
Simon L'nu
2012-04-26 16:14:42 -04:00
bd14fdec6e
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-04-26 16:10:17 -04:00
328568943e
diabook-themes: small-fix
tommy tomson
2012-04-26 21:07:46 +02:00
77a0570162
add link "remove account" to /mod/settings.php
tommy tomson
2012-04-26 17:21:27 +02:00
82abb14bf9
Merge pull request #265 from cvogeley/master
friendica
2012-04-26 01:35:50 -07:00
bf97ad2010
Merge https://github.com/friendica/friendica into pull
friendica
2012-04-26 01:34:21 -07:00
78579627ce
rev update, fix autoname test "random" failure
friendica
2012-04-26 01:33:41 -07:00
f6f666e38a
Merge pull request #266 from simonlnu/master
Simon
2012-04-25 23:45:32 -07:00
c1f1974e44
convert stylesheets to less, and compress output css
Simon L'nu
2012-04-26 02:38:18 -04:00
6b830bfa97
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-04-26 00:20:00 -04:00
20a9cdfc90
Diabook-dark more CSS fixes.
Thomas Willingham
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
Christian Vogeley
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
Christian Vogeley
2012-04-25 21:28:13 +02:00
c0d4e39052
added BBCODE thing in comments
Christian Vogeley
2012-04-25 21:08:31 +02:00
78280bdfed
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu
2012-04-25 13:47:20 -04:00
4c1398c6b1
add cleanzero theme
Christian Vogeley
2012-04-25 19:09:46 +02:00