eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity
16,115 Commits 8 Branches 3 Tags 310 MiB
ff0a93a0ba
Commit Graph

942 Commits

Author SHA1 Message Date
Mikael Nordfeldth
31bace8cfd updated and moved jquery-jcrop (no longer .min.js) 
This won't run properly if other scripts stop javascript execution before
it's time to crop (such as in the Bookmark plugin, which when writing this
hasn't been migrated to Jquery 2.x - so it stops on a '.die' call).

Some images were cleaned up from the theme/base/images/illustrations too.
 2013-09-14 13:31:16 +02:00
Mikael Nordfeldth
4f065d6483 Removed jOverlay as it's outdated and not referenced 2013-09-12 15:57:32 +02:00
Mikael Nordfeldth
3858897c10 farbtastic removed along with userdesign stuff 
...I couldn't find anywhere this was being used in current code...
 2013-09-10 18:26:48 +02:00
Mikael Nordfeldth
f79aec36fe Merge remote-tracking branch 'statusnet/master' 
This merges GNU Social with current development of StatusNet. The only conflicts were some documentation, where GNU Social's versions were retained.

Conflicts:
	doc-src/about
	doc-src/faq
	plugins/OpenID/doc-src/openid
 2013-08-12 12:23:17 +02:00
Evan Prodromou
3fc1d245a1 Merge 1.1.x into master 2013-07-16 10:57:06 -07:00
Jean Baptiste Favre
d1e46e61ac Add same CSS rules for #remoteprofile than for #showstream. Allows to hide avatars, like for local profiles. 2013-06-15 18:41:04 +02:00
Evan Prodromou
206c090688 Squashed commit of the following: 
commit 7ef19ab918cc9805abb8d01e8220ae4ed63155d7
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jul 9 12:53:29 2012 -0400

    Show link to facebook account on profile block

    If you've logged in with Facebook, show a link to that account on the profile block.

commit b56967479c009d702150791944dbd80746ee3ba1
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jul 9 12:28:34 2012 -0400

    Add profile link from profile block to Twitter account

    Add a profile link to Twitter for accounts that are linked via Twitter login.

commit 181e441fd03c6034e737f6a3dae115557aa3e1aa
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jul 9 11:57:56 2012 -0400

    OpenID shows other account links

commit ef7357883dad9e34af2746e1c6a41ea826d7c992
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jul 9 11:53:12 2012 -0400

    Add a profile link for OpenIDs

    OpenID plugin now adds a profile link for each OpenID on the account.

commit 093d26b95bc453686d24c42f5a8f4739cb338fd2
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jul 9 11:15:18 2012 -0400

    Better array access

commit 49d47257efdcae2101b589a1f825872bdd70667c
Author: Evan Prodromou <evan@status.net>
Date:   Mon Jul 9 10:57:16 2012 -0400

    Show list of other accounts in profile block

    We add a group of "rel-me" links to other user accounts on the Web.

    This is mostly useful for when you've used OpenID, Twitter, or
    Facebook login to associate a remote account.

    There's an extension to the profileblock recipe to show the links as
    little icons; there's a new hook in accountprofileblock to get such
    links from plugins.

    There's a modification to the base theme to show the icons correctly
    (I think).
 2012-07-09 12:56:09 -04:00
Evan Prodromou
f2a98e2329 show group aliases on group profile block 2011-09-30 12:23:10 -04:00
Samantha Doherty
70355c0edd Updated RTL.css for neo 2011-09-26 15:01:12 -04:00
Samantha Doherty
76821df931 Whoops quick fix fornewschool conversations. 2011-09-26 08:41:40 -04:00
Samantha Doherty
800c7a616b A little style for oldschool conversation layout. 2011-09-26 08:27:04 -04:00
Samantha Doherty
9995d9b5a4 Make addressee groups italic. 2011-09-23 16:42:12 -04:00
Samantha Doherty
f65fa42e15 Update RTL stylesheet for neo. 2011-09-22 09:27:36 -04:00
Samantha Doherty
b15aea653d Improved browser compatibility for various gradients. 2011-09-22 09:27:15 -04:00
Samantha Doherty
39cf27c0e9 A little more IE style cleanup. 2011-09-22 09:26:03 -04:00
Samantha Doherty
5711655d7b Quick update of theme README file. 2011-09-22 09:19:46 -04:00
Evan Prodromou
4f01bcaf52 Merge remote-tracking branch 'origin/1.0.x' into 1.0.x 2011-09-20 11:07:43 -04:00
Samantha Doherty
771c9ebc20 Stupid typo in my last commit to base display.css. 2011-09-18 22:26:10 -04:00
Evan Prodromou
7f2f333528 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-09-18 19:43:55 -04:00
Evan Prodromou
01ea6a18f9 make activity plugin use its own notice source 2011-09-18 12:40:17 -04:00
Samantha Doherty
edbe03b193 Minor layout fix for shownotice page. 2011-09-17 18:26:54 -04:00
Samantha Doherty
0db83327de RTL stylesheet for neo theme by Osama Khalid. 2011-09-07 00:35:58 -04:00
Samantha Doherty
21011cfc92 Don't italicize replies to activity events. 2011-08-27 10:54:19 -04:00
Samantha Doherty
34d9c35885 Remove duplicate icons from base theme. 2011-08-27 10:49:18 -04:00
Samantha Doherty
c2d5c8cd39 A little more theme cleanup. 2011-08-27 07:58:20 -04:00
Samantha Doherty
41f06d96d4 Quick fix to make custom site logos work better. 2011-08-26 15:35:00 -04:00
Samantha Doherty
37bb0e6d20 Style cleanup for ostatus forms. 2011-08-26 12:51:55 -04:00
Samantha Doherty
a3769e4bf9 A few quick general form fixes. 2011-08-26 10:51:51 -04:00
Samantha Doherty
a0514281a0 Style for header search form. 2011-08-25 22:30:09 -04:00
Samantha Doherty
8ea5cd0cac Check for existence of RTL stylesheets; placeholder files for base and neo themes. 2011-08-25 17:48:27 -04:00
Samantha Doherty
2dd13b071c Update DirectionDetector style for 1.0 and move to base stylesheet. 2011-08-25 17:14:13 -04:00
Samantha Doherty
f0443aff1a Style for Activity notices. 2011-08-25 16:24:54 -04:00
Zach Copley
3bdae5aed4 Link in additional stylesheet for RTL languages 2011-08-25 13:12:44 -07:00
Samantha Doherty
9814de76fe Mobile Profile CSS for neo-light theme. 2011-08-25 12:30:21 -04:00
Samantha Doherty
c54b3311fd Style cleanup for QnA. 2011-08-25 12:25:10 -04:00
Samantha Doherty
85aba15830 Style cleanup for Mobile Profile. 2011-08-25 12:24:09 -04:00
Samantha Doherty
c777267f95 Fixes for ajax submit button styles when in processing state. 2011-08-24 19:22:59 -04:00
Samantha Doherty
20f25912d4 A little style fixup for oauth applications. 2011-08-19 15:45:17 -04:00
Samantha Doherty
23e5f25d8d Couple quick improvements for neo-blue theme. 2011-08-19 13:00:22 -04:00
Zach Copley
60a574ef28 Work improving the interface of the Event micro-app 
Squashed commit of the following:

commit da50b6b0223fcbc42cf45d01a138f08930917e71
Author: Zach Copley <zach@status.net>
Date:   Tue Aug 2 00:35:36 2011 -0700

    If end time < start time reset the end time selection

commit 6dfc35579e8e4bd0af9d85fc46799bcc462c68b1
Author: Zach Copley <zach@status.net>
Date:   Mon Aug 1 23:55:10 2011 -0700

    Populate event dates with sensible defaults

commit 0bc8d726706cfdc0830687e7f40e941e61691191
Author: Zach Copley <zach@status.net>
Date:   Mon Aug 1 23:29:46 2011 -0700

    Recalculate times if user changes start or end date

commit 6a92a31429b4eb6f442eaf850d59dcc5b121e57f
Author: Zach Copley <zach@status.net>
Date:   Mon Aug 1 23:03:46 2011 -0700

    * Better date/time display
    * Localize date and time display for user

commit 2bf344068a0eb6e3ed90efacbf33c85e7ee5edf7
Author: Zach Copley <zach@status.net>
Date:   Mon Aug 1 15:56:21 2011 -0700

    Reselect the end time after timelist update

commit 62fd0620eb5fcc94c240c0fc0b304aa17509de8d
Author: Zach Copley <zach@status.net>
Date:   Mon Aug 1 14:40:14 2011 -0700

    Fix bug in which end time was not properly in sync with start time + 30mins

commit 3c6bcfb2d962f3677082c468a29480d2a1813d73
Author: Zach Copley <zach@status.net>
Date:   Mon Aug 1 12:37:00 2011 -0700

    Pass exact URL of the timelist action to event.js

commit efc74841c5b588cdae686630a1b4c1448e5d742b
Author: Zach Copley <zach@status.net>
Date:   Mon Aug 1 11:20:45 2011 -0700

    Add Ajax error handling to new event action

commit 3085f4b3ed93bb930bff1bc475309b4d473ffc83
Author: Zach Copley <zach@status.net>
Date:   Fri Jul 22 01:18:13 2011 -0700

    Ajaxify event end-time selector

commit 8025c1d368d8f862b666702bfab08daf633a34ea
Author: Zach Copley <zach@status.net>
Date:   Thu Jul 21 21:58:43 2011 -0700

    Remove dead code

commit 5fbfff47297dea609a07d67a81d430f97f6698ef
Merge: bcd845d 3c926af
Author: Zach Copley <zach@status.net>
Date:   Thu Jul 21 15:21:58 2011 -0700

    Merge branch 'eventjs' of gitorious.org:~zcopley/statusnet/zcopleys-clone into eventjs

    * 'eventjs' of gitorious.org:~zcopley/statusnet/zcopleys-clone:
      Populate timei selection dropdowns and better CSS (thanks Sammy!)
      Event start/end as dropdowns
      Nothing to see here move along
      Don't allow user to set crazy start and end dates
      New event dates shouldn't ever be in the past, eh?
      Move event microapp JavaScript into included .js file

    Conflicts:
    	plugins/Event/event.js
    	plugins/Event/eventform.php

commit bcd845dc56c147c4ba10eedd43cc7aa799bc6a9a
Author: Zach Copley <zach@status.net>
Date:   Thu Jul 21 15:11:19 2011 -0700

    Move the helper functions for filling the start/end times to their own class

commit d246d39c4afbffb1e76cd561ab61f15dafd8a988
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 20 18:50:38 2011 -0700

    Populate time selection dropdowns and better CSS (thanks Sammy!)

commit 0778533fef5500db79e40664c5b56aa7d9cc8357
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 20 15:54:27 2011 -0700

    Event start/end as dropdowns

commit e800053fdf2cb12fc1f2eac72762d07571647aa8
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 19 14:12:01 2011 -0700

    Nothing to see here move along

commit a85949b9cc4f3b5bb387785d4b7a717e9d952752
Author: Zach Copley <zach@status.net>
Date:   Mon Jul 18 17:48:30 2011 -0700

    Don't allow user to set crazy start and end dates

commit 87d1301ce8aa8877e753440dd52166bf857b29f3
Author: Zach Copley <zach@status.net>
Date:   Sun Jul 17 22:31:24 2011 -0700

    New event dates shouldn't ever be in the past, eh?

commit 7e05aa5fdc02bfec6107bcf8c748627216d51405
Author: Zach Copley <zach@status.net>
Date:   Fri Jul 15 15:36:17 2011 -0700

    Move event microapp JavaScript into included .js file

commit 3c926af287f80ee389b5bc8a4c1dcc5e0904a14c
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 20 18:50:38 2011 -0700

    Populate time selection dropdowns and better CSS (thanks Sammy!)

commit af09c57d5132dba2a6a3e76974e38fdde6422c45
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 20 15:54:27 2011 -0700

    Event start/end as dropdowns

commit b585215ed7deb4dc9d4bbc065d36b6e3f819d710
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 19 14:12:01 2011 -0700

    Nothing to see here move along

commit e1d30ae9b80eded4ed7ef6bdd7515da64ae344de
Author: Zach Copley <zach@status.net>
Date:   Mon Jul 18 17:48:30 2011 -0700

    Don't allow user to set crazy start and end dates

commit ad7c99f021980b867f369066b4413bdb1e882986
Author: Zach Copley <zach@status.net>
Date:   Sun Jul 17 22:31:24 2011 -0700

    New event dates shouldn't ever be in the past, eh?

commit 4741f0a327e10e67fc04e2b816ed56351e38b4fa
Author: Zach Copley <zach@status.net>
Date:   Fri Jul 15 15:36:17 2011 -0700

    Move event microapp JavaScript into included .js file
 2011-08-02 01:17:56 -07:00
Samantha Doherty
baf4102da7 Quick fix for hidden threaded-replies issue in Chrome. 2011-07-26 15:36:20 -04:00
Samantha Doherty
4f50274249 Just a few wee themefixes. 2011-07-26 15:20:51 -04:00
Samantha Doherty
bf2710e721 Couple of quick variations on neo theme. 2011-07-13 18:06:54 -04:00
Samantha Doherty
c4590ed8b4 Just a couple quick neo theme fixes. 2011-07-13 18:06:12 -04:00
Evan Prodromou
feb53619cf Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 
Conflicts:
	js/util.min.js
 2011-07-07 10:27:54 -04:00
Evan Prodromou
1c917ac28f start making more menu work 2011-07-06 18:40:02 -04:00
Samantha Doherty
f0af9f45dd Big round of fixups for base and neo themes. 2011-07-06 12:50:42 -04:00
Evan Prodromou
e5d8fd6857 Add Activity Streams feeds to export data 2011-06-22 17:09:04 -04:00
Samantha Doherty
87c83de623 Style for SNOD company logo plugin temporarily goes here. 2011-06-09 20:22:18 -04:00
Samantha Doherty
e499939c6c Bit of style cleanup for design settings fixes. 2011-06-06 17:08:05 -04:00
Samantha Doherty
5791697bb0 Oops; tiny mistake in IE7 addressee stylin. 2011-05-31 12:48:59 -04:00
Samantha Doherty
dddb6185f3 Last bit of style cleanup for addressees and mobile profile. 2011-05-31 12:42:28 -04:00
Samantha Doherty
1264db7f78 A little more style fixing for MobileProfile. 2011-05-27 12:07:24 -04:00
Ian Denhardt
2e4ec0df0e Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline 2011-05-27 11:28:47 -04:00
Samantha Doherty
ba55d4d010 First batch of IE fixes. 2011-05-24 12:56:49 -04:00
Ian Denhardt
31b29fde50 Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline 
Conflicts:
	plugins/OStatus/actions/ostatusinit.php
 2011-05-23 21:50:48 -04:00
Samantha Doherty
1a165a5636 Interim style update for mobile profile. 2011-05-18 14:36:05 -04:00
Samantha Doherty
4549d36862 Change addressees arrow from hardcoded to CSS. 2011-05-18 09:49:01 -04:00
Samantha Doherty
f44e0330df Style for fancy invite form item controls. 2011-05-11 20:12:32 -04:00
Samantha Doherty
37cf7c0e8c Style for invite forms and width fix for Onboard popup. 2011-05-11 17:07:08 -04:00
Samantha Doherty
07d9832ce9 More stylin for user and group directories. 2011-05-05 15:59:15 -04:00
Samantha Doherty
daf1a4046b Style for Onboard plugin and a few new graphics. 2011-05-01 14:09:44 -04:00
Samantha Doherty
14389414b6 Fix for long local nav items. 2011-04-25 12:42:17 -04:00
Samantha Doherty
1a86d8dd12 Fix vertical alignment for feed icons. 2011-04-25 12:25:14 -04:00
Samantha Doherty
a2a8f88de1 Style for QnA, plus a bit of general cleanup for notices and threaded-replies. 2011-04-25 11:47:06 -04:00
Samantha Doherty
1870bc0da6 Bit of style cleanup for search. 2011-04-25 10:53:32 -04:00
Evan Prodromou
12723f2dc6 better output for bookmark list item 2011-04-20 06:34:27 -04:00
Samantha Doherty
45a2fdefea Style updates for notice forms. 2011-04-18 11:51:38 -04:00
Samantha Doherty
9bfb7f0888 Style for invite button. 2011-04-15 02:29:01 -04:00
Samantha Doherty
acaf86c973 Include Lato font in neo theme. 2011-04-14 23:20:49 -04:00
Samantha Doherty
603fc33eb3 Style for reduced avatar lists in aside. 2011-04-14 15:19:18 -04:00
Samantha Doherty
b511b59f15 Quick style fixup for realtime popup. 2011-04-14 02:57:34 -04:00
Samantha Doherty
3638f296a2 Remove privacy marker from non-private replies to private notices. 2011-04-11 13:39:46 -04:00
Samantha Doherty
73c28cc66c Localnav-type style for object nav. 2011-04-11 10:05:36 -04:00
Samantha Doherty
13e2acaf5c Formatting for profile/group account blocks and entity action buttons. 2011-04-11 10:05:36 -04:00
Samantha Doherty
2a546e0eeb Replacing old base theme with rebase theme. 2011-04-11 08:07:37 -04:00
Shashi Gowda
f47027abbe Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase 
Conflicts:
	lib/profileblock.php
	theme/default/css/display.css
 2011-04-09 21:57:45 +05:30
Evan Prodromou
af02de01e5 Remove incompatible theme victorian 2011-04-08 17:08:29 -04:00
Evan Prodromou
53df5470e8 Remove incompatible theme shiny 2011-04-08 17:08:29 -04:00
Evan Prodromou
c0697752d2 Remove incompatible theme pigeonthoughts 2011-04-08 17:08:29 -04:00
Evan Prodromou
86d99f3541 Remove incompatible theme mnml 2011-04-08 17:08:29 -04:00
Evan Prodromou
28d254e130 Remove incompatible theme identica 2011-04-08 17:08:29 -04:00
Evan Prodromou
eb4ec37add Remove incompatible theme h4ck3r 2011-04-08 17:08:29 -04:00
Evan Prodromou
0079a00042 Remove incompatible theme default 2011-04-08 17:08:29 -04:00
Evan Prodromou
400f5033f9 Remove incompatible theme cloudy 2011-04-08 17:08:29 -04:00
Evan Prodromou
ecf357f469 Remove incompatible theme cleaner 2011-04-08 17:08:28 -04:00
Evan Prodromou
6f8ecc2e7b Remove incompatible theme clean 2011-04-08 17:08:28 -04:00
Evan Prodromou
7ad0404e42 Remove incompatible theme biz 2011-04-08 17:07:06 -04:00
Samantha Doherty
e0c00449bb Hide legend and show best marker, for QnA answers when not displayed inline. 2011-04-08 11:10:34 -04:00
Samantha Doherty
43f341b68f Change feeds in sidebar to a vertical list. 2011-04-08 11:05:19 -04:00
Shashi Gowda
c44a94e8f5 Port autocomplete from tagInput to jQuery UI, send Last-Modified header and look for it in JS. 2011-04-08 14:51:05 +05:30
Shashi Gowda
ad86eb78d3 Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase 
Conflicts:
	js/util.min.js
	lib/default.php
 2011-04-07 23:13:45 +05:30
Samantha Doherty
f753258a74 Style for best QnA answer. 2011-04-05 13:23:41 -04:00
Samantha Doherty
5bc6a8c614 Style changes for privacy selectors and markers. 2011-04-05 12:38:15 -04:00
Samantha Doherty
a02da55eac A little more style for QnA. 2011-04-05 09:10:20 -04:00
Shashi Gowda
ced00cf0bd Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase 2011-04-05 10:28:05 +05:30
Samantha Doherty
a3ba11a8ac Style for QnA plugin. 2011-04-04 20:29:30 -04:00
Shashi Gowda
5a2bab07b2 Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase 
Conflicts:
	actions/tagother.php
	classes/Profile.php
	classes/Profile_tag.php
	js/util.min.js
 2011-03-30 15:47:42 +05:30
Evan Prodromou
dca5e20b91 Make the to-selector clear left 2011-03-28 16:23:31 -04:00
Ian Denhardt
d36f0707a4 Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline 2011-03-28 03:25:40 -04:00