keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
6709 commits 4 branches 0 tags 179 MiB
Commit graph

6709 commits

This branch
This branch
All branches
Author SHA1 Message Date
friendica
269bb75a14 Merge https://github.com/friendica/friendica into pull 2012-09-13 17:00:47 -07:00
friendica
d19a3b8324 provide separate hashtag and mentions for themes in addition to composite tags 2012-09-13 16:59:25 -07:00
friendica
aa37b0cb0f rev update 2012-09-13 16:58:06 -07:00
Thomas Willingham
1957aa8f0d Merge branch 'master' of https://github.com/friendica/friendica 2012-09-13 20:52:06 +01:00
Thomas Willingham
4b8f3a4194 Friendicaland 2012-09-13 20:51:34 +01:00
Thomas Willingham
290da6c845 Merge pull request #469 from pixelroot/master 
Theme Smoothly
 2012-09-13 07:59:16 -07:00
pixelroot
0cc661dd9c modified: view/theme/smoothly/style.css 2012-09-13 16:50:55 +02:00
pixelroot
664680cdd8 modified: view/theme/smoothly/style.css 2012-09-13 16:30:12 +02:00
friendica
d3699498ac Merge pull request #468 from pixelroot/master 
Theme Smoothly
 2012-09-13 03:50:55 -07:00
pixelroot
a1ed9c72c2 modified: view/theme/smoothly/star.png 
modified:   view/theme/smoothly/theme.php
 2012-09-13 11:41:14 +02:00
pixelroot
2b9c2b2d1d modified: view/theme/smoothly/style.css 2012-09-13 09:54:27 +02:00
pixelroot
931e1c6c66 modified: view/theme/smoothly/style.css 2012-09-13 09:48:02 +02:00
pixelroot
16e35d1787 new file: view/theme/smoothly/message_side.tpl 2012-09-13 09:35:12 +02:00
pixelroot
4ba7ce0308 modified: view/theme/smoothly/peoplefind.tpl 
modified:   view/theme/smoothly/style.css
 2012-09-13 09:34:50 +02:00
fermionic
b7592fd584 Merge pull request #467 from fermionic/frost-mobile-toggle-mobile 
add mobile toggle to frost mobile
 2012-09-12 20:38:10 -07:00
Zach Prezkuta
e8acdb31bc add mobile toggle to frost mobile 2012-09-12 21:35:51 -06:00
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
tobiasd
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
Tobias Diekershoff
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
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