friendica
|
3ea5001bb0
|
allow events to be ignored
|
2012-09-12 19:35:28 -07:00 |
|
friendica
|
f4e3f335ef
|
don't allow followers to get a post through unless it's a tag deliver
|
2012-09-12 18:53:20 -07:00 |
|
friendica
|
3d6c49d5b3
|
Merge https://github.com/friendica/friendica into pull
|
2012-09-12 17:20:52 -07:00 |
|
friendica
|
db09724aec
|
use local photo for tag notifications if available
|
2012-09-12 17:19:26 -07:00 |
|
friendica
|
3b8eb5d66b
|
rev update
|
2012-09-12 17:18:10 -07:00 |
|
Thomas Willingham
|
ae0b830b7c
|
Couple of spare smiley images removed.
Should have been deleted when these got moved to smiley_pack
|
2012-09-12 22:12:08 +01:00 |
|
pixelroot
|
864e2c03d9
|
modified: view/theme/smoothly/style.css
|
2012-09-12 17:25:44 +02:00 |
|
pixelroot
|
e3d20b51c8
|
modified: view/theme/smoothly/style.css
|
2012-09-12 16:27:31 +02:00 |
|
pixelroot
|
a3add1d851
|
modified: view/theme/smoothly/profile_vcard.tpl
modified: view/theme/smoothly/style.css
|
2012-09-12 16:20:44 +02:00 |
|
|
|
250c615058
|
Merge pull request #466 from pixelroot/master
Theme Smoothly
|
2012-09-12 07:02:40 -07:00 |
|
pixelroot
|
77aee41280
|
modified: view/theme/smoothly/style.css
|
2012-09-12 15:49:18 +02:00 |
|
pixelroot
|
a283d6844c
|
modified: view/theme/smoothly/theme.php
|
2012-09-12 14:44:42 +02:00 |
|
pixelroot
|
207451d82d
|
modified: view/theme/smoothly/style.css
|
2012-09-12 14:42:10 +02:00 |
|
Domovoy
|
039129418d
|
Merge pull request #465 from CyberDomovoy/Imagick
Fallback to gd if Imagick can't load the data
|
2012-09-12 03:00:29 -07:00 |
|
Domovoy
|
67563d5c82
|
Fallback to gd if Imagick can't load the data
|
2012-09-12 11:55:09 +02:00 |
|
friendica
|
ec1abfda46
|
Merge https://github.com/friendica/friendica into pull
|
2012-09-11 18:57:40 -07:00 |
|
friendica
|
a8d12061ca
|
rev update + multiple profile photos
|
2012-09-11 18:56:38 -07:00 |
|
fermionic
|
984274659d
|
Merge pull request #464 from pixelroot/master
theme smoothly
|
2012-09-11 07:27:19 -07:00 |
|
pixelroot
|
5ae445b1ff
|
new file: view/theme/smoothly/generic_links_widget.tpl
modified: view/theme/smoothly/style.css
|
2012-09-11 15:23:49 +02:00 |
|
pixelroot
|
4cc4404752
|
new file: view/theme/smoothly/arrow.png
new file: view/theme/smoothly/categories_widget.tpl
modified: view/theme/smoothly/style.css
|
2012-09-11 14:02:36 +02:00 |
|
pixelroot
|
30a9db78f5
|
modified: view/theme/smoothly/style.css
|
2012-09-11 11:25:01 +02:00 |
|
pixelroot
|
5f7f1fb7b1
|
modified: view/theme/smoothly/nav.tpl
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
new file: view/theme/smoothly/totop.png
|
2012-09-11 11:06:55 +02:00 |
|
|
|
36bd5286f2
|
DE: update to the strings
|
2012-09-11 09:19:11 +02:00 |
|
friendica
|
fa65db9aa1
|
bring back comment edit buttons
|
2012-09-10 18:06:18 -07:00 |
|
friendica
|
23770896c1
|
Merge https://github.com/friendica/friendica into pull
|
2012-09-10 16:20:35 -07:00 |
|
friendica
|
ad872845cd
|
rev update
|
2012-09-10 16:19:34 -07:00 |
|
friendica
|
4b7c6329e9
|
Merge pull request #462 from CyberDomovoy/threaded_items
Threaded items, objects
|
2012-09-10 16:19:13 -07:00 |
|
Michael Vogel
|
5cfb068c25
|
Merge remote branch 'upstream/master'
|
2012-09-10 23:28:07 +02:00 |
|
fermionic
|
9e9765a89f
|
Merge pull request #463 from pixelroot/master
Version 0.5
|
2012-09-10 08:08:24 -07:00 |
|
pixelroot
|
9685ba3fbc
|
modified: view/theme/smoothly/style.css
|
2012-09-10 16:31:36 +02:00 |
|
pixelroot
|
ee20708f75
|
modified: view/theme/smoothly/style.css
|
2012-09-10 16:21:54 +02:00 |
|
pixelroot
|
b5dee575a8
|
modified: style.css
|
2012-09-10 15:38:44 +02:00 |
|
pixelroot
|
e51440ec98
|
modified: view/theme/smoothly/style.css
|
2012-09-10 15:19:43 +02:00 |
|
pixelroot
|
264f32db80
|
modified: view/theme/smoothly/style.css
|
2012-09-10 14:58:57 +02:00 |
|
pixelroot
|
aef0824cc8
|
modified: view/theme/smoothly/style.css
|
2012-09-10 14:52:47 +02:00 |
|
pixelroot
|
c059f92b5a
|
modified: view/theme/smoothly/style.css
|
2012-09-10 14:36:51 +02:00 |
|
pixelroot
|
7603e2de75
|
deleted: view/theme/smoothly/comment_item.tpl
deleted: view/theme/smoothly/moderated_comment.tpl
modified: view/theme/smoothly/style.css
|
2012-09-10 14:18:24 +02:00 |
|
pixelroot
|
e492664325
|
new file: view/theme/smoothly/follow.tpl
new file: view/theme/smoothly/peoplefind.tpl
modified: view/theme/smoothly/style.css
|
2012-09-10 12:30:34 +02:00 |
|
pixelroot
|
f96b91c254
|
modified: view/theme/smoothly/style.css
|
2012-09-10 11:01:43 +02:00 |
|
Domovoy
|
16eec24a21
|
Tabs trouble? What happened? I sure aven't changed anything to my editor...
|
2012-09-10 10:36:30 +02:00 |
|
Domovoy
|
51bcd862d7
|
Port friendica/friendica#1478229abc6c5adc265559b5489cc2eb23358994
|
2012-09-10 10:14:30 +02:00 |
|
Domovoy
|
7bef3023a8
|
Port friendica/friendica#4cd8233f61647d805383f5786052ef034cebf4e1
|
2012-09-10 09:57:34 +02:00 |
|
Domovoy
|
1b82df60db
|
Port friendica/friendica#79012bf8882baa6843726bcffbcafe959028c1bd
|
2012-09-10 09:50:30 +02:00 |
|
Domovoy
|
bb68461c6d
|
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
Conflicts:
include/conversation.php
|
2012-09-10 09:19:08 +02:00 |
|
friendica
|
0d9ffd07c2
|
remove mobile file
|
2012-09-10 00:15:01 -07:00 |
|
friendica
|
ee9ba384b1
|
Merge https://github.com/friendica/friendica into pull
|
2012-09-09 15:36:49 -07:00 |
|
friendica
|
0790af15fa
|
rev update + bug 477 'Romania' misspelled
|
2012-09-09 15:35:33 -07:00 |
|
|
|
656604a5ff
|
DE: getting the strings back to 100%
|
2012-09-09 18:31:15 +02:00 |
|
Thomas Willingham
|
1b70cdbdc7
|
Romania typo.
|
2012-09-09 15:08:09 +01:00 |
|
|
|
63ab82d3dd
|
frost-mobile: was missing infront of the nav-images
|
2012-09-09 13:26:15 +02:00 |
|
