GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity
17,506 Commits 8 Branches 4 Tags
d179afa303ce83c2e8c8a1f4dc94e093eb44bcec
Commit Graph

17506 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
abjectio
b0a598ba7b Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly 2015-06-06 11:31:18 +02:00
abjectio
e269a3fad9 Added ChooseTheme plugin to the repository 2015-06-06 11:28:34 +02:00
Chimo
47c83f4c49 Only serve tagprofile HTML if we aren't POSTing via ajax 
This fixes an issue where POSTing the selftag form in the
profile_block sidebar via AJAX would generate an XML response
containing both the content from doPost() and showPage(),
resulting in invalid XML.

These changes make it so that if we're POSTing via AJAX,
we serve content from doPost(), otherwise we serve showPage()
but never both.
 2015-06-06 00:22:14 -04:00
mmn
1635d459ec Merge branch 'threaded_replies_nightly' into 'nightly' 
Fix threaded replies floating

Following Marcus fixes for neo-quitter, I think the floating of replies should be fixed directly in the base theme. What do you think? This issue affects all derived themes (although sometimes only marginally) see https://gnusocial.no/conversation/126588.

These commits implement some of Marcus floating fixes directly in base plus the fav, reply icons are better aligned with the permalink and timestamp (notice-options change).

See merge request !7
 2015-06-05 22:38:13 +00:00
aroquen
77db161aca Threaded replies and conversations do not float left 2015-06-06 00:23:54 +02:00
aroquen
b3667c72c7 Align notice-options with timestamp and permalink 2015-06-06 00:23:23 +02:00
mmn
e3b1d401fd Merge branch 'nightly' into 'nightly' 
Updated neo-quitter

Updated neo-quitter to match the colors of the default theme
Fixed alignment issues
Changed threaded view to inline in order to make it more readable

See merge request !6
 2015-06-05 21:44:49 +00:00
Mikael Nordfeldth
ad7cd155fb floating elements CSS fix by aroque 2015-06-05 23:44:59 +02:00
Mikael Nordfeldth
882ce56cf4 buttle's local/plugins translation file fix 2015-06-05 23:43:28 +02:00
Mikael Nordfeldth
29e1203609 Merge request for documentation and URLs 2015-06-05 23:16:22 +02:00
mmn
a3011febdf Merge branch 'nightly' into 'nightly' 
Fixing broken links during end of installation #26 - https://git.gnu.io/gnu/gnu-social/issues/26

See merge request !2
 2015-06-05 21:10:53 +00:00
Mikael Nordfeldth
6e28524647 Extensions of GalleryActions enabled again (nickname check) 2015-06-05 21:50:00 +02:00
Mikael Nordfeldth
c26e08d6a6 some more extensions of ShowstreamAction broke in last commit 2015-06-05 21:49:34 +02:00
Mikael Nordfeldth
9376a6d75a ModPlus plugin now links to remote profiles with UserbyidAction 2015-06-05 21:30:50 +02:00
Mikael Nordfeldth
8ad81a6aa3 Allow showing profiles with UserbyidAction (/user/:id) 2015-06-05 21:24:41 +02:00
abjectio
c00b2ecc4b Merge branch 'nightly' of git.gnu.io:gnu/gnu-social into nightly 2015-06-05 20:57:28 +02:00
root
dd2fb27316 improved favocin 2015-06-05 19:12:17 +02:00
Marcus Moeller
bc7eb792f4 updated favicon color 2015-06-05 17:08:35 +02:00
Marcus Moeller
abfa052861 use none instead of unset 2015-06-05 16:54:55 +02:00
Marcus Moeller
dbfc8092d7 even display threads inline if no user is logged in 2015-06-05 16:47:41 +02:00
Marcus Moeller
6137d301be set threaded view to inline to make it more readable 2015-06-05 16:37:34 +02:00
Marcus Moeller
af87552e04 updated neo-quitter colours to match the default theme, fixed some alignment and margin issues 2015-06-05 16:21:04 +02:00
Mikael Nordfeldth
94f5247f91 $this->client_ip was not always set in AntiBrutePlugin onEndCheckPassword 2015-06-05 15:34:14 +02:00
Mikael Nordfeldth
dee4ca37ab GROUPS_PER_MINILIST was undefined in profileaction.php 2015-06-05 14:07:03 +02:00
Mikael Nordfeldth
b24d711f55 Network wide feed link would NEVER show! 2015-06-05 14:01:03 +02:00
Mikael Nordfeldth
50f0235654 Oops, don't forget to remove var_dump(...) 2015-06-04 22:34:28 +02:00
Mikael Nordfeldth
cafab14f2b Modernize File_redirection to use Managed_DataObject functions 2015-06-04 22:33:36 +02:00
Mikael Nordfeldth
63251fb9d0 Modernize File_thumbnail to use Managed_DataObject functions 2015-06-04 22:29:40 +02:00
Mikael Nordfeldth
fc9de94cbd Modernize Queue_item to use Managed_DataObject functions 2015-06-04 22:27:53 +02:00
Mikael Nordfeldth
f9698598c6 Modernize Profile_prefs to use Managed_DataObject functions 2015-06-04 22:26:31 +02:00
Mikael Nordfeldth
d1afc78124 Modernize File_to_post to use Managed_DataObject functions 2015-06-04 22:22:49 +02:00
Mikael Nordfeldth
ebdd792b6f getByPK (primary key) lookup for Managed_DataObject instances 2015-06-04 22:17:40 +02:00
Mikael Nordfeldth
ca19a5cd6d Easier pkeyCols call to get primary key columns 2015-06-04 21:51:56 +02:00
Mikael Nordfeldth
20145092ce Publish OAuth data in host-meta 2015-06-04 18:54:09 +02:00
Mikael Nordfeldth
5718f812d9 Network public publicgroupnav link would always show 2015-06-04 17:39:23 +02:00
Mikael Nordfeldth
fe6498e7c8 Send objects instead of integers to File_to_post::processNew 2015-06-04 17:36:11 +02:00
Mikael Nordfeldth
5358fb3cce Use the same cache string in all places for file:notice-ids 2015-06-04 17:02:45 +02:00
Mikael Nordfeldth
9449235765 Remove some clutter from OMB plugin 2015-06-04 01:14:26 +02:00
Mikael Nordfeldth
a4739b0107 Move some last OpenID stuff into the OpenID plugin (XRDS) 2015-06-04 01:08:03 +02:00
Mikael Nordfeldth
bdd15cfe63 don't double the output for some PublicAction->extraHead 2015-06-04 00:56:46 +02:00
Mikael Nordfeldth
26631bf9e6 Show network public feed link in PublicGroupNav 2015-06-04 00:53:35 +02:00
Mikael Nordfeldth
551c69ed56 Extend Networkpublic and Public actions from SitestreamAction 2015-06-04 00:51:07 +02:00
Mikael Nordfeldth
2b2ebfc254 bump version to 1.2.0-alpha1 
since we fixed the search issue and updated jquery
 2015-06-03 22:57:58 +02:00
Mikael Nordfeldth
fd121f371a case insensitive indexing for content and nick/fullnames (search) 
This broke when changing the database to utf8mb4 instead of utf8,
since utf8_general_ci wasn't accepted and the engine fell back to
utf8mb4_bin. Now we're back in case insensitive search business!
 2015-06-03 22:43:51 +02:00
Mikael Nordfeldth
c5da7306bd return logic tidied up for command interpretation 2015-06-02 14:25:45 +02:00
Mikael Nordfeldth
2bf0ec719d initialize command interpretation result to false 2015-06-02 14:17:59 +02:00
Mikael Nordfeldth
7e388e697d fallback to local URL if reply->getUrl() is missing 
Remote Activity notices generally don't have a proper HTTP URL associated.
 2015-06-02 13:55:13 +02:00
Mikael Nordfeldth
0726dcd06c Start using NoParentNoticeException more widely 2015-06-02 13:50:52 +02:00
Mikael Nordfeldth
c84b21008e Notice->getParent code reuse 
...not entirely sure whether to allow getParent calls on Notice
objects which have not been created, but we'll leave that in for now...
 2015-06-02 13:46:23 +02:00
Mikael Nordfeldth
6b9a8b7b19 Reuse code from our classes, don't write own algorithms 2015-06-02 13:45:22 +02:00