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
tommy tomson
329a26d62e
move community_pages to right_aside, fixes in css
2012-03-25 08:47:17 +02:00
friendica
ea29a26059
Merge branch 'pull'
2012-03-24 23:05:33 -07:00
friendica
6780b76b0c
improved the inivitations and added a bit of sales pitch.
2012-03-24 23:04:18 -07:00
Simon L'nu
1d56224b08
increase version to 1.0 for dispys \o/
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-25 01:12:28 -04:00
Simon
f0b08290fc
Merge pull request #164 from simonlnu/master
...
implement filer/file-as
2012-03-24 22:04:23 -07:00
Simon L'nu
8fe77e5b86
implement filer/file-as
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-25 01:01:59 -04:00
Simon L'nu
5bd4f62210
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
bug #329 - compress the plugin list on the friendica info page
bug #346 - add oembed maxwidth to oembed request
* master:
2012-03-25 00:59:25 -04:00
friendica
f1cb287742
bug #329 - compress the plugin list on the friendica info page
2012-03-24 21:50:04 -07:00
friendica
d06ddeb1cc
bug #346 - add oembed maxwidth to oembed request
2012-03-24 21:26:50 -07:00
Simon L'nu
8a6c407282
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
prevent duplicate friend suggestions
block filed items from deletion
add the bang
network filter is now a permission group
small fix in css
add right_aside to diabook-blue
add connectable services to right_aside
add PostIt to right_aside, fixes in css
* master:
2012-03-24 19:38:54 -04:00
friendica
3ae43c2448
prevent duplicate friend suggestions
2012-03-24 15:53:53 -07:00
friendica
3aacc119a1
block filed items from deletion
2012-03-24 04:16:27 -07:00
friendica
8c4fbc3b4d
add the bang
2012-03-24 03:11:45 -07:00
friendica
72c2386edf
Merge branch 'pull'
2012-03-24 02:32:15 -07:00
friendica
db5ec58863
network filter is now a permission group
2012-03-24 01:33:50 -07:00
tommy tomson
8451b22d42
small fix in css
2012-03-24 08:56:26 +01:00
tomtom84
b23ad806ec
Merge pull request #163 from tomtom84/master
...
fixes in diabook-derivates
2012-03-24 00:15:31 -07:00
