]> git.mxchange.org Git - friendica.git/log
friendica.git
12 years agopass "ago" information to the mail_list template
Tobias Diekershoff [Mon, 27 Aug 2012 17:31:41 +0000 (19:31 +0200)]
pass "ago" information to the mail_list template

12 years agoquattro: expanded the new prvmessage field a bit
Tobias Diekershoff [Mon, 27 Aug 2012 06:13:07 +0000 (08:13 +0200)]
quattro: expanded the new prvmessage field a bit

12 years agoMerge pull request #446 from fermionic/frost-scrollbars-are-annoying
fermionic [Sun, 26 Aug 2012 15:32:52 +0000 (08:32 -0700)]
Merge pull request #446 from fermionic/frost-scrollbars-are-annoying

Frost scrollbars are annoying

12 years agoremove show more/less from frost mobile--it is too great a load
Zach Prezkuta [Sun, 26 Aug 2012 15:31:37 +0000 (09:31 -0600)]
remove show more/less from frost mobile--it is too great a load

12 years agoremove show more/less animation on mobile
Zach Prezkuta [Sun, 26 Aug 2012 15:22:49 +0000 (09:22 -0600)]
remove show more/less animation on mobile

12 years agoMerge pull request #445 from fermionic/frost-scrollbars-are-annoying
fermionic [Sun, 26 Aug 2012 04:45:52 +0000 (21:45 -0700)]
Merge pull request #445 from fermionic/frost-scrollbars-are-annoying

Frost scrollbars are annoying

12 years agoupdate version
Zach Prezkuta [Sun, 26 Aug 2012 04:43:32 +0000 (22:43 -0600)]
update version

12 years agotry to get rid of scrollbars in Frost
Zach Prezkuta [Sun, 26 Aug 2012 04:41:22 +0000 (22:41 -0600)]
try to get rid of scrollbars in Frost

12 years agoMerge pull request #444 from fermionic/frost-notifications-sometimes-dont-show
fermionic [Sat, 25 Aug 2012 16:10:01 +0000 (09:10 -0700)]
Merge pull request #444 from fermionic/frost-notifications-sometimes-dont-show

restore nav element to login pages, since system messages are sent in it

12 years agorestore nav element to login pages, since system messages are sent in it
Zach Prezkuta [Sat, 25 Aug 2012 16:08:25 +0000 (10:08 -0600)]
restore nav element to login pages, since system messages are sent in it

12 years agoMerge pull request #442 from fermionic/frost-image-upload-and-post-local-time
fermionic [Sat, 25 Aug 2012 03:30:27 +0000 (20:30 -0700)]
Merge pull request #442 from fermionic/frost-image-upload-and-post-local-time

fix image and file upload on frost moble; add support to frost for local...

12 years agofix image and file upload on frost moble; add support to frost for local post time
Zach Prezkuta [Sat, 25 Aug 2012 03:25:39 +0000 (21:25 -0600)]
fix image and file upload on frost moble; add support to frost for local post time

12 years agohandle Windows proc_run
friendica [Thu, 23 Aug 2012 23:36:13 +0000 (16:36 -0700)]
handle Windows proc_run

12 years agorev update
friendica [Thu, 23 Aug 2012 23:35:40 +0000 (16:35 -0700)]
rev update

12 years agomoods
friendica [Thu, 23 Aug 2012 04:36:55 +0000 (21:36 -0700)]
moods

12 years agorev update
friendica [Thu, 23 Aug 2012 03:39:36 +0000 (20:39 -0700)]
rev update

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Wed, 22 Aug 2012 02:42:37 +0000 (19:42 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agorestore old comment behaviour when threading turned off
friendica [Wed, 22 Aug 2012 02:41:50 +0000 (19:41 -0700)]
restore old comment behaviour when threading turned off

12 years agorev update
friendica [Wed, 22 Aug 2012 02:40:28 +0000 (19:40 -0700)]
rev update

12 years agoDE more updates to the strings
Tobias Diekershoff [Tue, 21 Aug 2012 06:23:47 +0000 (08:23 +0200)]
DE more updates to the strings

12 years agorev update
friendica [Tue, 21 Aug 2012 04:36:04 +0000 (21:36 -0700)]
rev update

12 years agoQuattro: added localtime timestamp title to entries
Tobias Diekershoff [Mon, 20 Aug 2012 09:20:49 +0000 (11:20 +0200)]
Quattro: added localtime timestamp title to entries

12 years agoDE strings update
Tobias Diekershoff [Mon, 20 Aug 2012 09:12:40 +0000 (11:12 +0200)]
DE strings update

12 years agoput the real post time into the post
friendica [Sun, 19 Aug 2012 21:39:43 +0000 (14:39 -0700)]
put the real post time into the post

12 years agoalgorithm for crypt tag
friendica [Sun, 19 Aug 2012 07:35:39 +0000 (00:35 -0700)]
algorithm for crypt tag

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Sat, 18 Aug 2012 22:18:02 +0000 (15:18 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agorev update
friendica [Sat, 18 Aug 2012 22:17:07 +0000 (15:17 -0700)]
rev update

12 years agoMerge pull request #441 from fermionic/frost-permission-denied-login-style-wrong
friendica [Sat, 18 Aug 2012 22:16:43 +0000 (15:16 -0700)]
Merge pull request #441 from fermionic/frost-permission-denied-login-style-wrong

include login style when necessary

12 years agoMerge pull request #440 from fermionic/blank-screen-at-install-end
friendica [Sat, 18 Aug 2012 22:16:07 +0000 (15:16 -0700)]
Merge pull request #440 from fermionic/blank-screen-at-install-end

template was loaded in the wrong place

12 years agoinclude login style when necessary
Zach Prezkuta [Sat, 18 Aug 2012 20:47:59 +0000 (14:47 -0600)]
include login style when necessary

12 years agotemplate was loaded in the wrong place
Zach Prezkuta [Sat, 18 Aug 2012 19:28:49 +0000 (13:28 -0600)]
template was loaded in the wrong place

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Sat, 18 Aug 2012 05:07:12 +0000 (22:07 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agowall-to-wall posts not identified correctly after thread mod
friendica [Sat, 18 Aug 2012 05:06:13 +0000 (22:06 -0700)]
wall-to-wall posts not identified correctly after thread mod

12 years agorev update
friendica [Sat, 18 Aug 2012 05:05:42 +0000 (22:05 -0700)]
rev update

12 years agoMerge pull request #439 from fermionic/frost-fix-archive-widget
fermionic [Fri, 17 Aug 2012 03:52:50 +0000 (20:52 -0700)]
Merge pull request #439 from fermionic/frost-fix-archive-widget

another javascript that needed $ --> $j

12 years agoanother javascript
Zach Prezkuta [Fri, 17 Aug 2012 03:51:36 +0000 (21:51 -0600)]
another javascript

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Thu, 16 Aug 2012 22:24:57 +0000 (15:24 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agorev update
friendica [Thu, 16 Aug 2012 22:24:02 +0000 (15:24 -0700)]
rev update

12 years agoMerge branch 'master' of https://github.com/friendica/friendica
Thomas Willingham [Thu, 16 Aug 2012 17:22:20 +0000 (18:22 +0100)]
Merge branch 'master' of https://github.com/friendica/friendica

12 years agoMake Vier threaded comments not broken.
Thomas Willingham [Thu, 16 Aug 2012 17:21:33 +0000 (18:21 +0100)]
Make Vier threaded comments not broken.

These should be inherited from Quattro really, but aren't.

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Thu, 16 Aug 2012 00:16:24 +0000 (17:16 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agoput a variant of the parent_uri into email notification message-ids. Current message...
friendica [Thu, 16 Aug 2012 00:14:29 +0000 (17:14 -0700)]
put a variant of the parent_uri into email notification message-ids. Current message-ids aren't completel legal. More work to do.

12 years agorev update
friendica [Thu, 16 Aug 2012 00:12:58 +0000 (17:12 -0700)]
rev update

12 years agoRemove Facebook from newmember text.
Thomas Willingham [Wed, 15 Aug 2012 21:26:44 +0000 (22:26 +0100)]
Remove Facebook from newmember text.

12 years agoFriendicaland
Thomas Willingham [Wed, 15 Aug 2012 21:21:20 +0000 (22:21 +0100)]
Friendicaland

12 years agoRemove Facebook from the quick start, since Facebook had done a Twitter.
Thomas Willingham [Wed, 15 Aug 2012 21:17:49 +0000 (22:17 +0100)]
Remove Facebook from the quick start, since Facebook had done a Twitter.

12 years agoMerge pull request #438 from fermionic/frost-admin-updates-for-mobile-selection
fermionic [Wed, 15 Aug 2012 15:03:30 +0000 (08:03 -0700)]
Merge pull request #438 from fermionic/frost-admin-updates-for-mobile-selection

admin page selector for mobile theme

12 years agoadmin page selector for mobile theme
Zach Prezkuta [Wed, 15 Aug 2012 14:54:30 +0000 (08:54 -0600)]
admin page selector for mobile theme

12 years agofix single quotes
friendica [Wed, 15 Aug 2012 12:09:44 +0000 (05:09 -0700)]
fix single quotes

12 years agobbcode quote display
friendica [Wed, 15 Aug 2012 11:52:18 +0000 (04:52 -0700)]
bbcode quote display

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Wed, 15 Aug 2012 10:01:23 +0000 (03:01 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agoextra email enotify logging to help convince dreamhost that they've got breakage...
friendica [Wed, 15 Aug 2012 09:59:17 +0000 (02:59 -0700)]
extra email enotify logging to help convince dreamhost that they've got breakage in one of their queues.

12 years agoadd selector for mobile theme to admin panel
Tobias Diekershoff [Wed, 15 Aug 2012 08:16:42 +0000 (10:16 +0200)]
add selector for mobile theme to admin panel

12 years agolets mark mobile themes similar to experimental ones
Tobias Diekershoff [Wed, 15 Aug 2012 08:15:21 +0000 (10:15 +0200)]
lets mark mobile themes similar to experimental ones

12 years agocorrect the invocation for htmlspecialchars to handle quote display issues with editp...
friendica [Wed, 15 Aug 2012 07:02:15 +0000 (00:02 -0700)]
correct the invocation for htmlspecialchars to handle quote display issues with editplain and reshare

12 years agoMerge pull request #437 from fermionic/themes-update-for-threading
friendica [Wed, 15 Aug 2012 02:15:24 +0000 (19:15 -0700)]
Merge pull request #437 from fermionic/themes-update-for-threading

basic updates for Dispy and Diabook to try to make them at least not bro...

12 years agomissed something again
Zach Prezkuta [Wed, 15 Aug 2012 01:54:22 +0000 (19:54 -0600)]
missed something again

12 years agobasic updates for Dispy and Diabook to try to make them at least not broken with...
Zach Prezkuta [Wed, 15 Aug 2012 01:42:07 +0000 (19:42 -0600)]
basic updates for Dispy and Diabook to try to make them at least not broken with threading updates

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Tue, 14 Aug 2012 22:22:45 +0000 (15:22 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agorev update
friendica [Tue, 14 Aug 2012 22:21:54 +0000 (15:21 -0700)]
rev update

12 years agoMerge branch 'master' of https://github.com/friendica/friendica
Tobias Diekershoff [Tue, 14 Aug 2012 10:38:06 +0000 (12:38 +0200)]
Merge branch 'master' of https://github.com/friendica/friendica

12 years agoDE some updates to the translation
Tobias Diekershoff [Tue, 14 Aug 2012 10:37:32 +0000 (12:37 +0200)]
DE some updates to the translation

12 years agopartial fix for D* public key format change
friendica [Tue, 14 Aug 2012 09:20:48 +0000 (02:20 -0700)]
partial fix for D* public key format change

12 years agorev update
friendica [Mon, 13 Aug 2012 23:46:24 +0000 (16:46 -0700)]
rev update

12 years agoMerge pull request #436 from fermionic/api-mark-timeline-read
friendica [Mon, 13 Aug 2012 02:59:21 +0000 (19:59 -0700)]
Merge pull request #436 from fermionic/api-mark-timeline-read

update items seen in DB when using API

12 years agoupdate items seen in DB when using API
Zach Prezkuta [Mon, 13 Aug 2012 02:29:37 +0000 (20:29 -0600)]
update items seen in DB when using API

12 years agothreading messed up a bit of cross-site federation code
friendica [Mon, 13 Aug 2012 01:42:43 +0000 (18:42 -0700)]
threading messed up a bit of cross-site federation code

12 years agocommon_friends_visitor_widget warning
friendica [Sun, 12 Aug 2012 22:54:38 +0000 (15:54 -0700)]
common_friends_visitor_widget warning

12 years agocrypt bbcode tag
friendica [Sun, 12 Aug 2012 11:29:26 +0000 (04:29 -0700)]
crypt bbcode tag

12 years agoMerge pull request #434 from fermionic/frost-update-for-threaded-comments
fermionic [Sun, 12 Aug 2012 02:53:08 +0000 (19:53 -0700)]
Merge pull request #434 from fermionic/frost-update-for-threaded-comments

sigh I always miss something when copying over

12 years agosigh I always miss something when copying over
Zach Prezkuta [Sun, 12 Aug 2012 02:51:51 +0000 (20:51 -0600)]
sigh I always miss something when copying over

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Sat, 11 Aug 2012 22:42:48 +0000 (15:42 -0700)]
Merge https://github.com/friendica/friendica into pull

Conflicts:
view/wall_thread.tpl

12 years agorev update
friendica [Sat, 11 Aug 2012 22:39:45 +0000 (15:39 -0700)]
rev update

12 years agoMerge pull request #433 from fermionic/frost-update-for-threaded-comments
friendica [Sat, 11 Aug 2012 22:34:21 +0000 (15:34 -0700)]
Merge pull request #433 from fermionic/frost-update-for-threaded-comments

Some updates for threading

12 years agoupdate frost mobile TODO
Zach Prezkuta [Sat, 11 Aug 2012 20:43:13 +0000 (14:43 -0600)]
update frost mobile TODO

12 years agoThreading updates
Zach Prezkuta [Sat, 11 Aug 2012 20:36:58 +0000 (14:36 -0600)]
Threading updates
- Add rudimentary thread handling to Frost
- Fix possible CSS bug in several themes from threading update
- Add ability for themes to prevent threading

12 years agogetting comment counts correct in a threaded world
friendica [Sat, 11 Aug 2012 08:26:10 +0000 (01:26 -0700)]
getting comment counts correct in a threaded world

12 years agofix child count
friendica [Sat, 11 Aug 2012 06:42:45 +0000 (23:42 -0700)]
fix child count

12 years agobring likes back - comment ordering is still a bit funky
friendica [Fri, 10 Aug 2012 23:36:44 +0000 (16:36 -0700)]
bring likes back - comment ordering is still a bit funky

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Fri, 10 Aug 2012 23:04:16 +0000 (16:04 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agoMerge pull request #431 from fermionic/diaspora-relays-and-tags
friendica [Fri, 10 Aug 2012 23:03:37 +0000 (16:03 -0700)]
Merge pull request #431 from fermionic/diaspora-relays-and-tags

Couple of Diaspora fixes

12 years agoMerge pull request #432 from fermionic/frost-better-screen-width
friendica [Fri, 10 Aug 2012 23:03:19 +0000 (16:03 -0700)]
Merge pull request #432 from fermionic/frost-better-screen-width

Frost Mobile better screen width

12 years agorev update
friendica [Fri, 10 Aug 2012 23:02:20 +0000 (16:02 -0700)]
rev update

12 years agoreadability in TODO
Zach Prezkuta [Fri, 10 Aug 2012 14:37:31 +0000 (08:37 -0600)]
readability in TODO

12 years ago- Frost Mobile: redo CSS to adjust automatically to the screen width
Zach Prezkuta [Fri, 10 Aug 2012 03:17:11 +0000 (21:17 -0600)]
- Frost Mobile: redo CSS to adjust automatically to the screen width
- Frost Mobile: various tweaks and fixes
- Allow themes to limit number of items on the Network page

12 years agomove tag transformation to bb2diaspora; start taking out unnecessary signature stuff
Zach Prezkuta [Fri, 10 Aug 2012 04:06:18 +0000 (22:06 -0600)]
move tag transformation to bb2diaspora; start taking out unnecessary signature stuff

12 years agoMerge pull request #430 from fabrixxm/master
fabrixxm [Fri, 10 Aug 2012 10:50:54 +0000 (03:50 -0700)]
Merge pull request #430 from fabrixxm/master

Fix Quattro with threaded comments, small tweaks to template processor and conversation.php

12 years agoquattro: fix collapsed thread, fix comment box, style previev comment, add 'expand...
Fabrixxm [Fri, 10 Aug 2012 10:27:01 +0000 (06:27 -0400)]
quattro: fix collapsed thread, fix comment box, style previev comment, add 'expand / collapse" thread

12 years agoconversation: add 'thread_level' to $item array
Fabrixxm [Fri, 10 Aug 2012 09:42:36 +0000 (05:42 -0400)]
conversation: add 'thread_level' to $item array

12 years agotemplate processor: trim strings in {{ if str!=str }}, add 'debug' tag:
Fabrixxm [Fri, 10 Aug 2012 08:55:51 +0000 (04:55 -0400)]
template processor: trim strings in {{ if str!=str }}, add 'debug' tag:

    {{ debug $var [$var1 [$var2 [...]]] }}{{ enddebug }}

is replaced by

    <pre>var_export($var1)\nvar_export($var2)\n....</pre>

12 years agoquattro: move comment box for top-level item at the end of comments list
Fabrixxm [Fri, 10 Aug 2012 08:53:39 +0000 (04:53 -0400)]
quattro: move comment box for top-level item at the end of comments list

12 years agoquattro: add comment tools icons, fix hide/show comment tools
Fabrixxm [Fri, 10 Aug 2012 08:29:22 +0000 (04:29 -0400)]
quattro: add comment tools icons, fix hide/show comment tools

12 years agoquattro: remove unused parameter 'comment' from function cmtBbClose
Fabrixxm [Fri, 10 Aug 2012 08:27:50 +0000 (04:27 -0400)]
quattro: remove unused parameter 'comment' from function cmtBbClose

12 years agohead.tpl: commentOpen() and commentClose() return true/false
Fabrixxm [Fri, 10 Aug 2012 08:25:08 +0000 (04:25 -0400)]
head.tpl: commentOpen() and commentClose() return true/false
usefull to concatenate other actions: "commentClose(this, $id) && cmtBbClose($id)"

12 years agobring back "delete selected items" - but need to pass pagedropping to each item
friendica [Fri, 10 Aug 2012 06:01:37 +0000 (23:01 -0700)]
bring back "delete selected items" - but need to pass pagedropping to each item

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Thu, 9 Aug 2012 22:33:22 +0000 (15:33 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agorev update
friendica [Thu, 9 Aug 2012 22:32:07 +0000 (15:32 -0700)]
rev update

12 years agoMerge pull request #429 from CyberDomovoy/threaded_items
Domovoy [Thu, 9 Aug 2012 12:05:29 +0000 (05:05 -0700)]
Merge pull request #429 from CyberDomovoy/threaded_items

Threaded items

12 years agoMerge pull request #5 from fabrixxm/threaded_items
Domovoy [Thu, 9 Aug 2012 09:14:22 +0000 (02:14 -0700)]
Merge pull request #5 from fabrixxm/threaded_items

Threaded items support for Quattro theme

12 years agoMerge branch 'master' of https://github.com/friendica/friendica into threaded_items
root [Thu, 9 Aug 2012 07:26:23 +0000 (09:26 +0200)]
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items