Commit Graph

1690 Commits

Author SHA1 Message Date
Dan Moore fbb7757c4b Cleaning up comments at top of favor.php. 2009-06-30 17:04:49 -07:00
Zach Copley ccbc5c447d Merge commit 'jeff-themovie/small-fixes' into 0.8.x
* commit 'jeff-themovie/small-fixes':
  Fix missing max_id in API search calls
  Fix "Trying to get property of non-object" errors when a user tries to log in using an unknown nickname
  Fix "Trying to get property of non-object" errors when accessing the people search results page
  Fix "Undefined variable: cnt"
  Fix "Trying to get property of non-object" errors in groupeditform.php
  Fix "Undefined property: DisfavorAction::$id"
2009-06-30 16:25:52 -07:00
Zach Copley b10dba2798 Merge commit 'jeff-themovie/invite-enabled' into 0.8.x
* commit 'jeff-themovie/invite-enabled':
  Adds $config['invite']['enabled'] to enable/disable invites.
2009-06-30 16:10:12 -07:00
Zach Copley 190d45cd05 Merge commit 'jeff-themovie/notice-search-no-results' into 0.8.x
* commit 'jeff-themovie/notice-search-no-results':
  Fixes the notice search RSS feeds / API results for searches that return no matches.
2009-06-30 15:38:14 -07:00
Zach Copley c2c631d19d Merge commit 'jeff-themovie/group-rss-empty' into 0.8.x
* commit 'jeff-themovie/group-rss-empty':
  Fixes two PHP Warnings ("Invalid argument supplied for foreach() in /var/www/mmmu/lib/rssaction.php") when accessing the RSS feed of a group that has no notices.
2009-06-30 15:12:50 -07:00
Zach Copley 907b5f7b40 Merge commit 'erichelgeson/no-posts-verbage' into 0.8.x
* commit 'erichelgeson/no-posts-verbage':
  Needed the else. Tested logged in/out ; site closed/inviteonly/both
  Verbage of a closed invite only site, it shouldnt ask you to register.
2009-06-30 14:57:19 -07:00
Evan Prodromou c5ce56b878 calculate date once for SUP 2009-06-30 11:53:50 -04:00
Evan Prodromou 4e6cd42757 conversation code changes 2009-06-30 11:50:16 -04:00
Zach Copley c01e8c0bd1 Fixed grammar in class comment blocks 2009-06-29 17:04:09 -07:00
Zach Copley 4321e02c7b Delete orphaned background imgs. Design settings code now passes
phpcs.
2009-06-29 16:57:36 -07:00
Zach Copley d19ffc73c2 Merge branch '0.8.x' into design_reset
* 0.8.x:
  Using max-width:480px for settings_design_background-image image
  Using role for admin indicator. Added margin-left.
2009-06-29 15:38:17 -07:00
Sarven Capadisli 1268be4f82 Using role for admin indicator. Added margin-left. 2009-06-29 22:07:16 +00:00
Zach Copley 135927e42a Allow users and groups to reset their design to system default colors 2009-06-29 14:52:38 -07:00
Evan Prodromou 5b8e40aaa9 admin indicators in groups 2009-06-29 10:29:11 -04:00
Evan Prodromou d03b8c4276 show section with admins in sidebar of group 2009-06-29 10:22:17 -04:00
Evan Prodromou 70521d55a8 log IP for API auth errors 2009-06-27 07:37:58 -07:00
Zach Copley 96ba25c34b Added readonly flag to FileAction just in case 2009-06-26 18:31:24 -07:00
Jeffery To 612a107e09 Merge branch '0.8.x' into small-fixes 2009-06-26 15:44:31 +08:00
Jeffery To 71dc910a53 Merge branch '0.8.x' into notice-search-no-results 2009-06-26 15:42:37 +08:00
Jeffery To 6328add622 Merge branch '0.8.x' into invite-enabled 2009-06-26 15:31:42 +08:00
Jeffery To 899aad747a Merge branch '0.8.x' into group-rss-empty 2009-06-26 15:30:24 +08:00
Zach Copley b47a1b3b57 Merge branch '0.8.x' into attachment-fixup
* 0.8.x:
  Added functionality to remove the notice data attachment
  max public page
2009-06-25 15:44:17 -07:00
Zach Copley 37796a8dc6 Make shorturls in notice content point to AttachmentAction urls 2009-06-25 15:42:17 -07:00
Evan Prodromou b53b6b8769 Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-06-25 14:02:41 -07:00
Zach Copley 03d31911e1 FileAction redirections weren't being added (e.g.: /notice/$notice_id/file) 2009-06-25 13:51:29 -07:00
Evan Prodromou a7cdf32df5 max public page 2009-06-25 13:23:59 -07:00
Evan Prodromou 638905c270 avoid getting duplicate errors on upload 2009-06-25 11:10:34 -07:00
Evan Prodromou 4d56bc6a0a streamline the file action 2009-06-25 11:08:32 -07:00
Evan Prodromou 3ca9e85ce4 update conversations to use newer query format 2009-06-25 09:43:30 -07:00
Zach Copley e3c5d1664f Take out noisy debugging statement 2009-06-24 16:10:28 -07:00
Zach Copley 98f518b9af fix bug in which design background could accidentally get removed 2009-06-24 00:00:36 -07:00
Zach Copley 57903bf2ac Make gateway notices available to the auth user in the API 2009-06-23 15:53:49 -07:00
Zach Copley f04a54ed2f Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
* '0.8.x' of git@gitorious.org:laconica/dev: (61 commits)
  Using default theme design values (it was previously set to identica
  Updated default colour theme and IE6 colours for transparent values
  chmod +x delete_status_network.sh
  rm -Rf, not rmdir
  script to delete a status network
  chmod allsites.php
  script to show all sites on a network
  use different name for connection and database
  use /etc/laconica/setup.cfg instead of local file
  other base directories
  On XHR notice post, calls NoticeAttachment to trigger thumbnail and
  oembed and thumbnail don't need sequences
  add innodb by default to status networks
  pwgen not pwdgen
  make pwgen command configurable
  a little sql script to drop full-text index and use innodb for profile and notice
  remove common_debug from newnotice
  append uploads to content rather than showing them double
  use a subclass for single notice items to show attachments
  make file command configurable
  ...
2009-06-23 14:29:46 -07:00
Zach Copley 31325f0995 Stop Twitter gateway notices from leaking via user faves pages 2009-06-23 13:51:23 -07:00
Jeffery To 280f8faab4 Merge branch '0.8.x' into small-fixes
Conflicts:
	lib/peoplesearchresults.php
	lib/profilelist.php
2009-06-24 01:25:55 +08:00
Jeffery To 65f784120b Merge branch '0.8.x' into notice-search-no-results 2009-06-24 01:18:35 +08:00
Evan Prodromou e261a97150 remove common_debug from newnotice 2009-06-23 07:48:33 -07:00
Evan Prodromou a21a9f26c5 append uploads to content rather than showing them double 2009-06-23 07:29:43 -07:00
Evan Prodromou e2becdb251 use a subclass for single notice items to show attachments 2009-06-23 07:25:18 -07:00
Evan Prodromou 7bcaa858af make file command configurable 2009-06-23 05:35:20 -07:00
Zach Copley d9bebfd651 Attachment upload server and path now configurable 2009-06-22 22:48:31 +00:00
Evan Prodromou aec6456c91 Update copyright dates in files modified in 2009 2009-06-20 16:12:55 -07:00
Evan Prodromou 793a6a1155 change Controlez-Vous to Control Yourself 2009-06-20 16:00:04 -07:00
Evan Prodromou 3f54840b51 Only show twitter msgs in your own inbox 2009-06-18 11:45:48 -07:00
Evan Prodromou 3a0c6d6c6d Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-06-18 07:45:06 -07:00
Zach Copley 3f032bc36e Left out some new user and group theming file in the previous commit 2009-06-18 02:16:39 -07:00
Zach Copley 57274d21ba Group theming. 2009-06-18 02:01:06 -07:00
Evan Prodromou ba3a484a65 order notices in a conversation 2009-06-18 00:12:53 -07:00
Zach Copley 6c7bdf9df6 Merge branch 'userdesign' into 0.8.x
* userdesign: (56 commits)
  Fix for background image repetition for various page heights
  Removed height:100% for better background image repetition
  A little more specific selector for notice reply
  Have user favorites page show user's design
  Placed a check to make sure there is a reply button in a notice before
  Make MailboxAction read only
  Remove stale reference to deprecated personal.php
  Uppercase hex color values
  Default to image being on, no tile after upload
  Fix sidebar color bug default design
  Update background image settings to use bitflags
  It was accidently removed
  Dynamically tile background image  and turn background image on or off
  Show a background img in settings form
  IE7/8 CSS update for user design
  Enable tiling of background imgs for Designs
  Added background image tile flag to Design
  Init styles for tile and image use on/off for user design settings
  Added form option to tile background image and to turn it on and off
  Add background dir
  ...
2009-06-17 18:49:25 -07:00
Zach Copley 06240450ef Have user favorites page show user's design 2009-06-17 18:05:12 -07:00