Zered
82972be85e
Adding a "User waiting for permanent deletion" table in admin page
2013-08-05 06:08:33 +02:00
Fabrixxm
2f6333c751
remove debug code. again.
2013-08-04 03:11:01 -04:00
Fabrixxm
11d1c1ae8e
add tag to term table. fix "#xNNNN" tag filter.
2013-08-03 15:12:50 -04:00
0972189372
allow admins to add a new user from the admin panel (eventually fixing oldbug #383 )
2013-07-21 08:46:57 +02:00
fabrixxm
a4a3ad5327
Merge pull request #720 from fabrixxm/feed_push
...
Feed PuSH
2013-07-01 10:16:53 -07:00
Fabrixxm
759afb4237
uexport: fix full export
...
- add new line after each valid json line
- export table row as single json object
2013-06-28 03:16:25 -04:00
Fabrixxm
0a1697d13a
add pubsubhubbub support to feed contacts
2013-06-27 09:51:13 -04:00
Michael Vogel
323186864e
Merge remote-tracking branch 'upstream/master'
2013-06-08 12:30:36 +02:00
Michael Vogel
a2cef94d8b
ostatus completion of threads now works with longer threads well.
2013-06-08 12:28:19 +02:00
Abinoam Jr
a29f592ba7
Fix tiny typo on mod/uimport.php
2013-05-29 10:00:35 -03:00
friendica
0cc641fbbc
messaging
2013-05-22 22:30:53 -07:00
friendica
6ec1bd2fa8
double quotes in title mess up editpost
2013-05-18 16:02:31 -07:00
Zach Prezkuta
35358baac9
update to v4.0.0; point to local host of SWF
2013-05-11 10:55:09 -06:00
fermionic
3a13aba62e
Merge pull request #674 from fermionic/20130503-basic-video-support
...
basic video playback support using VideoJS
2013-05-11 08:33:36 -07:00
friendica
2c8d33a6e2
rev update
2013-05-09 01:15:22 -07:00
Zach Prezkuta
fec4581f34
basic video playback support using VideoJS
2013-05-03 18:17:56 -06:00
friendica
36f2930e52
http status for disallowed feeds
2013-04-23 20:12:49 -07:00
friendica
115c8a53bf
issue546 via Tobias
2013-04-23 18:58:52 -07:00
b6d1a1f125
tabwidth
2013-04-14 18:19:01 +02:00
4dd406055c
check password when changing users email
2013-04-14 17:58:16 +02:00
5827db0ea3
check current password before changing the password
2013-04-14 17:22:42 +02:00
Zach Prezkuta
2cc73dbef3
allow visiting other people's display/ links if I have a copy of the post
2013-04-07 11:38:37 -06:00
friendica
9660117c70
sync username when changed in either the default profile or the settings page
2013-04-04 15:10:14 -07:00
c43e65e26b
OStatus conversation poll option in the admin panel
2013-03-25 11:00:13 +01:00
4ee23069ad
typo found in the php.logs
2013-03-24 09:37:11 +01:00
39cc7f4565
use _Enable Debugging_ instead of only _Debugging_ in the interface
2013-03-19 07:01:34 +01:00
friendica
108f2e1b81
Merge https://github.com/friendica/friendica into pull
2013-03-18 16:41:56 -07:00
friendica
1ff37ca4c1
double encode any text that is destined for meta fields.
2013-03-18 16:40:33 -07:00
Zach Prezkuta
03f2fa5119
prevent infinite redirect on network page for non-existant group
2013-03-16 10:11:32 -06:00
3bf560f22f
Merge pull request #643 from annando/master
...
Vier - many changes
2013-03-05 22:06:39 -08:00
fermionic
1b74e3ff10
Merge pull request #644 from fermionic/20130303-no-embedding-private-images-option
...
fix disable embedding option description
2013-03-04 15:57:57 -08:00
Zach Prezkuta
277c47732b
fix disable embedding option description
2013-03-04 16:55:07 -07:00
Michael Vogel
86e19dda22
Vier: Some more changes to the theme.
...
Added a switch to suppress displaying of the tags.
2013-03-05 00:46:11 +01:00
friendica
1c55b0b359
Merge pull request #639 from annando/master
...
Community/Open Graph
2013-03-03 12:07:52 -08:00
friendica
ee70e02d0d
Merge pull request #640 from fermionic/20130303-no-embedding-private-images-option
...
allow admin to prevent private image embedding on hub
2013-03-03 12:07:35 -08:00
Olaf Conradi
aa7aa59def
Fix SQL error for missing AND operator
...
AND operator was missing from WHERE clause
2013-03-03 20:44:52 +01:00
Zach Prezkuta
0187283709
allow admin to prevent private image embedding on hub
2013-03-03 09:44:41 -07:00
Michael Vogel
05597b564d
Merge remote-tracking branch 'upstream/master'
2013-03-03 16:30:18 +01:00
friendica
f07df4f667
merge
2013-03-02 15:46:54 -08:00
Michael Vogel
2866f62c88
Suppoorting Open Graph and Dublin Core when displaying single item
...
Following link shorteners in parse_url
2013-03-02 14:46:06 +01:00
Fabrixxm
4791e5b245
install: add check for php-cli
...
Check won't pass if $php -v won't return "(cli)"
2013-03-01 04:43:04 -05:00
Thomas Willingham
f5d15a7ff8
Add support for members-only addons
2013-02-28 00:29:06 +00:00
7186331a89
Admin panel: show if an account has expired
2013-02-25 13:02:17 +01:00
Michael Vogel
c35feb27f2
community: Only show top postings, no comments
...
parse_url: Follow location in "meta"-header
2013-02-24 12:54:53 +01:00
Zach Prezkuta
3843f821b2
better description
2013-02-23 09:33:29 -07:00
Zach Prezkuta
4db50a3ecb
admin option to disable post content in email notifications for the site
2013-02-23 09:31:34 -07:00
Michael Vogel
0d4d15c73d
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
mod/admin.php
2013-02-20 21:57:26 +01:00
Michael Vogel
c90272e2ae
supressing warning when importing items. Speeding up community. Changed query for the search.
2013-02-20 21:47:36 +01:00
8e65e95d17
add multi vs. single user config to the admin panel
2013-02-17 17:42:32 +01:00
aa2f1c38e9
add 'hide_help' to admin panel
2013-02-17 12:37:45 +01: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
fca8a23265
use enotify to send CC mails
2013-02-17 08:20:29 +01:00
friendica
3d86f47bbd
Merge pull request #618 from tobiasd/master
...
use item title (if set) as mail subject
2013-02-16 15:56:31 -08:00
Zach Prezkuta
8a8e02cb84
add support for doing a redir/ based on contact url
2013-02-16 11:38:41 -07:00
77bc4cd0dc
use entry title (if set) as subject when send by email
2013-02-16 11:03:46 +01:00
Fabrixxm
0a79b2300c
delete item page respond with json if called via ajax.
2013-02-15 06:34:32 -05:00
Michael Vogel
5e077e541a
The community page is speeded up.
...
Photos will be compressed before the output.
2013-02-06 08:01:46 +01:00
friendica
b00426c9fb
Merge pull request #605 from fermionic/20130204-events-request-too-many-dates
...
limit event queries to one month even if no finish date is specified
2013-02-05 17:36:58 -08:00
friendica
132600eee2
Merge pull request #603 from fermionic/20130204-info-message-shown-on-redir
...
add 'quiet' paramter to redir and dfrn_poll to allow calls
2013-02-05 17:35:39 -08:00
friendica
34c9156fa1
Merge pull request #604 from fermionic/20130204-db-debugging-in-mod-display
...
take debugging commands out of mod/display
2013-02-05 17:22:05 -08:00
friendica
70f02053e1
Merge pull request #606 from fermionic/20130204-themes-cant-use-plugin-hooks
...
allow themes to use plugin hooks
2013-02-05 17:21:42 -08:00
Zach Prezkuta
439974a5d5
allow themes to use plugin hooks
2013-02-04 20:53:53 -07:00
Zach Prezkuta
7e4d4cf375
limit event queries to one month even if no finish date is specified
2013-02-04 20:45:14 -07:00
Zach Prezkuta
df53c98798
take debugging commands out of mod/display
2013-02-04 20:39:47 -07:00
Zach Prezkuta
cc38986c20
add 'quiet' paramter to redir and dfrn_poll to allow calls that don't produce a Welcome info
2013-02-04 20:34:42 -07:00
friendica
be29ae0bce
poco xml returning 500 - but with contents?
2013-01-29 18:36:10 -08:00
Michael Vogel
2350aa54eb
OStatus-Conversation auto completion works now.
...
Some performance issues added as well.
2013-01-30 01:31:27 +01:00
friendica
a5ac69c65e
Merge pull request #591 from fermionic/20130126-javascript-free-theme
...
Decaf mobile: an (almost) Javascript-free theme
2013-01-27 19:11:36 -08:00
friendica
b58189bb98
Merge pull request #592 from fermionic/20130126-richtext-feature-fixes
...
make the richtext feature work for events, wall messages, and contact notes
2013-01-27 19:11:06 -08:00
friendica
c9cce9873d
search privacy enhancements for those with blocked walls
2013-01-27 13:14:13 -08:00
Michael Vogel
2cb576d305
Bugfixing after adding timestamps
2013-01-27 13:57:44 +01:00
Zach Prezkuta
187b6441c1
make the richtext feature work for events, wall messages, and contact notes
2013-01-26 13:03:01 -07:00
Zach Prezkuta
488a38cd85
Decaf mobile: an (almost) Javascript-free theme
2013-01-26 13:01:57 -07:00
Michael Vogel
fdee002f73
Several improvements for performance measuring
2013-01-26 18:35:39 +01:00
friendica
04b48688b6
add form security to invite page and set maximum per user invites
2013-01-25 13:48:57 -08: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
friendica
3742d0d5ba
events with no finish date don't appear in calendar
2013-01-16 03:16:45 -08:00
friendica
30f1fb2c4d
provide a date indication in reshared content
2013-01-15 14:58:50 -08:00
Zach Prezkuta
28c9123ac8
module to show system down message
2013-01-14 16:48:01 -07: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
Michael Vogel
b9afb38f4d
Some more function calls to ensure that the tags are deleted when an item is deleted
2013-01-13 15:11:06 +01:00
Michael Vogel
3dc615dd9d
Adding the tag creating function to the function when a photo is tagged
2013-01-13 15:05:24 +01:00
Michael Vogel
158bfda0ac
Changing the tag system to the "term" table.
2013-01-13 14:50:55 +01:00
Michael Vogel
8cef0fa80d
Mentions are now displayed much faster. Attention: The related database update can last more than one minute.
...
bbcode: The generated HTML is now cleaned up every time (using the DOM) since it happened that bad html broke the network page.
2013-01-13 09:37:15 +01:00
friendica
449b44fe4c
Merge https://github.com/friendica/friendica into pull
2013-01-12 15:09:35 -08:00
friendica
b5c0714bc4
fix live update on display page
2013-01-12 15:08:59 -08:00
friendica
8b643d4c88
Merge pull request #581 from fermionic/20130112-backport-red-smarty-improvements
...
fixes and tweaks to Smarty processing
2013-01-12 12:28:14 -08: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
609c45e791
fixes and tweaks to Smarty processing
2013-01-12 05:58:54 -07:00
Michael Vogel
c26cf428a6
The search now searches in the new tag table
2013-01-11 08:51:58 +01:00
Zach Prezkuta
bce29054b9
allow Smarty use on international templates
2013-01-10 21:46:48 -07:00
Michael Vogel
82820d8e95
Now the third most likely languages are shown.
...
In "vier" the tag line is now suppressed. It saves a little bit of space - and is redundant.
2013-01-09 20:54:18 +01:00
friendica
4ab363ed71
bypass smarty wherever using intltext_templates (install, register, friend confirmation emails, etc.)
2013-01-07 20:14:00 -08:00
Thomas Willingham
0cf3d70875
If we find a home.html, also look for a home.css
2013-01-05 14:31:10 +00:00
friendica
07ba4da634
email header encoding everywhere
2013-01-04 15:47:29 -08:00
friendica
c0fd572fec
Merge pull request #574 from fermionic/20130103-always-load-theme-in-mod_init
...
Finalize theme decision in a module's _init function
2013-01-04 14:36:47 -08:00
Zach Prezkuta
fdd142c42e
never use profile_load outside of a module's _init() function
2013-01-03 10:47:45 -07:00
Christian Vogeley
d9961bc3b4
revert one change
2013-01-01 23:47:56 +01:00
Christian Vogeley
4ab7820663
.
2013-01-01 22:44:02 +01:00
Christian Vogeley
5bfd4cf5c4
Move HTML part of oid to template + replace outside the tpl
2013-01-01 22:40:05 +01:00
Christian Vogeley
2a3f8f8ee2
.
2013-01-01 21:08:30 +01:00
Christian Vogeley
cde9b6370d
Fix registration form
2013-01-01 21:05:24 +01:00
Zach Prezkuta
e684324032
use explicit include paths
2012-12-28 14:51:50 -07:00
Zach Prezkuta
b6981768ee
remove more dashes in templates
2012-12-27 09:38:42 -07:00
friendica
e935fa78c6
Merge pull request #557 from fermionic/20121224-installer-check-for-smarty3
...
add write access to view/smarty3/ as a requirement for the installer
2012-12-26 13:08:25 -08:00
Zach Prezkuta
263fe0f6bc
revert unnecessary variable name changes
2012-12-26 10:42:01 -07:00
Zach Prezkuta
e736abd372
small fixes; update smarty3 templates
2012-12-25 12:05:46 -07:00
Zach Prezkuta
11c06e21b7
simplify by making Smarty include directives behave like Friendica native ones
2012-12-25 11:55:57 -07:00
fermionic
6603758a5e
Merge pull request #558 from fermionic/20121222-use-smarty-template-engine
...
fix a few more templates for correct conversion to Smarty3 templates
2012-12-24 07:47:06 -08:00
Zach Prezkuta
ce445a385f
fix a few more templates for correction conversion to Smarty3 templates
2012-12-24 08:44:26 -07:00
Zach Prezkuta
f74a443c1b
add write access to view/smarty3/ as a requirement for the installer
2012-12-24 07:59:46 -07:00
Michael Johnston
cd5b9c10c4
fix filer dialog
2012-12-23 18:34:55 -05:00
fermionic
974f60d132
Merge pull request #551 from fermionic/20121222-use-smarty-template-engine
...
20121222 use smarty template engine
2012-12-23 05:31:11 -08:00
Zach Prezkuta
b9f4687260
one more place where the template engine is changed
2012-12-23 06:25:50 -07:00
friendica
e98dc70008
sn subscription fix
2012-12-23 02:47:14 -08:00
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
b0759e9a9f
Some more system settings are now reachable via front-end
...
Bugfixing in the mail import when a reply header isn't set correctly
2012-12-22 16:16:01 +01:00
Michael Vogel
99ca867869
The performance settings and other systems settings (lock file path, temp path) can now be set via the front end.
2012-12-21 18:23:55 +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
9ab34f8857
mail: "reply-to" now triggers the "sender"-header instead of the "reply-to"-header.
2012-12-18 00:47:55 +01:00
Michael Vogel
a6b1275f16
Merge remote-tracking branch 'upstream/master'
2012-12-17 10:32:53 +01:00
Michael Vogel
46c5a97a20
New caching system for photos
2012-12-14 22:47:30 +01:00
friendica
4793ebb141
change profile photo link on profile edit page
2012-12-07 16:02:40 -08:00
friendica
8ab24858fb
fix "insert web link" for those without richtext feature enabled
2012-12-03 16:31:28 -08:00
friendica
1ad4f5247c
default bbcode - don't check editor pref
2012-12-03 01:05:10 -08:00
friendica
8bb0f08c6c
default to bbcode format when uploading photos, since default editor is now plaintext
2012-12-03 00:43:06 -08:00
friendica
79fb5509ed
bug #511 - if birth year supplied but not a month or day, force a sane default. PHP datetime functions don't handle zero very well.
2012-12-02 13:47:41 -08:00
Zach Prezkuta
eb964bbe08
put the correct function with the logic
2012-11-27 19:33:04 -07:00
Zach Prezkuta
aef96a1d5e
add support for admin choice to force an entire hub to use alt-pager
2012-11-27 19:30:46 -07:00
Thomas Willingham
8c3ea4b4d4
Add max_daily_registrations to admin panel.
2012-11-27 17:13:32 +00:00
friendica
5d904a9fa8
improve performance of photo upload page
2012-11-25 19:34:54 -08:00
friendica
fcbdefcfd5
missing network_to_name
2012-11-22 21:04:03 -08: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
friendica
9835efc9e4
fix jenkins tests
2012-11-22 05:06:15 -08:00
friendica
4d289574ca
ensure that auto_redir does not loop
2012-11-21 15:41:14 -08:00
Michael Vogel
25b4ec32c7
Clean up code - removed useless cache code
2012-11-17 14:27:30 +01:00
Michael Vogel
f17377e6de
New cache system with subdirectories
2012-11-17 00:50:39 +01:00
friendica
3dc4c52022
Merge pull request #533 from fabrixxm/moveme
...
Fix issue 508
2012-11-13 14:06:20 -08:00
fabrixxm
5a2c01d572
Merge pull request #532 from fabrixxm/quattrofixs
...
template: new $item.shiny; some fix to quattro
2012-11-13 03:08:26 -08:00
zottel
c4e4ee892e
Mark items read on filtered network page, but still keep the "mark everything read" mechanism on viewing the unfiltered network page.
2012-11-13 11:30:43 +01:00
Fabrixxm
9afe50d1e5
uimport: add register policy and max daily registrations check (issue 508)
2012-11-13 04:40:15 -05:00
friendica
0e95b6b527
Merge pull request #531 from fabrixxm/master
...
"Move Account" docs
2012-11-10 03:06:28 -08:00
Fabrixxm
41dfc7f29e
items: new property 'shiny'.
...
separate 'indent' (''|'comment') from 'shiny' (''|'shiny')
2012-11-09 11:13:59 -05:00
Fabrixxm
1bc9f8b992
help: load Home.md in aside when not in home,add new markdown syntax
...
New markdown block "warning"
! line1
! line2
will be rendered as
<div class="md_warning"><p>line1</p><p>line2</p></div>
2012-11-09 03:56:45 -05:00
friendica
b01ca0e345
what happened to the photos page vcard?
2012-11-09 00:21:16 -08:00
fermionic
cbbd68563b
Merge pull request #527 from fermionic/20121106-frost-updates
...
frost updates
2012-11-07 07:41:17 -08:00
Fabrixxm
98958b4fb9
fix uexport query for groups and group members
2012-11-07 09:26:05 -05:00
Zach Prezkuta
999c3439e6
fix mobile photo uploads; better theme control; frost improvements
2012-11-06 08:43:19 -07:00
Thomas Willingham
3c61ba7f53
Uimport - slightly modify text (better English, not better doco).
2012-11-06 15:01:46 +00:00
Fabrixxm
5b4944fe8e
Merge remote-tracking branch 'remotes/friendica/master' into moveme
2012-11-05 09:37:58 +01:00
friendica
1d91b2d1b3
Merge https://github.com/friendica/friendica into pull
2012-11-04 13:43:42 -08:00
friendica
caebcc5e83
rev update
2012-11-04 13:43:28 -08:00
friendica
cc50abeabe
Merge pull request #522 from zzottel/master
...
Delete contents from a user when he removes his account
2012-11-04 13:40:45 -08:00
Thomas Willingham
973efa0c75
Oops, re-kill the dead snake.
2012-11-04 20:02:41 +00:00
Thomas Willingham
190ab46e18
Only show "Welcome to $Sitename" if you haven't made your own homepage.
2012-11-04 19:58:59 +00:00
Thomas Willingham
234598280d
Merge remote-tracking branch 'upstream/master'
2012-11-04 19:56:33 +00:00
zottel
6aca58f320
Merge remote branch 'upstream/master'
2012-11-04 11:05:40 +01:00
friendica
0627fdcce7
positional params in "was tagged in a photo" string
2012-11-03 15:29:47 -07:00
friendica
f076d7f0dc
Merge https://github.com/friendica/friendica into pull
2012-11-03 14:44:46 -07:00
friendica
3303d9db75
put 1i8n position orders in welcome string
2012-11-03 14:43:48 -07:00
zottel
2871fd4793
Depublish public posts when archiving a contact
2012-11-02 23:54:03 +01:00
zottel
7de5c7ebe1
Changes to make contacts delete all content from the user when a user is deleted.
...
NOTE: I didn't add "AND account_removed = 0" to facebook.php because I don't
have a clone of the addons repository. Please someone do that for me. Thanks.
Please check carefully. I tested locally on my server, but not with other
servers.
2012-11-02 21:43:47 +01:00
fermionic
d3290f314f
Merge pull request #521 from fermionic/20121101-updates
...
Various updates
2012-11-02 12:26:49 -07:00
friendica
e8fa4279fa
no profile pic on photos page if no photos have been uploaded
2012-11-02 04:20:12 -07:00
Zach Prezkuta
c6a3b87359
update_display for display live updates
2012-11-01 18:36:11 -06:00
Zach Prezkuta
c9248b66db
display live update; don't collapse comments on live update
2012-11-01 18:31:50 -06:00
Zach Prezkuta
e9b26ffbb3
prevent double posting of status updates and comments
2012-11-01 17:14:42 -06:00
Fabrixxm
1a3a5ee8d9
moveme: first successful relocated user
2012-10-31 17:13:45 +01:00
friendica
e2ca9e9db5
poco - ignore archived contacts
2012-10-30 14:25:33 -07:00
Fabrixxm
c51e057fe6
Merge remote branch 'friendica/master' into moveme
2012-10-29 05:57:58 -04:00
friendica
88c8387c44
revive "mark everything seen" on main network page - see comments
2012-10-26 14:29:42 -07:00
friendica
2347a4326c
get rid of 'Friendika'
2012-10-18 21:51:45 -07:00
Fabrixxm
65d235017c
move account. first step.
...
export basic account data as json
import basic account data in db (dbs must be at same schema version)
2012-10-17 11:13:01 -04:00
friendica
3af16ff92a
Merge https://github.com/friendica/friendica into pull
2012-10-14 17:16:41 -07:00
friendica
dec5298248
rev update
2012-10-14 17:16:25 -07:00
Michael Johnston
939227e820
Moved comment box on photos to be after the last comment, added text for the Preview link
2012-10-14 14:41:31 -04:00
fermionic
ca21f1bbc8
Merge pull request #512 from fermionic/auto-redir-for-local-hub-contacts
...
for profile and photos, detect contacts from local hub and auto-redir
2012-10-11 17:24:11 -07:00
fermionic
2f3d118e77
Merge pull request #508 from fermionic/no-theme-control-of-live-update-location
...
allow themes to decide where live updates appear
2012-10-10 17:34:28 -07:00
friendica
816db4396a
better fix for threads with no parent showing up as unseen
2012-10-10 16:17:40 -07:00
friendica
8a1f9d32ab
Merge https://github.com/friendica/friendica into pull
2012-10-10 15:59:05 -07:00
friendica
675aa56b02
rev update - prevent messages with no parent from being counted as unseen, because they cannot ever be cleared
2012-10-10 15:57:40 -07:00
fermionic
14d8033e54
Merge pull request #510 from fermionic/lockview-plugin-support
...
allow changing the lockview content with a plugin
2012-10-10 07:04:08 -07:00
Zach Prezkuta
b9818185db
for profile and photos, detect contacts from local hub and auto-redir
2012-10-09 09:50:24 -06:00
Zach Prezkuta
86d6f380dc
add home_init hook to manage to call startpage plugin
2012-10-09 09:47:14 -06:00
Zach Prezkuta
96a245409b
allow changing the lockview content with a plugin
2012-10-09 09:45:54 -06:00
Zach Prezkuta
0ea89852d2
allow themes to decide where live updates appear
2012-10-09 09:41:33 -06:00
Domovoy
8e50b3f9ce
Use saved_searches_aside.tpl in search.php
2012-10-02 16:03:20 +02:00
fermionic
9daafe7489
Merge pull request #501 from fermionic/network-remember-filters
...
don't set a date as a group
2012-10-01 13:08:48 -07:00
Zach Prezkuta
c6061d598f
don't set a date as a group
2012-10-01 14:07:32 -06:00
fabrixxm
9d4fdee65d
Merge pull request #500 from fabrixxm/quattro-fontsoptions
...
Quattro fixes
2012-10-01 07:05:58 -07:00
Fabrixxm
864d022468
editpost: add short jot action text to edit post form
2012-10-01 10:00:25 -04:00
friendica
112fafcc81
consistent handling of scaled images when using imagick
2012-09-30 03:25:20 -07:00
friendica
e60c729b51
Merge pull request #495 from fermionic/email-optimization
...
send less messages to server; remove delete option
2012-09-30 01:58:07 -07:00
friendica
c9536ac056
Merge pull request #498 from fermionic/more-robust-tag-conversion
...
allow tagging of people by name or nickname
2012-09-30 01:55:23 -07:00
Zach Prezkuta
421c72d10f
remember combination of last tab selected, last group selected, and last network selected; update only items seen in selected filters
2012-09-29 17:56:50 -06:00
Zach Prezkuta
ce73cd560f
allow tagging of people by name or nickname
2012-09-29 17:55:40 -06:00
Zach Prezkuta
f4f3c8375f
send less messages to server; remove delete option
2012-09-29 17:50:34 -06:00
friendica
ebabd25717
order photo album list in blog (reverse date) order
2012-09-29 06:08:44 -07:00
friendica
c357fddea7
photo "conversation streams" need work - quite a bit of it
2012-09-29 06:04:01 -07:00
friendica
260b0f7fe8
rev update
2012-09-27 19:53:23 -07:00
friendica
41db3fb983
declare array separately, doesn't work well when defined in hook
2012-09-26 04:50:24 -07:00
friendica
d1d5eca258
network_ping hook for next generation "page"/"forums" plugin
2012-09-26 04:46:54 -07:00
friendica
b6b8f40fa9
Merge https://github.com/friendica/friendica into pull
2012-09-21 18:10:32 -07:00
friendica
c2af97ef61
rev update
2012-09-21 18:04:09 -07:00
Zach Prezkuta
da7c5b19b1
allow hidden comments phrase to be accessed separately as number and text
2012-09-19 21:31:26 -06:00
friendica
490c98b7db
fix events
2012-09-19 00:44:37 -07:00
friendica
0b59d30e34
more infrastructure for ignored events
2012-09-18 22:49:05 -07:00
friendica
fa14723ef5
Merge https://github.com/friendica/friendica into pull
2012-09-18 17:44:38 -07:00
friendica
5cad3e114a
give themes more control over events/birthdays and provide them as notifications
2012-09-18 17:43:09 -07:00
friendica
6ebd56012a
Merge pull request #479 from fermionic/album-image-inserted-too-large
...
dont insert images larger than scale level 2
2012-09-18 15:46:41 -07:00
Zach Prezkuta
cd25573038
select based on dimensions instead of scale level
2012-09-17 21:46:36 -06:00
Fabrixxm
6aa45fb9cc
admin: Don't allow to block or delete site admin in users admin page. fix bug 471
2012-09-17 08:48:43 -04:00
Zach Prezkuta
364f56e8bd
dont insert images larger than scale level 2
2012-09-16 19:07:12 -06:00
friendica
ee5ed6b963
Merge https://github.com/friendica/friendica into pull
2012-09-15 15:24:28 -07:00
friendica
669d2b890e
rev update - add cancel markup to editor
2012-09-15 15:23:15 -07:00
Zach Prezkuta
8a4dcc28c1
make size search less greedy
2012-09-14 18:33:07 -06:00
Zach Prezkuta
f445ed47df
fix permissions for uploaded images with size specified
2012-09-14 18:22:56 -06:00
friendica
39b296a87d
ostatus disabled typo
2012-09-14 06:04:25 -07:00
friendica
20938d07cd
typo on previous checkin - set max number of images for an inserted link, default 2.
2012-09-13 23:01:10 -07:00
friendica
32d4a359f1
reverse the default newuser privacy setting to public. Sites can over-ride.
2012-09-13 19:11:07 -07:00
Zach Prezkuta
e8acdb31bc
add mobile toggle to frost mobile
2012-09-12 21:35:51 -06:00
friendica
a8d12061ca
rev update + multiple profile photos
2012-09-11 18:56:38 -07:00
friendica
624fd44502
Merge https://github.com/friendica/friendica into pull
2012-09-08 18:34:32 -07:00
friendica
7bec5778ba
provide option to view photo albums in posted order (rather than blog order)
2012-09-08 18:33:28 -07:00
Zach Prezkuta
63d02d98c5
add settings sections and add contacts; other tweaks and fixes
2012-09-07 12:17:03 -06:00
friendica
5c0f0df59a
provide local_block - block_public as far as content but can connect with the grid.
2012-09-06 20:17:50 -07:00
Zach Prezkuta
77529ccdf1
allow individual choice of mobile themes
2012-09-06 17:24:34 -06:00
friendica
1478229abc
allow comments on other folks wall-to-wall postings
2012-09-05 18:24:06 -07:00
friendica
3968dc932f
update writable for dfrn contacts when using local delivery
2012-09-05 16:26:11 -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
friendica
39c7b34276
rev update
2012-09-02 01:47:04 -07:00
friendica
2ace7d6646
Merge pull request #451 from fabrixxm/master
...
fixes and tweaks
2012-08-31 01:26:03 -07:00
fermionic
9ae5ae6df5
Merge pull request #448 from fermionic/limit-items-on-all-pages
...
limit number of items on profile page too
2012-08-28 19:03:15 -07:00
fermionic
8c064069d9
Merge pull request #443 from fermionic/new-users-privacy-settings
...
automatically make posts private for new users
2012-08-28 19:02:51 -07:00
Fabrixxm
9ecb984285
Merge remote branch 'friendica/master' into bid-prov
2012-08-28 10:38:40 -04:00
647802f92e
get "ago" information into the mail thread view
2012-08-27 19:46:35 +02:00
1e9d35fb0e
pass "ago" information to the mail_list template
2012-08-27 19:31:41 +02:00
Zach Prezkuta
c681e69794
limit number of items on profile page too; add show more back to Frost mobile; some show more fixes
2012-08-26 15:21:26 -06:00
Zach Prezkuta
1ffd67f291
hey: you missed a spot
2012-08-25 15:07:39 -06:00
Zach Prezkuta
f062ccbb66
add documentation; add to admin panel; some tweaks and interface stuff
2012-08-25 15:03:16 -06:00
friendica
386b6d081b
moods
2012-08-22 21:36:55 -07:00
friendica
bcec1bddc0
put the real post time into the post
2012-08-19 14:39:43 -07:00
Zach Prezkuta
d00c98b8b8
template was loaded in the wrong place
2012-08-18 13:28:49 -06:00
friendica
1e3ebccb97
Merge https://github.com/friendica/friendica into pull
2012-08-15 17:16:24 -07:00
