bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity
7657 commits 4 branches 62 tags 178 MiB
Commit graph

2065 commits

Author SHA1 Message Date
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