friendica
1d358fe6de
system support for complete blocking
2013-04-28 21:02:53 -07:00
Michael Vogel
93143702ed
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
boot.php
database.sql
library/fancybox/jquery.fancybox-1.3.4.css
mod/search.php
update.php
2013-02-17 12:35:40 +01:00
zottel
c0af9b2938
Reset network when showing a contact's posts
...
There is similar stuff in the mobile themes, but I didn't touch
them because I wasn't sure if I should and how the smarty3 stuff
works.
2013-02-01 09:12:37 +01:00
Michael Vogel
2cb576d305
Bugfixing after adding timestamps
2013-01-27 13:57:44 +01:00
Zach Prezkuta
488a38cd85
Decaf mobile: an (almost) Javascript-free theme
2013-01-26 13:01:57 -07:00
1f36ebdb2b
add display_item hook back around l. 686 to the conversation
2013-01-22 08:11:13 +01:00
Michael Vogel
4e3d0018c6
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
boot.php
include/items.php
update.php
2013-01-20 14:07:57 +01:00
Michael Vogel
82c00660e0
Preloading of items in the cache when receiving them.
2013-01-17 23:20:40 +01:00
Michael Vogel
5501dd0759
Searching for tags has been enabled in all places. The tag detection has been improved for imports with missing line feeds.
2013-01-13 17:13:01 +01:00
Zach Prezkuta
74caf1a4a7
* Add MIME types for file attachments
...
* Restore translatability to mood phrases
* Prevent casting of "false" in html2plain
* Allow attachments with a comma in the filename
* Fix/optimize ACL img data-src jQuery search
* Fix bug when uploading files with a comma in the name using Chrome/Chromium
* Babel nicer output formatting
* Remove obsolete "plaintext" check in mod/parse_url
* Restore TinyMCE live insertion of images
* Smarty conversion script: add --no-header option to suppress warning headers in Smarty template files
2013-01-12 06:31:32 -07:00
Zach Prezkuta
e684324032
use explicit include paths
2012-12-28 14:51:50 -07:00
Zach Prezkuta
263fe0f6bc
revert unnecessary variable name changes
2012-12-26 10:42:01 -07:00
Zach Prezkuta
53a4cf5339
only use Smarty if the view/smarty3/ directory is writable; location bug fix
2012-12-23 06:16:35 -07:00
Zach Prezkuta
96ed0a7791
Implement Smarty3
2012-12-22 12:57:29 -07:00
Zach Prezkuta
94204d9160
implement features
2012-11-22 09:14:22 -07:00
Zach Prezkuta
999c3439e6
fix mobile photo uploads; better theme control; frost improvements
2012-11-06 08:43:19 -07:00
Zach Prezkuta
c9248b66db
display live update; don't collapse comments on live update
2012-11-01 18:31:50 -06:00
Zach Prezkuta
6effdd570c
add a confirm dialog and a busy rotator for delete selected
2012-11-01 17:42:40 -06:00
Zach Prezkuta
e9b26ffbb3
prevent double posting of status updates and comments
2012-11-01 17:14:42 -06:00
Zach Prezkuta
d98974572b
fix theme control of allowing threading
2012-11-01 10:33:01 -06:00
Zach Prezkuta
4fd339b216
add live div to wall page
2012-10-29 12:43:52 -06:00
Zach Prezkuta
0ea89852d2
allow themes to decide where live updates appear
2012-10-09 09:41:33 -06:00
friendica
cef5169567
subscribe-to/follow threads
2012-09-27 19:53:55 -07:00
friendica
e433f20cd8
sort out the 'delete selected' mess
2012-09-25 19:10:46 -07:00
friendica
245d9f0aca
one template to rule them all
2012-09-25 01:31:48 -07:00
friendica
054f8edb59
zeros - theming for new categories/folder display
2012-09-23 19:22:48 -07:00
friendica
c3b4f9f0d3
support for bringing back cats/folders
2012-09-23 17:16:37 -07:00
Fabrixxm
dd25c7db7e
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
2012-09-20 09:46:49 +02:00
Fabrixxm
40f2ec189e
Merge remote branch 'friendica/master' into blog-like
2012-09-20 02:48:54 -04:00
Zach Prezkuta
da7c5b19b1
allow hidden comments phrase to be accessed separately as number and text
2012-09-19 21:31:26 -06:00
Fabrixxm
b400ddd22d
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
2012-09-19 11:38:32 -04:00
friendica
66081201bc
allow "subscribe to thread" activities to exist without displaying them.
2012-09-18 20:12:55 -07:00
friendica
669d2b890e
rev update - add cancel markup to editor
2012-09-15 15:23:15 -07:00
friendica
d19a3b8324
provide separate hashtag and mentions for themes in addition to composite tags
2012-09-13 16:59:25 -07: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
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
1478229abc
allow comments on other folks wall-to-wall postings
2012-09-05 18:24:06 -07:00
friendica
411b6a71b4
Merge https://github.com/friendica/friendica into pull
2012-09-04 22:53:32 -07:00
friendica
4cd8233f61
remote_user can now support multiple contacts being logged in at once
2012-09-04 22:50:28 -07:00
Zach Prezkuta
79012bf888
conversation needs preview parameter
2012-09-04 18:47:49 -06:00
Domovoy
ef52ff6b01
Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
2012-08-30 07:47:21 +02:00
Zach Prezkuta
72712175b5
regular expressions were grabbing too much
2012-08-26 14:56:34 -06:00
Domovoy
9390eda5e6
Revert wall to wall detection based on @ tags (@ can also target a user, not only a forum)
2012-08-24 05:11:39 +02:00
Domovoy
5cd1dde59b
Logic error
2012-08-24 05:04:35 +02:00
Domovoy
c9cfc52293
method, not property
2012-08-24 04:57:32 +02:00
Domovoy
e3ee997cd3
Fix copy/paste stupidity
2012-08-24 04:45:10 +02:00
Domovoy
8a25c7876c
Better wall to wall detection (fallback on checking if we have a @ tag)
2012-08-24 04:36:03 +02:00
friendica
386b6d081b
moods
2012-08-22 21:36:55 -07:00
friendica
ff0e0782a5
restore old comment behaviour when threading turned off
2012-08-21 19:41:50 -07:00
