Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-10-30 06:44:41 +00:00
Code Issues Projects Releases Packages Wiki Activity
7538 commits 3 branches 64 tags 241 MiB
Commit graph

7538 commits

This branch
This branch
All branches
Author SHA1 Message Date
Simon L'nu
94d4cad701 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  string update
  [PRIVACY] privacy issue bug #314

* master:
 2012-03-06 18:15:45 -05:00
friendica
009a826a49 Merge branch 'pull' 2012-03-06 15:10:22 -08:00
friendica
a5e7c73e67 string update 2012-03-06 15:09:57 -08:00
tommy tomson
6a5c4bab9c messages-menu translation, add scroll-to-top and theme-bug-report in theme 2012-03-07 00:07:27 +01:00
Simon
886d825869 Merge pull request #98 from simonlnu/master 
missed some fixes on last request
 2012-03-06 15:04:50 -08:00
Simon L'nu
edd450cf06 dispy, dispy, oh what a little lispy 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-06 17:55:05 -05:00
friendica
21887a36fd [PRIVACY] privacy issue bug #314 2012-03-06 14:53:14 -08:00
Simon L'nu
0badf3110f Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  bugs #312, #313
  revup

* master:
 2012-03-06 17:52:12 -05:00
friendica
8fb0ea4048 bugs #312, #313 2012-03-06 14:27:53 -08:00
friendica
4e0524e91a Merge branch 'pull' 2012-03-06 13:58:26 -08:00
friendica
731b19c025 revup 2012-03-06 13:57:38 -08:00
Simon
073241a77a Merge pull request #95 from simonlnu/master 
styling fixes in dispy; typos fixed in settings.tpl
 2012-03-06 13:20:20 -08:00
Simon L'nu
bc8b014906 styling fixes in dispy. fix typos in settings.tpl 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-06 16:18:26 -05:00
Thomas
67456bad06 Fixed...merged with mainline THEN added beards. 2012-03-06 20:50:38 +00:00
Thomas
a265afe7eb added beard smileys 2012-03-06 20:44:53 +00:00
Simon L'nu
d647dbc6af Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  remove "smilie" expansion for Diaspora logo
  prevent duplicate likes
  quattro: theme settings (a bit hackish)
  add img
  fixes in diabook
  finalise spam storage model, begin driver changes.
  fixes
  template proc: add variable filters

* master:
 2012-03-06 14:51:14 -05:00
Thomas
7e10401ec0 doc/Account-Basics.md 2012-03-06 19:15:40 +00:00
Thomas
bab865b14e doc/Account-Basics.md 2012-03-06 19:15:24 +00:00
Thomas
aed5a8e2e5 a 2012-03-06 19:11:24 +00:00
Thomas
6720c83a4a doc/Remove-Account.md 2012-03-06 19:07:15 +00:00
Thomas
2772bb7f58 doc/Making-Friends.md 2012-03-06 19:04:42 +00:00
Thomas
ec1740cd40 doc/Bugs-and-Issues.md 2012-03-06 18:55:45 +00:00
Thomas
1bf9f3823c doc/Account-Basics.md 2012-03-06 18:48:39 +00:00
fabrixxm
a9690dfe2d Merge pull request #93 from fabrixxm/master 
quattro: theme settings
 2012-03-06 05:09:03 -08:00
friendica
eec4cff84b remove "smilie" expansion for Diaspora logo 2012-03-06 04:28:45 -08:00
friendica
23718bfc25 prevent duplicate likes 2012-03-06 02:17:55 -08:00
friendica
c0e0034f06 Merge branch 'pull' 2012-03-06 01:04:16 -08:00
Fabio Comuni
607ee1ff9c quattro: theme settings (a bit hackish) 2012-03-06 09:50:18 +01:00
Fabio Comuni
be9985a3ae Merge remote-tracking branch 'friendica/master' 2012-03-06 09:48:08 +01:00
tomtom84
d04fba7048 Merge pull request #92 from tomtom84/master 
fixes in theme diabbook
 2012-03-05 23:34:24 -08:00
tommy tomson
8b0dd349f5 add img 2012-03-06 08:31:54 +01:00
tommy tomson
eaaf030c18 Merge remote-tracking branch 'origin/master' 2012-03-06 08:28:21 +01:00
tommy tomson
b64b1d13a4 fixes in diabook 2012-03-06 08:27:20 +01:00
friendica
3da97e2393 finalise spam storage model, begin driver changes. 2012-03-05 23:20:42 -08:00
Simon L'nu
2a3aaca88d Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  some admin page fixes and cleanup
  changed bg color around comment box from white to match page background, improved contrast on comment preview (darkzero)
  string update
  some testbubble stuff
  can_write_wall documentation

* master:
 2012-03-05 23:36:22 -05:00
friendica
321b651635 Merge branch 'pull' 2012-03-05 18:52:15 -08:00
friendica
23460302f5 some admin page fixes and cleanup 2012-03-05 18:51:21 -08:00
Simon
d49dc1434f Merge pull request #91 from unary/darkzero 
changed bg color around comment box from white to match page background,...
 2012-03-05 18:21:15 -08:00
Michael Johnston
9f44dbbb48 changed bg color around comment box from white to match page background, improved contrast on comment preview (darkzero) 2012-03-05 21:10:01 -05:00
friendica
8473444242 string update 2012-03-05 16:43:44 -08:00
friendica
e5de03040e Merge branch 'pull' 2012-03-05 15:59:28 -08:00
friendica
7b3349f38a some testbubble stuff 2012-03-05 15:58:26 -08:00
Simon
b6765ad742 Merge pull request #90 from simonlnu/master 
field_help tweak
 2012-03-05 15:19:02 -08:00
Simon L'nu
1aa2367469 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:

* master:
 2012-03-05 18:18:04 -05:00
Simon L'nu
190650060a forgot a small change in .field_help 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-05 18:16:51 -05:00
friendica
c47bae7a5f Merge branch 'pull' 2012-03-05 15:05:09 -08:00
friendica
c37ffd2999 can_write_wall documentation 2012-03-05 15:04:43 -08:00
Simon
4b456e2273 Merge pull request #89 from simonlnu/master 
implement more changes
 2012-03-05 14:57:51 -08:00
Simon L'nu
50824bddd0 implement more of the changes requested 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-05 17:57:04 -05:00
Simon L'nu
6a0729d5a4 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  revup

* master:
 2012-03-05 17:56:38 -05:00