rabuzarus
5c2923869a
this got lost by merge
2015-10-11 20:00:54 +02:00
rabuzarus
649578ae33
Merge develop-new into event-attendance-new
...
Conflicts:
include/conversation.php
2015-10-11 19:39:55 +02:00
Michael Vogel
48309a25ec
Merge remote-tracking branch 'upstream/develop' into 1510-contact-menu
...
Conflicts:
include/conversation.php
2015-10-11 05:11:46 +02:00
27fa20ab22
Merge pull request #1947 from annando/1510-diaspora-follower
...
Reworked contact relations between Diaspora and Friendica
2015-10-10 18:50:20 +02:00
Michael Vogel
bb0dff2c75
Improved contact menu
2015-10-10 16:23:20 +02:00
Michael Vogel
efbdb57f92
Reworked contact relations between Friendica and Diaspora
2015-10-10 11:06:18 +02:00
rabuzarus
0eae67ea48
update attendance state on profile wall
2015-10-09 14:20:01 +02:00
Michael Vogel
16da708e07
Contact names with ">" and "<" are a problem ...
2015-10-09 07:39:38 +02:00
rabuzarus
ba1207e6e1
translate attendance with localize_item()
2015-10-08 22:23:09 +02:00
Michael Vogel
61c3ce7a21
Bugfix: The contact names had to be escaped
2015-10-08 00:25:55 +02:00
Michael Vogel
1f0b759e2f
Added resize possibility to proxy function
2015-10-07 08:25:10 +02:00
Michael Vogel
a663e4693f
Further improvement of the contact menu
2015-10-04 23:41:13 +02:00
Michael Vogel
b037f977fa
The contact menu is now improved (for example a "Follow" link)
2015-10-04 21:17:28 +02:00
rabuzarus
7cb4ea52fd
port of the event attendance feature of red matrix with example implementation for vier theme.
2015-09-30 16:58:02 +02:00
rabuzarus
2ff67ef5ed
fixes like/dislike for photos
2015-09-30 14:39:00 +02:00
rabuzarus
f5c7006f30
rest of the consensus porting work and integration into friendica
...
Credits to Mike Macgirvin for the code
2015-09-30 14:38:13 +02:00
rabuzarus
0077494396
make event confirmation work
2015-09-30 14:35:17 +02:00
rabuzarus
37fccee503
first work for consensus
2015-09-30 14:34:10 +02:00
Michael Vogel
ccaeb00973
Better link descriptions.
2015-08-08 22:30:43 +02:00
Michael Vogel
b4d09777b9
Added many accesskeys ...
2015-08-08 17:33:43 +02:00
Michael Vogel
836432bb9a
Removed Google Maps
2015-06-30 07:42:59 +02:00
rabuzarus
729b7f0e72
restore jotplugins
2015-06-27 15:11:18 +02:00
rabuzarus
5ce125d6e0
cleanup of some unused code
2015-06-26 15:13:52 +02:00
rabuzarus
37501a883e
make notes work
2015-06-25 22:57:26 +02:00
Michael Vogel
0e895e24f7
Code reworks: replaced hardcoded network text with the corresponding constants.
2015-04-11 22:14:56 +02:00
Fabrixxm
5d19b21298
fix translation of poke activity body
2015-02-09 11:54:50 +01:00
Michael Vogel
58d814b793
issue 1283 - Share-it button support for friendica
2015-01-25 00:10:58 +01:00
Michael Vogel
d4b2d3bf8a
Moved "privacy_image_cache" into the core. Enabled by default, can be disabled in the page settings.
2014-08-13 00:13:13 +02:00
Michael Vogel
f68bbffb64
Adding preview value to "prepare_body" hook. (Will be used in addons for network related previews)
2014-07-09 20:44:12 +02:00
Michael Vogel
acf1c3956c
Only show connectors when not "hide wall" is enabled.
2014-05-10 00:24:15 +02:00
Michael Vogel
01971428aa
target="_blank" instead of target="external-link"
2014-02-11 23:42:06 +01:00
Michael Vogel
aed28a24f1
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
mod/crepair.php
2014-01-05 16:22:42 +01:00
Michael Vogel
d5ae5ecedd
- Improved speed due to forced indexes when showing items.
...
- Possibility to setup a hostname
2013-09-15 10:40:58 +02:00
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
