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

6330 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
friendica f3e18df55d string update 2012-05-03 16:55:03 -07:00
friendica ff75dc4e40 Merge pull request #284 from fabrixxm/master 
validate_url() and validate_email() validate also IP address.
 2012-05-03 16:45:30 -07:00
friendica 6a5e5096db Merge pull request #286 from grossard/french_proofreading 
proofreading the mail templates in fr
 2012-05-03 14:01:06 -07:00
Ludovic Grossard 1f86205ee8 proofreading the mail templates in fr 
fixed typo, grammar, spelling…
 2012-05-03 22:35:59 +02:00
Simon cdb73f706f Merge pull request #285 from simonlnu/master 
dispy reworking, step 1
 2012-05-03 11:39:34 -07:00
Simon L'nu bb081e4bf5 forgot to move modernizr up. modernizr needs to be in <head>, like html5shiv (which it includes) 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-03 14:35:21 -04:00
Simon L'nu 1a13c56fef major reworking of dispy dark. light to follow 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-05-03 14:25:18 -04:00
Simon L'nu 4c8a82456e Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  diabook-theme: small fix
  Avoid tagging both '@Robert Johnson' and also '@Robert', when '@Robert Johnson' was already matched, and '@Robert' might be somebody different entirely.

* master:
 2012-05-03 14:18:40 -04:00
Fabio Comuni 52915c6e68 validate_url() and validate_email() validate also IP address. 2012-05-03 15:28:23 +02:00
zottel 35771a778d Merge remote branch 'upstream/master' 2012-05-03 10:21:38 +02:00
tommy tomson d72db2e1aa diabook-theme: small fix 2012-05-03 07:57:40 +02:00
friendica 2bfba93940 Merge https://github.com/friendica/friendica into pull 2012-05-02 22:38:17 -07:00
friendica e7ff35f27d Avoid tagging both '@Robert Johnson' and also '@Robert', when '@Robert Johnson' was already matched, and '@Robert' might be somebody different entirely. 2012-05-02 22:33:51 -07:00
Simon L'nu 0446766f04 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  diabook-theme: small fix
  diabook-theme: made boxes at right_aside sortable
  use cid rather than uid in perms
  Modify events_post() in mod/events.php to set the `private` field to true when an event is shared with specific people. This is necessary to have event posts show correctly in Diaspora if an event is created visible only to self, but modified later to be visible to others.
  use mysql replace on cache items
  fixing common friends
  rev update
  Moved Meta Viewport from global head.tpl to diabook's header

* master:
 2012-05-03 00:25:56 -04:00
tommy tomson ff2ddc319d diabook-theme: small fix 2012-05-03 06:25:23 +02:00
tommy tomson 3521e22333 diabook-theme: made boxes at right_aside sortable 2012-05-03 06:05:55 +02:00
friendica e7580b71e1 use cid rather than uid in perms 2012-05-02 21:00:39 -07:00
friendica 079d954765 Merge pull request #283 from fermionic/private-events-post-correctly-in-diaspora 
Fix private-events posts in Diaspora
 2012-05-02 20:49:51 -07:00
Zach Prezkuta 5d957c3803 Modify events_post() in mod/events.php to set the private field to true when an event is shared with specific people. This is necessary to have event posts show correctly in Diaspora if an event is created visible only to self, but modified later to be visible to others. 2012-05-02 21:12:57 -06:00
friendica 3ecde2d72f use mysql replace on cache items 2012-05-02 16:27:19 -07:00
friendica 8e1437ca8b fixing common friends 2012-05-02 16:15:59 -07:00
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