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

4685 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon L'nu a0ee51b3db Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  add "similar interrest", "Friend Suggestions" and "Invite Friends" to right_aside, fixes in css
  marking quattro-green as extension of quattro and deleting the tpl files
  minor css fixes in diabook
  screenshot for darkzero-NS, same as darkzero
  added quaddro templates to quaddro-green
  language issues in enotify
  small fix in diabook :: add local friendica to right_aside
  comix screenshot
  diabook: small fix in theme_info array
  more theme screenshots
  themes: use duepuntozero tpls as default

* master:
 2012-03-26 14:18:39 -04:00
tommy tomson 2d834d0f45 add "similar interrest", "Friend Suggestions" and "Invite Friends" to right_aside, fixes in css 2012-03-26 18:54:57 +02:00
Tobias Diekershoff f1d15d8884 Merge branch 'master' of https://github.com/friendica/friendica 2012-03-26 14:49:15 +02:00
Tobias Diekershoff 37f10a6d4f marking quattro-green as extension of quattro and deleting the tpl files 2012-03-26 14:48:01 +02:00
tommy tomson aaddee0d94 minor css fixes in diabook 2012-03-26 13:52:44 +02:00
friendica 0164da4fb9 screenshot for darkzero-NS, same as darkzero 2012-03-26 04:25:20 -07:00
Tobias Diekershoff 8ded404aaa added quaddro templates to quaddro-green 2012-03-26 11:28:38 +02:00
friendica 63fa5f6c77 Merge pull request #172 from fabrixxm/master 
Rearrange theme tpls
 2012-03-26 02:00:14 -07:00
friendica 3431d0b427 Merge branch 'pull' 2012-03-26 01:43:48 -07:00
friendica b240b8489a language issues in enotify 2012-03-26 01:43:26 -07:00
tommy tomson 876aa0c752 small fix in diabook :: add local friendica to right_aside 2012-03-26 10:33:28 +02:00
friendica ca31aed490 Merge branch 'pull' 2012-03-26 00:53:32 -07:00
friendica 2820dba1e7 comix screenshot 2012-03-26 00:52:54 -07:00
Fabio Comuni 579c4f3079 diabook: small fix in theme_info array 2012-03-26 09:48:38 +02:00
friendica 109e8d4f05 more theme screenshots 2012-03-26 00:47:52 -07:00
Simon 4b83b9bee6 Merge pull request #171 from simonlnu/master 
changes in contact_edit.tpl
 2012-03-26 00:41:22 -07:00
Simon L'nu 0c4aba4b57 [fix] contact_edit.tpl syntax; reduce cols to fit better 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-26 03:39:06 -04:00
Simon L'nu 7fad65d7af Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  add screenshots to diabook

* master:
 2012-03-26 03:38:19 -04:00
tommy tomson c4c69959e2 add screenshots to diabook 2012-03-26 09:37:14 +02:00
Fabio Comuni 51d419e159 themes: use duepuntozero tpls as default 2012-03-26 09:09:14 +02:00
Simon 5b3fe48ec6 Merge pull request #170 from simonlnu/master 
fix search box in dispys
 2012-03-26 00:02:51 -07:00
Simon L'nu 7de8e15ca4 fix the search box 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-26 03:01:13 -04:00
Simon L'nu 629a66793c Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  small fix
  don't include friend suggestions for people with the same name as current contacts. This will remove a lot of #whoaretonybaldwin.
  position the theme-preview on settings page
  more wordsmithing of the Friendica invitation email
  screenshot gallery
  theme preview for end users

* master:
 2012-03-26 02:51:40 -04:00
tommy tomson 37f02424f8 small fix 2012-03-26 07:02:27 +02:00
friendica 021c647673 don't include friend suggestions for people with the same name as current contacts. This will remove a lot of #whoaretonybaldwin. 2012-03-25 21:43:17 -07:00
friendica ba28362242 position the theme-preview on settings page 2012-03-25 21:12:10 -07:00
friendica 1e2e6f5ba9 more wordsmithing of the Friendica invitation email 2012-03-25 20:52:34 -07:00
friendica a06185e87c screenshot gallery 2012-03-25 20:08:28 -07:00
friendica be52ec6f5a Merge branch 'pull' 2012-03-25 19:48:17 -07:00
Simon L'nu 2147ffa487 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  typo datarry -> datarray

* master:
 2012-03-25 22:47:56 -04:00
Simon 7873347c65 Merge pull request #167 from unary/typo 
typo datarry -> datarray
 2012-03-25 19:47:39 -07:00
Simon 8ac59d81f3 Merge pull request #169 from simonlnu/master 
search box
 2012-03-25 19:46:59 -07:00
Simon L'nu 3d11c22b01 add in the search box 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-25 22:45:44 -04:00
Simon L'nu 758e1b7424 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  theme screenshots

* master:
 2012-03-25 22:40:24 -04:00
friendica c88674aaf2 theme preview for end users 2012-03-25 19:05:14 -07:00
friendica 7ab117fd31 Merge branch 'pull' 2012-03-25 18:19:58 -07:00
friendica 7ef1ed2d70 theme screenshots 2012-03-25 17:55:43 -07:00
Simon L'nu 3d62cb9782 minor fix to dispy theme.php 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-25 17:13:24 -04:00
Simon L'nu 739d903870 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:

* master:
 2012-03-25 17:07:43 -04:00
Simon e6b07d61cf Merge pull request #168 from simonlnu/master 
fix dispy-dark
 2012-03-25 14:07:33 -07:00
Simon L'nu aa33815d3c urgent fix to dispy-dark theme.php 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-25 17:06:38 -04:00
Simon L'nu 38b30c1d10 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  small fixes
  enotify plugin hook
  NOTIFY_SYSTEM

* master:
 2012-03-25 17:06:17 -04:00
Michael Johnston ca1e2254c9 typo datarry -> datarray 2012-03-25 16:00:11 -04:00
tommy tomson baeb735315 small fixes 2012-03-25 19:43:42 +02:00
friendica 873a55e918 enotify plugin hook 2012-03-25 05:06:11 -07:00
friendica 5bb7303408 NOTIFY_SYSTEM 2012-03-25 04:37:09 -07:00
Simon 2e797a6243 Merge pull request #166 from simonlnu/master 
fpostit; up versions to 1.0;
 2012-03-25 00:32:55 -07:00
Simon L'nu 2c43120129 dispy-dark not experimental. start implementing fpostit 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-25 03:22:16 -04:00
Simon L'nu 84686a2698 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  move community_pages to right_aside, fixes in css
  improved the inivitations and added a bit of sales pitch.

* master:
 2012-03-25 03:18:21 -04:00
tomtom84 1b8ac30fae Merge pull request #165 from tomtom84/master 
fixes in diabook-derivates
 2012-03-24 23:50:05 -07:00