keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
6209 commits 4 branches 0 tags 179 MiB
Commit graph

6209 commits

This branch
This branch
All branches
Author SHA1 Message Date
friendica
a292629215 Merge https://github.com/friendica/friendica into pull 2012-05-02 15:27:39 -07:00
friendica
3be9cddfd7 rev update 2012-05-02 15:26:57 -07:00
friendica
b9c91c3320 Merge pull request #282 from max-weller/master 
Moved <meta viewport> to theme; Diabook style
 2012-05-02 13:49:57 -07:00
Simon L'nu
02dc116a9c Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  diabook-themes: more improvements in theme.php, add titles to bbcode under coment-box
  diabook-theme: tryied to improve performance a bit
  diabook-theme: fix footer/impressum
  missing param
  provide "service_class" identifier which will let us provide service_class limits such as number of FB friends, etc.
  delineate the new profile changes from the rest of the text
  how did that happen?
  shuffle results of remote_common_friends widget
  only validate once
  perform basic validation

* master:
 2012-05-02 12:49:00 -04:00
Max Weller
f0c11cac4a Moved Meta Viewport from global head.tpl to diabook's header 
I mistakenly added this <meta> tag to the global header, but it
causes problems for other themes, as they have other optimal widths.

I also added a style to diabook which makes the jGrowl messages
appear below the header bar, so you can still click the menu items
without having to close messages first.
 2012-05-02 16:59:58 +02:00
tommy tomson
6875f54647 diabook-themes: more improvements in theme.php, add titles to bbcode under coment-box 2012-05-02 16:27:01 +02:00
tommy tomson
67471bb534 diabook-theme: tryied to improve performance a bit 2012-05-02 14:33:04 +02:00
tommy tomson
6a9cd8cd4b diabook-theme: fix footer/impressum 2012-05-02 12:40:51 +02:00
friendica
21e18db757 missing param 2012-05-02 02:18:54 -07:00
friendica
dc31b93941 provide "service_class" identifier which will let us provide service_class limits such as number of FB friends, etc. 2012-05-02 01:45:57 -07:00
friendica
06d6ab4812 delineate the new profile changes from the rest of the text 2012-05-02 01:07:23 -07:00
friendica
35dc4202a2 how did that happen? 2012-05-02 00:58:28 -07:00
friendica
a42a475e10 shuffle results of remote_common_friends widget 2012-05-02 00:44:37 -07:00
friendica
1b1f56f556 only validate once 2012-05-01 23:16:58 -07:00
friendica
dd27328390 perform basic validation 2012-05-01 23:15:39 -07:00
zottel
6000e7f30d Merge remote branch 'upstream/master' 2012-05-02 08:11:52 +02:00
Simon L'nu
b3680c0d26 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  final touches - show friends in common with total strangers from different sites
  fix size
  cross fingers
  reduce the scope a bit
  add template
  fn not found
  really fat fingers today - though none of this has gone further than my own site
  another one
  typo
  first try common friends for visitors

* master:
 2012-05-02 01:54:59 -04:00
friendica
becdb1f508 final touches - show friends in common with total strangers from different sites 2012-05-01 21:22:27 -07:00
friendica
1fab28c413 fix size 2012-05-01 20:38:06 -07:00
friendica
e247ed3de2 cross fingers 2012-05-01 20:36:35 -07:00
friendica
594803afca reduce the scope a bit 2012-05-01 20:33:19 -07:00
friendica
066d69b21c add template 2012-05-01 20:22:59 -07:00
friendica
72dbc2faee fn not found 2012-05-01 20:11:35 -07:00
friendica
91085f0969 really fat fingers today - though none of this has gone further than my own site 2012-05-01 19:24:22 -07:00
friendica
15c1850156 another one 2012-05-01 19:20:41 -07:00
friendica
1fc796b276 typo 2012-05-01 19:19:24 -07:00
friendica
8bd6e1aef9 first try common friends for visitors 2012-05-01 19:16:18 -07:00
Simon L'nu
c96b40ab5f Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  improve handling of relative feed url's
  convert html entities to utf-8 before email header encoding
  More Diabook-dark touch-ups.  Should *really* be useable this time...with editplain anyway.
  modified:   images/smiley-thumbsup.gif
  diabook-themes: small fix at "community pages"-box
  link socgraph to zrls
  adding zrl support to social graphs

* master:
 2012-05-01 21:38:33 -04:00
friendica
f24ffa8ef0 improve handling of relative feed url's 2012-05-01 17:10:26 -07:00
friendica
6914bdce17 Merge https://github.com/friendica/friendica into pull 2012-05-01 15:50:14 -07:00
friendica
38ccd2e655 convert html entities to utf-8 before email header encoding 2012-05-01 15:49:22 -07:00
Thomas Willingham
671a10f5d4 More Diabook-dark touch-ups. Should *really* be useable this time...with editplain anyway. 2012-05-01 21:37:49 +01:00
Thomas Willingham
a5f78cf655 modified: images/smiley-thumbsup.gif 
Restored some yellow where there shouldn't have been transparency.

Probably introduced by me in the first place.
 2012-05-01 21:05:55 +01:00
tommy tomson
ab556857f0 diabook-themes: small fix at "community pages"-box 2012-05-01 16:46:08 +02:00
friendica
0ca4fa78c8 link socgraph to zrls 2012-05-01 01:34:47 -07:00
friendica
f8acb32961 Merge https://github.com/friendica/friendica into pull 2012-05-01 01:19:02 -07:00
friendica
584ac68ae4 adding zrl support to social graphs 2012-05-01 01:16:47 -07:00
Simon
facffe1745 Merge pull request #281 from simonlnu/master 
font and background adjustments
 2012-05-01 01:03:52 -07:00
Simon L'nu
6d3ba2825b lighten bg and darken font on dispy light 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-01 04:02:56 -04:00
Simon L'nu
5d6296b81b Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  hidden plugins (add .hidden file to dir)

* master:
 2012-05-01 04:02:17 -04:00
zottel
2e2bb5e8b0 Merge remote branch 'upstream/master' 2012-05-01 08:21:12 +02:00
friendica
f175af05f9 Merge https://github.com/friendica/friendica into pull 2012-04-30 23:08:31 -07:00
friendica
d48cd0f9a3 hidden plugins (add .hidden file to dir) 2012-04-30 23:07:52 -07:00
Simon
b8b0b3a87d Merge pull request #280 from simonlnu/master 
added a / for consistency's sake ;p
 2012-04-30 22:57:28 -07:00
Simon L'nu
e245ecddf2 sub-minor change to head.tpl 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-01 01:56:21 -04:00
Simon L'nu
46558e98a8 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  diabook-themes: add "community profiles"-box to right_column
  change api.php in function api_item_get_user to check if $usercache is NULL before checking an element in it
  make 'aaa joined group bbb' work from the initiating end, new privacy pref to control it also hidewall wasn't properly checked before sending 'xxx is friends with yyy' messages
  diabook-themes: add "last tweets"-box to right_aside, that searches for #friendica on twitter
  rev update
  start adding tooltips to tab menus
  fix join group notifications

* master:
 2012-05-01 00:49:42 -04:00
tommy tomson
2c577ed90f diabook-themes: add "community profiles"-box to right_column 2012-05-01 06:21:40 +02:00
friendica
25afec0f81 Merge pull request #279 from fermionic/generate-random-id-bug-in-statusnet-api 
Bug in StatusNet API
 2012-04-30 20:45:10 -07:00
Zach Prezkuta
a844093365 change api.php in function api_item_get_user to check if $usercache is NULL before checking an element in it 2012-04-30 20:51:22 -06:00
friendica
a3a55897e5 Merge https://github.com/friendica/friendica into pull 2012-04-30 19:04:28 -07:00