clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,243 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

5243 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christian Vogeley 3f586bb962 small bugfix. sometimes also avatar pics were rescaled 2012-04-28 20:15:10 +02:00
friendica 44700b914d poller refactor: continue not valid in this context 2012-04-28 04:20:38 -07:00
friendica f163aed66d break up poller into separate processes 2012-04-27 23:17:40 -07:00
friendica 3bb06cc3e4 add tooltip title to common_tabs 2012-04-27 19:47:52 -07:00
friendica e356920e14 Merge https://github.com/friendica/friendica into pull 2012-04-27 19:40:24 -07:00
friendica 39d0926d09 PRIVACY: if wall is blocked, don't provide public keywords in HTML meta 2012-04-27 19:39:19 -07:00
Thomas Willingham 4b553de79f Diabook-dark update, it's almost useable now (if you're lenient). 2012-04-28 03:01:27 +01:00
Thomas Willingham adc2fc18a5 Added "important changes" to admin menu for admins who don't follow 
the github properly.
 2012-04-28 01:25:55 +01:00
friendica c3f70a9e56 string update 2012-04-27 17:19:10 -07:00
friendica 26c53580d1 implement contact archival 2012-04-27 17:17:58 -07:00
friendica 0ab6b60a52 archive contact flag 2012-04-27 16:46:28 -07:00
friendica ecc4962bd1 pass zrl to dfrn_request as fallback 2012-04-27 16:23:25 -07:00
friendica b3750ab54e Merge https://github.com/friendica/friendica into pull 2012-04-27 15:56:28 -07:00
friendica c7cbff6fbb rev update 2012-04-27 15:55:56 -07:00
friendica 455973180b Merge pull request #274 from cvogeley/master 
cleanzero: nav.tpl: Another attempt to improve lower tab behaviour
 2012-04-27 15:55:38 -07:00
Christian Vogeley 731379fa25 another attempt to fix lower tab behaviour on small screens, community back in tab area 2012-04-27 23:48:44 +02:00
Simon a632f03531 Merge pull request #273 from simonlnu/master 
fix netsearch-box dupe and stuff
 2012-04-27 11:38:19 -07:00
Simon L'nu 64f3af49fa remove extra netsearch-box and fix 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-27 14:33:56 -04:00
Simon L'nu fcbe78f9aa Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:

* master:
 2012-04-27 14:33:11 -04:00
Simon e315b01f86 Merge pull request #272 from simonlnu/master 
fix contact-friend stuff on profile sidebar
 2012-04-27 10:31:55 -07:00
Simon L'nu d0d79196ba fix contact-friend stuff on profile sidebar 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-27 13:31:06 -04:00
Simon L'nu 263836ad54 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  put community back on the lower tab. It belongs with message streams

* master:
 2012-04-27 13:29:07 -04:00
friendica 4b92e3543c Merge https://github.com/friendica/friendica into pull 2012-04-27 02:31:37 -07:00
friendica 266eaae439 put community back on the lower tab. It belongs with message streams 2012-04-27 02:30:49 -07:00
Simon d16c93c7cd Merge pull request #271 from simonlnu/master 
fix some css errors
 2012-04-27 01:43:32 -07:00
Simon L'nu deae1df3be fix some css errors 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-27 04:42:38 -04:00
Simon L'nu 014e832db0 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  fix view contacts

* master:
 2012-04-27 04:15:27 -04:00
friendica 153534bc70 Merge https://github.com/friendica/friendica into pull 2012-04-27 01:10:33 -07:00
friendica f06a554e05 fix view contacts 2012-04-27 01:10:09 -07:00
Simon 8aead9e517 Merge pull request #270 from simonlnu/master 
fix 2 issues
 2012-04-26 23:36:11 -07:00
Simon L'nu b936e3a18a fix 2 issues. contacts img in finder; wall filer title 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-27 02:33:58 -04:00
Simon L'nu bd1b38381d Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  reset qcomment selector after insert.
  put fakelink back in birthday notice
  birthday contact link goes to event page instead of remote profile
  make comment edit icons look more like base theme
  rev update

* master:
 2012-04-27 02:28:44 -04:00
friendica a1f94ac59f reset qcomment selector after insert. 2012-04-26 21:53:40 -07:00
friendica d3992b78e6 put fakelink back in birthday notice 2012-04-26 20:08:57 -07:00
friendica dee36c1b04 birthday contact link goes to event page instead of remote profile 2012-04-26 20:02:42 -07:00
friendica dd33599a1d Merge https://github.com/friendica/friendica into pull 2012-04-26 19:56:25 -07:00
friendica 3c6cf1f19c make comment edit icons look more like base theme 2012-04-26 19:55:20 -07:00
Simon 6c1ab27626 Merge pull request #269 from simonlnu/master 
fix s/color/colour/g issue
 2012-04-26 17:15:14 -07:00
Simon L'nu 8834944952 fix s/color/colour/g issue 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-26 20:13:11 -04:00
Simon L'nu 7b5bab445d Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  diabook-themes: small-fix
  add link "remove account" to /mod/settings.php

* master:
 2012-04-26 20:07:54 -04:00
friendica 2d94d216a3 Merge https://github.com/friendica/friendica into pull 2012-04-26 15:35:25 -07:00
friendica f8e7f28f40 rev update 2012-04-26 15:35:00 -07:00
friendica 3ee998dbaf Merge pull request #267 from tomtom84/master 
add link "remove account" to /mod/settings.php
 2012-04-26 15:33:34 -07:00
Simon 552895001c Merge pull request #268 from simonlnu/master 
announced dipsy change. re-tie your boots, we're in for a wee ride ;)
 2012-04-26 13:23:23 -07:00
Simon L'nu d6116b6979 announced dipsy change. re-tie your boots, we're in for a wee ride ;) 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-04-26 16:14:42 -04:00
Simon L'nu bd14fdec6e Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  rev update, fix autoname test "random" failure
  duepuntozero: move community and manage link to upper right area + css fixes to avoid breaking of design
  duepuntozero: move community and manage link to upper right area + css fixes to avoid breaking of design
  added BBCODE thing in comments
  add cleanzero theme

* master:
 2012-04-26 16:10:17 -04:00
tommy tomson 328568943e diabook-themes: small-fix 2012-04-26 21:07:46 +02:00
tommy tomson 77a0570162 add link "remove account" to /mod/settings.php 2012-04-26 17:21:27 +02:00
friendica 82abb14bf9 Merge pull request #265 from cvogeley/master 
cleanzero theme added
 2012-04-26 01:35:50 -07:00
friendica bf97ad2010 Merge https://github.com/friendica/friendica into pull 2012-04-26 01:34:21 -07:00