friendica
a29842e301
Merge https://github.com/annando/friendica into annando
...
Conflicts:
view/admin_site.tpl
2012-12-22 23:02:21 -08:00
Zach Prezkuta
96ed0a7791
Implement Smarty3
2012-12-22 12:57:29 -07:00
Michael Vogel
34128925dc
"vier": Now the search results containing a link to the original thread
2012-12-21 15:03:22 +01:00
Michael Vogel
61b51d40e7
Vier: disabling the "community" works now
2012-12-21 13:13:22 +01:00
Michael Vogel
d7073f7884
Vier: All optical glitches should be removed now.
2012-12-21 13:02:39 +01:00
Michael Vogel
293a794973
"vier": More icons replaced
2012-12-21 03:53:07 +01:00
Michael Vogel
7c7d3fe5de
"share" - now the attribut value for the "author" is escaped
2012-12-21 02:10:26 +01:00
Michael Vogel
f4bc5c57f3
New option to enable and disable the "share" element
...
Changes to "vier" to use more "font awesome" icons
2012-12-21 00:08:58 +01:00
Michael Vogel
8e194cb411
Vier: switching some more icons to "font awesome"
2012-12-20 12:13:37 +01:00
friendica
898f68938a
Merge pull request #546 from annando/master
...
Bugfix in mail import - use of the "share" element in ostatus and diaspora items
2012-12-19 22:54:53 -08:00
Michael Vogel
a8aa992102
Vier: Design issues with preview fixed
2012-12-20 04:19:02 +01:00
Michael Vogel
330960f8f7
Vier: Now there are buttons for inserting bbcode elements in the comments
2012-12-20 03:33:36 +01:00
Olaf Conradi
d9d7eb89ed
Fix alignment of photo menu
...
Remove duplicate definitions
Align menu button to be exactly the same width as the photo
2012-12-19 19:15:39 +01:00
Olaf Conradi
ee5d2acd42
Fix alignment of location
2012-12-19 19:04:18 +01:00
Olaf Conradi
98c5b6e73b
Text box alignment in Smoothly theme
...
Make sure comment text boxes stay within their surrounding box.
2012-12-19 18:27:50 +01:00
Michael Vogel
a86baa372a
Mailimport is now realized like a wall-to-wall-post
2012-12-19 15:58:38 +01:00
Michael Vogel
c22f65bafa
repeated items from ostatus and diaspora are now using the share-element.
...
Some design changes to repeated items in "vier".
2012-12-19 12:18:52 +01:00
Michael Vogel
4164257cb2
vier: The alt-pager and the birthday- and eventreminder is optically improved
2012-12-17 21:12:11 +01:00
Michael Vogel
9c0de28622
bbcode: New element "share" for shared content
...
mail: Now mails connected via subject line if there isn't an appropriate header.
vier: Improvents to the theme so that shared messages are looking fine
2012-12-17 03:01:40 +01:00
Michael Vogel
d253d59668
vier: Added Delegations and optical changes.
2012-12-15 14:39:37 +01:00
Michael Vogel
a61ac769a0
vier: Expanding and collapsing now works
2012-12-15 11:25:52 +01:00
Michael Vogel
5635fe250c
Merge remote-tracking branch 'upstream/master'
2012-12-03 08:30:49 +01:00
Michael Vogel
d548d1943f
vier: maximum width of comments defined
2012-12-03 08:29:41 +01:00
Thomas Willingham
785fa1e070
Remove unsupported tag from Darkzero-NS since I have been supporting it.
2012-11-29 02:33:11 +00:00
Thomas Willingham
512729073b
Unmark Diabook experimental
2012-11-27 17:14:13 +00:00
Thomas Willingham
7de455602c
Revert Diabook.
2012-11-27 16:28:12 +00:00
Thomas Willingham
95322ff5f4
Diabook - of all the things to miss...wall-item-content.
2012-11-26 05:49:13 +00:00
Thomas Willingham
fa5d25ec7a
Diabook - better 1024 resolution support.
2012-11-26 04:38:19 +00:00
Thomas Willingham
b0b4baa331
Diabook - kill wall_thread, remove need for wide variants, fix live updates, add todo list.
2012-11-26 02:11:19 +00:00
Michael Vogel
88f5865738
Vier: Maximum with for content area
2012-11-23 12:15:03 +01:00
friendica
226d1ba7c1
Merge pull request #537 from fermionic/20121121-features
...
Port Features from Red
2012-11-22 20:54:16 -08:00
Zach Prezkuta
94204d9160
implement features
2012-11-22 09:14:22 -07:00
Michael Vogel
e36c30d285
Vier: Margin problems with code fixed.
2012-11-22 15:06:15 +01:00
Thomas Willingham
7139e60b94
Diabook - fix wall-to-wall posts
2012-11-19 15:58:50 +00:00
Thomas Willingham
1a5d4f91cd
Diabook red. All that's left to do now is...all sorts of other things.
2012-11-18 23:30:48 +00:00
Thomas Willingham
f644cbb30b
Diabook pink
2012-11-18 22:52:44 +00:00
Thomas Willingham
a7982caf71
Diabook - should probably add *all* the files...
2012-11-18 22:06:53 +00:00
Thomas Willingham
96633cb0e5
Diabook - kill thousands more lines. Two more to go then we can start on the bugs...
2012-11-18 22:06:02 +00:00
Thomas Willingham
589f3603ae
Diabook - grep replace missed this
2012-11-18 21:27:02 +00:00
Michael Vogel
c0376339e0
Merge remote-tracking branch 'upstream/master'
2012-11-17 14:29:09 +01:00
Michael Vogel
f17377e6de
New cache system with subdirectories
2012-11-17 00:50:39 +01:00
Thomas Willingham
3f9eef1ef6
Diabook - some more heavy lifting.
2012-11-16 22:29:39 +00:00
Thomas Willingham
c12a27c73c
More diabook...
2012-11-16 02:49:05 +00:00
Thomas Willingham
da2aabd61d
Diabook - couple of fixes.
2012-11-16 01:58:28 +00:00
Thomas Willingham
bb86214698
Add the event/birthday thing from Andreas.
2012-11-16 01:44:09 +00:00
Thomas Willingham
da1b4939f0
Merge branch 'master' of https://github.com/friendica/friendica
2012-11-16 00:37:53 +00:00
Thomas Willingham
b19c832381
Diabook. Get the paths right. There seems to be something in the PHP putting us in unexpected directories...but it works now.
2012-11-16 00:36:52 +00:00
Thomas Willingham
09150cb5dc
Diabook - some heavy lifting. Lots more still to do.
2012-11-15 23:54:13 +00:00
Michael Vogel
e67062d9cf
Merge remote-tracking branch 'upstream/master'
2012-11-15 21:52:35 +01:00
Michael Vogel
fce18fd223
Vier: New Icon set
2012-11-15 21:47:36 +01:00
