eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity
13,688 Commits 8 Branches 3 Tags
0155198ffaaa06f17eeb974fe7712aa62b86bed6
Commit Graph

348 Commits

Author SHA1 Message Date
Zach Copley
e1ac64f2cb Add current class to selected menu items 2011-06-09 19:29:19 -04:00
Zach Copley
36d619480a Rip out user, group and site design customization code 
Squashed commit of the following:

commit 0bcfb6535115ec0a11669420f8689aeedc417bc8
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 15:51:47 2011 -0400

    Remove design-related stuff from the API

commit 88da010256fbcaee1ff01d9507ea47d3225f2825
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 15:40:16 2011 -0400

    Mop up misc design related code

commit 11958b064745b797b4c9f9f4b7e8f65e4c82ce83
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 15:21:00 2011 -0400

    Remove Design DB_DataObject class and references to it in schema

commit f8540594728ce6ba4697eb21657ccb897a9fc127
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 13:15:54 2011 -0400

    Remove design-related actions and widgets

commit ddf7b4d425b88b58956b8be06047d2a3e0560bd2
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 13:10:57 2011 -0400

    Remove navigation / routing to design settings actions

commit e3f280f8780d99168edf37ef766956f281e9c5da
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 13:03:09 2011 -0400

    CurrentUserDesignAction -> Action

commit 6780b1a07e1375a7fa0fd48c8bf3109d9a12e33e
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 12:54:22 2011 -0400

    * GroupDesignAction -> GroupAction (new base class for group actions)

commit 2136377e895db274709a1d486f377f13946ccfd6
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 12:36:40 2011 -0400

    OwnerDesignAction -> Action
 2011-06-09 16:20:19 -04:00
Zach Copley
895447f3dc Upgrade anti-framing, anti-clickjacking code 2011-06-06 06:08:17 +00:00
Evan Prodromou
c97048d01b merge 0.9.x into 1.0.x 2011-05-04 14:59:39 -07:00
Samantha Doherty
368b810a0e Add new Infield Label jQuery plugin files to action.php 2011-04-18 00:27:46 -04:00
Shashi Gowda
45952ff164 "Lists with you" and "List subscriptions" in the right aside, "Lists" in the left aside 2011-04-14 19:49:43 +00:00
Siebrand Mazeland
f0d762f196 Update/add translator documentation. 
L10n/i18n updates.
Superfluous whitespace removed.
Add FIXME for a few i18n issues I couldn't solve this quickly.

Takes care of documentation for all core code added in merge of "people tags" feature (Commit:e75c9988ebe33822e493ac225859bc593ff9b855).
 2011-04-10 19:59:55 +02: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
57198a7464 Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase 
Conflicts:
	actions/tagother.php
	lib/subscriberspeopleselftagcloudsection.php
	lib/subscriptionspeopleselftagcloudsection.php
 2011-04-04 13:26:27 +05:30
Siebrand Mazeland
c17d8e0f5f Update translator documentation. 
i18n tweaks.
Add FIXME for missing class documentation.
Remove superfluous whitespace.
 2011-04-01 19:47:22 +02: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
ec5a43bf4f let actions set a default address for toselector 2011-03-28 16:24:02 -04:00
Shashi Gowda
31c1177970 Merge branch '1.0.x' into people_tags_rebase 
Conflicts:
	EVENTS.txt
	actions/peopletag.php
	actions/tagother.php
	classes/Notice.php
	js/util.js
	js/util.min.js
	lib/accountprofileblock.php
	lib/action.php
	lib/activityobject.php
	lib/command.php
	lib/personalgroupnav.php
	plugins/OStatus/OStatusPlugin.php
 2011-03-22 07:56:25 +05:30
Evan Prodromou
60a237ac62 some flushing in the UI 2011-03-17 15:26:37 -04:00
Evan Prodromou
a430540155 configuration option to bust frames or not 2011-03-17 11:32:14 -04:00
Evan Prodromou
0791d0034f return Ajax-y XML on exceptions 2011-03-16 18:53:46 -04:00
Evan Prodromou
f242cf0e58 move profile block to the aside 2011-03-16 09:57:09 -04:00
Evan Prodromou
a72dbc1aff add a profile block to left column 2011-03-16 09:57:07 -04:00
Evan Prodromou
41420449f8 Merge branch 'jqueryui' into 1.0.x 
Conflicts:
	lib/action.php
 2011-03-16 09:56:26 -04:00
Evan Prodromou
afa1aa6c9b Revert "use jquery-ui for input_forms tabset" 
This reverts commit c4bada9022.
 2011-03-16 09:53:27 -04:00
Samantha Doherty
4334bb7132 Adding wrapper divs for equal height columns. 2011-03-14 15:30:51 -04:00
Brion Vibber
4e2a0e2fd0 Use non-minified jQuery when $config['site']['minify'] is off; aids in debugging when something fails deep in jQuery-land. 2011-03-11 14:48:47 -08:00
Brion Vibber
0f3af3e3b7 Keep 'Status' tab current while showing the placeholder -- pretend like it's a mini version of the status notice form :D 2011-03-10 18:01:40 -08:00
Brion Vibber
771682b6eb Add placeholder status form for the top (needs to hook up to JS) 2011-03-10 17:40:25 -08:00
Evan Prodromou
c4bada9022 use jquery-ui for input_forms tabset 2011-03-10 10:53:11 -06:00
Evan Prodromou
a5daed0aa8 load jquery-ui css and js by default 2011-03-10 10:28:08 -06:00
Brion Vibber
040baf291d Fix for input tab selection 2011-03-09 13:05:12 -08:00
Brion Vibber
1f9a9c69bc Only show the site_nav_object block if Action::showObjectNav has been overridden to do something. 
(Copied similar check from showPageNoticeBlock, handy!)
 2011-03-09 12:07:26 -08:00
Brion Vibber
0a19949f6d Allow theme.ini to specify external CSS URLs, such as Google Font API loaders. 
Example theme.ini:

  external="http://fonts.googleapis.com/css?family=Lato:100,100italic,300,300italic,400,400italic,700,700italic,900,900italic"
  include=rebase

Notes:
* URLs must be quoted in the .ini file or the .ini file parser explodes!
* To do multiples, list as external[] instead of external.
* If there's an included base theme, any externals it lists will be included first.
* All externals are loaded before any local styles.
 2011-03-09 11:38:43 -08:00
Brion Vibber
7f42e48631 section class on object nav 2011-03-09 10:53:45 -08:00
Brion Vibber
1f86f45bb9 Move object menu into aside 2011-03-09 10:38:44 -08:00
Evan Prodromou
b7a8863b27 lost a </div> in input_forms 2011-03-07 15:06:21 -05:00
Evan Prodromou
55b4303ea4 Merge branch '3cl' into 1.0.x 2011-03-07 14:30:30 -05:00
Evan Prodromou
2272044ad1 wrapper div for primary nav 2011-03-07 12:42:51 -05:00
Evan Prodromou
cf1a4d8292 Input form switcher works 
This change adds the input form switcher, which adds a navigation menu
across the top of the input form, letting you switch between different kinds of input.

The input menu doesn't yet look like a nice set of tabs; it could use some love.
 2011-03-07 04:57:49 -05:00
Evan Prodromou
7aa55f8200 made the input-form switcher work, kinda 2011-03-07 03:34:20 -05:00
Shashi Gowda
382e4d2cdb people tag actions 2011-03-07 00:43:31 +05:30
Brion Vibber
77a3017e9e Can now set $config['site']['minify'] = false; to use util.js and friends non-minified; aids in browser-side debugging. 2011-03-03 16:53:16 -08:00
Brion Vibber
5a404ee713 'Comment' -> 'Reply' in inline comment/reply messages 2011-03-03 12:26:07 -08:00
Evan Prodromou
53db4c2b85 move notice form to content block 2011-03-02 22:09:11 -05:00
Evan Prodromou
0e1a221423 add object menu to actions, default empty 2011-03-01 15:52:46 -05:00
Evan Prodromou
7d77bdcc48 move top-level navigation to default local navigation 2011-03-01 06:30:51 -05:00
Evan Prodromou
903053caec primary and secondary nav use menu superclass 2011-03-01 05:46:03 -05:00
Brion Vibber
59a0b2a82d Merge branch '1.0.x' of gitorious.org:statusnet/mainline into inline-comments 
Conflicts:
	js/util.min.js
 2011-02-28 16:18:38 -08:00
Brion Vibber
62712b794a More interactive magic for inline replies: placeholder at the end of list 2011-02-28 16:13:16 -08:00
Zach Copley
b7d0746694 Merge branch '0.9.x' into 1.0.x 
Conflicts:
	actions/confirmaddress.php
	actions/emailsettings.php
	actions/hostmeta.php
	actions/imsettings.php
	actions/login.php
	actions/profilesettings.php
	actions/showgroup.php
	actions/smssettings.php
	actions/urlsettings.php
	actions/userauthorization.php
	actions/userdesignsettings.php
	classes/Memcached_DataObject.php
	index.php
	lib/accountsettingsaction.php
	lib/action.php
	lib/common.php
	lib/connectsettingsaction.php
	lib/designsettings.php
	lib/personalgroupnav.php
	lib/profileaction.php
	lib/userprofile.php
	plugins/ClientSideShorten/ClientSideShortenPlugin.php
	plugins/Facebook/FBConnectSettings.php
	plugins/Facebook/FacebookPlugin.php
	plugins/NewMenu/NewMenuPlugin.php
	plugins/NewMenu/newmenu.css
 2011-02-28 15:39:43 -08:00
Brion Vibber
e89bffc3f1 Work in progress: setting up inline reply mini-form in js 2011-02-28 15:38:54 -08:00
Brion Vibber
836f4ea6ea fix - Notice: Undefined variable: action in /Library/WebServer/Documents/mublog/lib/action.php on line 521 2011-02-28 11:02:38 -08:00
Brion Vibber
2a42dac72a Partial implementation for ticket #2442: MobileProfile plugin should allow manual switching between regular and mobile rendering modes 
http://status.net/open-source/issues/2442

Notes:
* Mapstraction causes JavaScript errors in XHTML mode, breaking our code if we're run later so the link doesn't work to get back to Desktop.
* not 100% sure how safe feature detection is here?
* Currently will be useless but visible links if no JS available; need to fall back to server-side for limited browsers
 2011-02-21 16:10:07 -08:00
Brion Vibber
9573f725c1 Merge branch '0.9.x' into testing 2011-01-31 11:08:15 -08:00