aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* fix registration email (sitename)friendica2013-07-181-1/+1
* fix default channel setting after importfriendica2013-07-182-9/+16
* start using profile_flags in photo queries so we can start creating PHOTO_THI...friendica2013-07-182-17/+41
* validate input to import_xchan(), as we don't consistently check it prior to ...friendica2013-07-181-0/+7
* Merge https://github.com/friendica/red into zpullfriendica2013-07-181-2/+4
|\
| * Merge pull request #81 from git-marijus/masterThomas Willingham2013-07-181-2/+4
| |\
| | * make home link on remote sites work againmarijus2013-07-181-2/+4
| |/
* / use (numeric) abook_id for friends/followers in Twitter API. Many existing cl...friendica2013-07-182-8/+8
|/
* position the visage timestampfriendica2013-07-171-0/+4
* fix template syntaxfriendica2013-07-171-1/+1
* update friends/followers API so Friendica Android client won't chokefriendica2013-07-172-6/+5
* block duplicate channelsfriendica2013-07-173-2/+12
* Merge https://github.com/friendica/red into zpullfriendica2013-07-171-1/+1
|\
| * Merge pull request #80 from git-marijus/patch-1Thomas Willingham2013-07-171-1/+1
| |\
| | * Update style.cssgit-marijus2013-07-171-1/+1
| |/
* / usability improvements on abook permissions settings - keep advanced dialogue...friendica2013-07-172-6/+30
|/
* Merge https://github.com/friendica/red into zpullfriendica2013-07-17172-900/+27
|\
| * Observer permissions (but not ACL yet) for webpages.Thomas Willingham2013-07-161-0/+11
| * Kill autogenerated warnings, plus a typo.Thomas Willingham2013-07-16171-898/+14
| * Whitespace making smarty fartThomas Willingham2013-07-161-2/+2
* | configurable theme precedence rules, and passing the page owner to the pcss t...friendica2013-07-175-7/+50
* | provide a controlling user for theme settings, not necessarily local_user() -...friendica2013-07-164-15/+36
* | define some photo types; primarily profile photos and things, but there is ro...friendica2013-07-163-1/+38
|/
* photo_flags - for adding taxonomy photos and other stuff.friendica2013-07-163-2/+12
* parse_url: add missing scheme unless url begins with '/'friendica2013-07-162-1/+5
* theme the page link titlefriendica2013-07-152-1/+8
* add channel_name to delivery logs because it is a bit more useful than an xch...friendica2013-07-152-11/+12
* Merge https://github.com/friendica/red into zpullfriendica2013-07-154-23/+22
|\
| * Merge pull request #78 from git-marijus/masterfriendica2013-07-154-23/+22
| |\
| | * style updates due to spin.js portingmarijus2013-07-151-4/+4
| | * more spin.js portingmarijus2013-07-153-19/+18
| |/
* / fix some issues that showed up in the logs.friendica2013-07-152-8/+16
|/
* more diagnosticsfriendica2013-07-153-4/+4
* provide a way to search the directory by modification datefriendica2013-07-142-2/+16
* implement the other part of ITEM_NOCOMMENT - which means an item is not comme...friendica2013-07-141-1/+7
* more error checkingfriendica2013-07-141-3/+7
* fix xtagfriendica2013-07-143-11/+19
* Merge https://github.com/friendica/red into zpullfriendica2013-07-141-2/+0
|\
| * Nobody died, so remove not-needed logging.Thomas Willingham2013-07-151-2/+0
* | more logging on hubloc import - figure out why it did not get stored.friendica2013-07-141-1/+2
|/
* looks like it actually needs both files.friendica2013-07-141-0/+1
* add the jquery version, not the standalone spinnerfriendica2013-07-141-1/+1
* we need to actually include spin.js or it causes issuesfriendica2013-07-142-1/+2
* Merge https://github.com/friendica/red into zpullfriendica2013-07-1412-28/+464
|\
| * Merge pull request #77 from git-marijus/masterfriendica2013-07-1412-28/+464
| |\
| | * port jot to spin.jsgit-marijus2013-07-131-0/+6
| | * port jot to spin.jsgit-marijus2013-07-131-1/+1
| | * port jot to spin.jsgit-marijus2013-07-131-3/+3
| | * port jot to spin.jsgit-marijus2013-07-131-1/+1
| | * port jot to spin.jsgit-marijus2013-07-131-1/+1