]> git.mxchange.org Git - friendica.git/log
friendica.git
12 years agoremove groups from default permissions when removed; bug in group_add_member
Zach Prezkuta [Sat, 29 Sep 2012 23:53:06 +0000 (17:53 -0600)]
remove groups from default permissions when removed; bug in group_add_member

12 years agoorder photo album list in blog (reverse date) order
friendica [Sat, 29 Sep 2012 13:08:44 +0000 (06:08 -0700)]
order photo album list in blog (reverse date) order

12 years agophoto "conversation streams" need work - quite a bit of it
friendica [Sat, 29 Sep 2012 13:04:01 +0000 (06:04 -0700)]
photo "conversation streams" need work - quite a bit of it

12 years agoslight adjustment to Photo scaling - also discovered imagick resize may need some...
friendica [Sat, 29 Sep 2012 12:46:01 +0000 (05:46 -0700)]
slight adjustment to Photo scaling - also discovered imagick resize may need some additional work

12 years agoonly constrain horizontal image dimension for scaling very tall photos
friendica [Sat, 29 Sep 2012 12:20:29 +0000 (05:20 -0700)]
only constrain horizontal image dimension for scaling very tall photos

12 years agorev update
friendica [Sat, 29 Sep 2012 12:19:45 +0000 (05:19 -0700)]
rev update

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Fri, 28 Sep 2012 06:53:00 +0000 (23:53 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agoimprove FB connector doc
friendica [Fri, 28 Sep 2012 06:52:10 +0000 (23:52 -0700)]
improve FB connector doc

12 years agoFR: update to the strings
Tobias Diekershoff [Fri, 28 Sep 2012 04:44:30 +0000 (06:44 +0200)]
FR: update to the strings

12 years agosubscribe-to/follow threads
friendica [Fri, 28 Sep 2012 02:53:55 +0000 (19:53 -0700)]
subscribe-to/follow threads

12 years agorev update
friendica [Fri, 28 Sep 2012 02:53:23 +0000 (19:53 -0700)]
rev update

12 years agoclass not id
friendica [Thu, 27 Sep 2012 09:54:14 +0000 (02:54 -0700)]
class not id

12 years agoforumlist changes
friendica [Thu, 27 Sep 2012 09:47:50 +0000 (02:47 -0700)]
forumlist changes

12 years agoadded IS from transifex, kudos to axelt
Tobias Diekershoff [Thu, 27 Sep 2012 04:42:57 +0000 (06:42 +0200)]
added IS from transifex, kudos to axelt

12 years agoFR: update to the strings
Tobias Diekershoff [Thu, 27 Sep 2012 04:31:55 +0000 (06:31 +0200)]
FR: update to the strings

12 years agoCA: update to the strings
Tobias Diekershoff [Thu, 27 Sep 2012 04:30:37 +0000 (06:30 +0200)]
CA: update to the strings

12 years agoEO: update to the strings
Tobias Diekershoff [Thu, 27 Sep 2012 04:29:25 +0000 (06:29 +0200)]
EO: update to the strings

12 years agoCS: update to the strings
Tobias Diekershoff [Thu, 27 Sep 2012 04:27:06 +0000 (06:27 +0200)]
CS: update to the strings

12 years agoES: update to the strings
Tobias Diekershoff [Thu, 27 Sep 2012 04:24:49 +0000 (06:24 +0200)]
ES: update to the strings

12 years agoDE: update to the strings
Tobias Diekershoff [Thu, 27 Sep 2012 04:21:16 +0000 (06:21 +0200)]
DE: update to the strings

12 years agoadd "tagged" hook (bots and such)
friendica [Thu, 27 Sep 2012 01:24:19 +0000 (18:24 -0700)]
add "tagged" hook (bots and such)

12 years agorev update
friendica [Thu, 27 Sep 2012 01:23:08 +0000 (18:23 -0700)]
rev update

12 years agodeclare array separately, doesn't work well when defined in hook
friendica [Wed, 26 Sep 2012 11:50:24 +0000 (04:50 -0700)]
declare array separately, doesn't work well when defined in hook

12 years agonetwork_ping hook for next generation "page"/"forums" plugin
friendica [Wed, 26 Sep 2012 11:46:54 +0000 (04:46 -0700)]
network_ping hook for next generation "page"/"forums" plugin

12 years agofrost-mobile - everything is walltowall
friendica [Wed, 26 Sep 2012 04:55:53 +0000 (21:55 -0700)]
frost-mobile - everything is walltowall

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Wed, 26 Sep 2012 02:11:58 +0000 (19:11 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agosort out the 'delete selected' mess
friendica [Wed, 26 Sep 2012 02:10:46 +0000 (19:10 -0700)]
sort out the 'delete selected' mess

12 years agoMerge remote branch 'upstream/master'
pixelroot [Tue, 25 Sep 2012 10:00:29 +0000 (12:00 +0200)]
Merge remote branch 'upstream/master'

12 years ago modified: view/theme/smoothly/events_reminder.tpl
pixelroot [Tue, 25 Sep 2012 09:59:58 +0000 (11:59 +0200)]
modified:   view/theme/smoothly/events_reminder.tpl
modified:   view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php

12 years agoone template to rule them all
friendica [Tue, 25 Sep 2012 08:31:48 +0000 (01:31 -0700)]
one template to rule them all

12 years agoone template to rule them all
friendica [Tue, 25 Sep 2012 04:43:03 +0000 (21:43 -0700)]
one template to rule them all

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Tue, 25 Sep 2012 03:54:55 +0000 (20:54 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agorev update
friendica [Tue, 25 Sep 2012 03:54:20 +0000 (20:54 -0700)]
rev update

12 years ago modified: view/theme/smoothly/login.tpl
pixelroot [Mon, 24 Sep 2012 14:07:41 +0000 (16:07 +0200)]
modified:   view/theme/smoothly/login.tpl
modified:   view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Mon, 24 Sep 2012 08:31:23 +0000 (01:31 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agoremove THISPLUGIN definition - not used and doesn't work
friendica [Mon, 24 Sep 2012 08:30:18 +0000 (01:30 -0700)]
remove THISPLUGIN definition - not used and doesn't work

12 years agoMerge remote branch 'upstream/master'
pixelroot [Mon, 24 Sep 2012 08:16:05 +0000 (10:16 +0200)]
Merge remote branch 'upstream/master'

12 years ago modified: view/theme/smoothly/search_item.tpl
pixelroot [Mon, 24 Sep 2012 08:15:31 +0000 (10:15 +0200)]
modified:   view/theme/smoothly/search_item.tpl
modified:   view/theme/smoothly/theme.php
modified:   view/theme/smoothly/wall_item.tpl
modified:   view/theme/smoothly/wall_thread.tpl
modified:   view/theme/smoothly/wallwall_item.tpl
modified:   view/theme/smoothly/wallwall_thread.tpl

12 years agoallow a bit more height
friendica [Mon, 24 Sep 2012 07:46:00 +0000 (00:46 -0700)]
allow a bit more height

12 years agorestore category/file display on dispy/diabook
friendica [Mon, 24 Sep 2012 07:35:19 +0000 (00:35 -0700)]
restore category/file display on dispy/diabook

12 years agoMerge branch 'master' of http://github.com/friendica/friendica
pixelroot [Mon, 24 Sep 2012 06:46:25 +0000 (08:46 +0200)]
Merge branch 'master' of http://github.com/friendica/friendica

12 years agozeros - theming for new categories/folder display
friendica [Mon, 24 Sep 2012 02:22:48 +0000 (19:22 -0700)]
zeros - theming for new categories/folder display

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

12 years agosupport for bringing back cats/folders
friendica [Mon, 24 Sep 2012 00:16:37 +0000 (17:16 -0700)]
support for bringing back cats/folders

12 years agorev update
friendica [Mon, 24 Sep 2012 00:16:01 +0000 (17:16 -0700)]
rev update

12 years agoDE: update to the strings
Tobias Diekershoff [Sat, 22 Sep 2012 06:42:07 +0000 (08:42 +0200)]
DE: update to the strings

12 years agoMerge branch 'master' of http://github.com/friendica/friendica
pixelroot [Sat, 22 Sep 2012 06:36:50 +0000 (08:36 +0200)]
Merge branch 'master' of http://github.com/friendica/friendica

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Sat, 22 Sep 2012 01:10:32 +0000 (18:10 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agoundo revert of template changes
friendica [Sat, 22 Sep 2012 01:09:55 +0000 (18:09 -0700)]
undo revert of template changes

12 years agorev update
friendica [Sat, 22 Sep 2012 01:04:09 +0000 (18:04 -0700)]
rev update

12 years ago modified: view/theme/smoothly/style.css
pixelroot [Fri, 21 Sep 2012 06:57:22 +0000 (08:57 +0200)]
modified:   view/theme/smoothly/style.css

12 years ago modified: view/theme/smoothly/style.css
pixelroot [Thu, 20 Sep 2012 11:26:53 +0000 (13:26 +0200)]
modified:   view/theme/smoothly/style.css

12 years ago modified: view/theme/smoothly/style.css
pixelroot [Thu, 20 Sep 2012 11:25:12 +0000 (13:25 +0200)]
modified:   view/theme/smoothly/style.css

12 years ago modified: view/theme/smoothly/style.css
pixelroot [Thu, 20 Sep 2012 11:15:01 +0000 (13:15 +0200)]
modified:   view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php

12 years agoMerge remote branch 'upstream/master'
pixelroot [Thu, 20 Sep 2012 09:33:24 +0000 (11:33 +0200)]
Merge remote branch 'upstream/master'

12 years ago modified: view/theme/smoothly/style.css
pixelroot [Thu, 20 Sep 2012 09:32:55 +0000 (11:32 +0200)]
modified:   view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php

12 years agoMerge pull request #492 from fabrixxm/blog-like
friendica [Thu, 20 Sep 2012 09:15:12 +0000 (02:15 -0700)]
Merge pull request #492 from fabrixxm/blog-like

More data in $item array

12 years agomore $item data
Fabrixxm [Thu, 20 Sep 2012 07:46:49 +0000 (09:46 +0200)]
more $item data
- add $item.categories and $item.folders to object/Item.php
- add $item.hastags and $item.mentions to object/Item.php
- add $item.total_comments_num and $item.total_comments_text to object/Item.php (those are set for top_level item also with no comments)
- move get_cats_and_terms() to include/text.php

12 years agoUpdate util/typo.php to check in to 'object' folder
Fabrixxm [Thu, 20 Sep 2012 07:32:42 +0000 (09:32 +0200)]
Update util/typo.php to check in to 'object' folder

12 years ago deleted: view/theme/smoothly/match.tpl
pixelroot [Thu, 20 Sep 2012 07:25:53 +0000 (09:25 +0200)]
deleted:    view/theme/smoothly/match.tpl
modified:   view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php

12 years agoMerge remote branch 'friendica/master' into blog-like
Fabrixxm [Thu, 20 Sep 2012 06:48:54 +0000 (02:48 -0400)]
Merge remote branch 'friendica/master' into blog-like

12 years agoremove blog theme
Fabrixxm [Thu, 20 Sep 2012 06:42:54 +0000 (02:42 -0400)]
remove blog theme

12 years agoMerge pull request #491 from fermionic/separate-number-text-in-hidden-comments-text
friendica [Thu, 20 Sep 2012 03:56:26 +0000 (20:56 -0700)]
Merge pull request #491 from fermionic/separate-number-text-in-hidden-comments-text

allow hidden comments phrase to be accessed separately as number and text

12 years agoallow hidden comments phrase to be accessed separately as number and text
Zach Prezkuta [Thu, 20 Sep 2012 03:31:26 +0000 (21:31 -0600)]
allow hidden comments phrase to be accessed separately as number and text

12 years agoMerge pull request #490 from fermionic/diaspora-profile-updates-broken
friendica [Thu, 20 Sep 2012 02:52:50 +0000 (19:52 -0700)]
Merge pull request #490 from fermionic/diaspora-profile-updates-broken

-- Fix Diaspora profile update avatar bugs

12 years ago-- Fix Diaspora profile update avatar bugs
Zach Prezkuta [Thu, 20 Sep 2012 02:35:39 +0000 (20:35 -0600)]
-- Fix Diaspora profile update avatar bugs
-- Protect BBCode tags inside of [pre] from space re-formatting
-- More information in email poll logging
-- Frost/Frost Mobile bug fixes

12 years agothis is not the best solution, but don't close the comment-bb buttons when you click...
friendica [Thu, 20 Sep 2012 01:24:20 +0000 (18:24 -0700)]
this is not the best solution, but don't close the comment-bb buttons when you click outside the comment, because the comment-bb buttons are outside the comment and if you click one on an empty comment box the comment goes away completely and the bbcode doesn't get inserted.

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Wed, 19 Sep 2012 22:39:19 +0000 (15:39 -0700)]
Merge https://github.com/friendica/friendica into pull

Conflicts:
view/theme/smoothly/follow.tpl

12 years agohtml tag completed early
friendica [Wed, 19 Sep 2012 22:34:21 +0000 (15:34 -0700)]
html tag completed early

12 years agoconversation: new 'categories' and 'folder' elements to $item
Fabrixxm [Wed, 19 Sep 2012 15:38:32 +0000 (11:38 -0400)]
conversation: new 'categories' and 'folder' elements to $item
remove static "Filed under" e "Category" text from message body
both are lists of array whith
'name' : category/folder name
'remove': url to remove
'first': bool first in array
'last' : bool last in array

12 years agoMerge branch 'master' into blog-like
Fabrixxm [Wed, 19 Sep 2012 15:38:04 +0000 (11:38 -0400)]
Merge branch 'master' into blog-like

12 years ago modified: view/theme/smoothly/theme.php
pixelroot [Wed, 19 Sep 2012 14:16:58 +0000 (16:16 +0200)]
modified:   view/theme/smoothly/theme.php

12 years ago modified: view/theme/smoothly/style.css
pixelroot [Wed, 19 Sep 2012 14:14:45 +0000 (16:14 +0200)]
modified:   view/theme/smoothly/style.css

12 years ago modified: view/theme/smoothly/follow.tpl
pixelroot [Wed, 19 Sep 2012 13:53:37 +0000 (15:53 +0200)]
modified:   view/theme/smoothly/follow.tpl
modified:   view/theme/smoothly/jot.tpl
modified:   view/theme/smoothly/peoplefind.tpl
modified:   view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php
modified:   view/theme/smoothly/wall_item.tpl
modified:   view/theme/smoothly/wall_thread.tpl
modified:   view/theme/smoothly/wallwall_item.tpl
modified:   view/theme/smoothly/wallwall_thread.tpl

12 years agobad html in view/follow.tpl
friendica [Wed, 19 Sep 2012 10:17:41 +0000 (03:17 -0700)]
bad html in view/follow.tpl

12 years agofix events
friendica [Wed, 19 Sep 2012 07:44:37 +0000 (00:44 -0700)]
fix events

12 years agomore infrastructure for ignored events
friendica [Wed, 19 Sep 2012 05:49:05 +0000 (22:49 -0700)]
more infrastructure for ignored events

12 years agoallow "subscribe to thread" activities to exist without displaying them.
friendica [Wed, 19 Sep 2012 03:12:55 +0000 (20:12 -0700)]
allow "subscribe to thread" activities to exist without displaying them.

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Wed, 19 Sep 2012 00:44:38 +0000 (17:44 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agogive themes more control over events/birthdays and provide them as notifications
friendica [Wed, 19 Sep 2012 00:43:09 +0000 (17:43 -0700)]
give themes more control over events/birthdays and provide them as notifications

12 years agorev update
friendica [Wed, 19 Sep 2012 00:24:45 +0000 (17:24 -0700)]
rev update

12 years agoMerge pull request #479 from fermionic/album-image-inserted-too-large
friendica [Tue, 18 Sep 2012 22:46:41 +0000 (15:46 -0700)]
Merge pull request #479 from fermionic/album-image-inserted-too-large

dont insert images larger than scale level 2

12 years agoPull request #487
Thomas Willingham [Tue, 18 Sep 2012 15:15:36 +0000 (16:15 +0100)]
Pull request #487

12 years agoUpdate view/theme/smoothly/bottom.tpl
Alex [Tue, 18 Sep 2012 10:13:05 +0000 (13:13 +0300)]
Update view/theme/smoothly/bottom.tpl

12 years agoselect based on dimensions instead of scale level
Zach Prezkuta [Tue, 18 Sep 2012 03:46:36 +0000 (21:46 -0600)]
select based on dimensions instead of scale level

12 years agoMerge pull request #483 from fabrixxm/bug471
friendica [Tue, 18 Sep 2012 00:39:32 +0000 (17:39 -0700)]
Merge pull request #483 from fabrixxm/bug471

admin: Don't allow to block or delete site admin in users admin page.

12 years agoMerge pull request #486 from cvogeley/master
Thomas Willingham [Mon, 17 Sep 2012 21:44:17 +0000 (14:44 -0700)]
Merge pull request #486 from cvogeley/master

Show notifications in title, ignore OSX .DS_Store files

12 years agoignore OSX .DS_Store files
Christian Vogeley [Mon, 17 Sep 2012 21:11:42 +0000 (23:11 +0200)]
ignore OSX .DS_Store files

12 years agoremove .DS_Store
Christian Vogeley [Mon, 17 Sep 2012 21:03:53 +0000 (23:03 +0200)]
remove .DS_Store

12 years agoRemove and ignore .DS_Store
Christian Vogeley [Mon, 17 Sep 2012 21:03:34 +0000 (23:03 +0200)]
Remove and ignore .DS_Store

12 years agoES: bringing the strings to 100% thx to csolisr
Tobias Diekershoff [Mon, 17 Sep 2012 19:52:21 +0000 (21:52 +0200)]
ES: bringing the strings to 100% thx to csolisr

12 years agoAdd notifications in title
Christian Vogeley [Mon, 17 Sep 2012 18:39:34 +0000 (20:39 +0200)]
Add notifications in title

12 years agoPull request #484 (Smoothly)
Thomas Willingham [Mon, 17 Sep 2012 17:37:44 +0000 (18:37 +0100)]
Pull request #484 (Smoothly)

12 years agoMerge pull request #485 from tomtom84/master
tomtom84 [Mon, 17 Sep 2012 15:58:55 +0000 (08:58 -0700)]
Merge pull request #485 from tomtom84/master

Corrected titlebar notifications in Diabook.

12 years agoCorrected titlebar notifications in Diabook
tomtom84 [Mon, 17 Sep 2012 15:54:07 +0000 (17:54 +0200)]
Corrected titlebar notifications in Diabook

12 years agoAdd titlebar notifications to Dispy.
Thomas Willingham [Mon, 17 Sep 2012 13:54:40 +0000 (14:54 +0100)]
Add titlebar notifications to Dispy.

12 years agoAdd title bar notifications to Smoothly
Thomas Willingham [Mon, 17 Sep 2012 13:53:17 +0000 (14:53 +0100)]
Add title bar notifications to Smoothly

12 years agoGitignore seems to have been overwritten with somebody's personal copy - put the...
Thomas Willingham [Mon, 17 Sep 2012 13:52:26 +0000 (14:52 +0100)]
Gitignore seems to have been overwritten with somebody's personal copy - put the old one back.

12 years agoadmin: Don't allow to block or delete site admin in users admin page. fix bug 471
Fabrixxm [Mon, 17 Sep 2012 12:48:43 +0000 (08:48 -0400)]
admin: Don't allow to block or delete site admin in users admin page. fix bug 471

12 years agoMerge pull request #482 from pixelroot/master
Alex [Mon, 17 Sep 2012 12:12:53 +0000 (05:12 -0700)]
Merge pull request #482 from pixelroot/master

bug fix