aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | 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
| | * | port like button to spin.jsgit-marijus2013-07-131-1/+3
| | * | port like button to spin.jsgit-marijus2013-07-131-1/+1
| | * | port like button to spin.jsgit-marijus2013-07-131-1/+1
| | * | port like button to spin.jsgit-marijus2013-07-131-2/+2
| | * | port like button to spin.jsgit-marijus2013-07-131-7/+7
| | * | Update conv_frame.tplgit-marijus2013-07-131-0/+1
| | * | slight change to #page-spinnergit-marijus2013-07-131-1/+2
| | * | Update main.jsgit-marijus2013-07-131-1/+1
| | * | Update main.jsgit-marijus2013-07-131-1/+2
| | * | Update main.jsgit-marijus2013-07-131-3/+2
| | * | port to spin.jsgit-marijus2013-07-131-2/+1
| | * | slight change for #nav-search-spinnergit-marijus2013-07-131-3/+1
| | * | port to spin.jsgit-marijus2013-07-131-1/+1
| | * | port to spin.jsgit-marijus2013-07-131-2/+2
| | * | Create jquery.spin.jsgit-marijus2013-07-131-0/+80
| | * | Create spin.jsgit-marijus2013-07-131-0/+349
* | | | install typofriendica2013-07-141-1/+1
|/ / /
* | | Merge https://github.com/friendica/red into zpullfriendica2013-07-1420-38/+87
|\ \ \
| * | | Give prettyphoto it's own template to make themeing it less annoying.Thomas Willingham2013-07-143-21/+8
| * | | That should fix uploads...Thomas Willingham2013-07-131-1/+1
| * | | Old theme stuff we don't use anymore.Thomas Willingham2013-07-129-0/+0
| * | | Small amount of work on webpages.Thomas Willingham2013-07-124-14/+42
| * | | Make sure we load the channel theme when displaying a page.Thomas Willingham2013-07-121-1/+18
| * | | Merge pull request #76 from git-marijus/patch-4Thomas Willingham2013-07-111-1/+1
| |\ \ \
| | * | | Update boot.phpgit-marijus2013-07-111-1/+1
| |/ / /
| * | | DocoThomas Willingham2013-07-112-0/+15
| * | | Merge pull request #74 from beardy-unixer/masterThomas Willingham2013-07-103-3/+5
| |\ \ \
| | * | | Non-translatable string plus feature enabled checkThomas Willingham2013-07-113-3/+5
* | | | | new doc pagesfriendica2013-07-146-0/+459
* | | | | Add self to recipient lists. Sure we already have a copy but it's possible ou...friendica2013-07-1491-1546/+1774
|/ / / /
* | | | Merge pull request #73 from beardy-unixer/masterfriendica2013-07-107-6/+248
|\| | |
| * | | One of those days...Thomas Willingham2013-07-102-13/+55
| * | | Let's use the right files, plus a typoThomas Willingham2013-07-103-282/+31
| * | | Minimum value webpagesThomas Willingham2013-07-104-1/+400
| * | | Merge remote-tracking branch 'upstream/master'Thomas Willingham2013-07-1080-674/+1210
| |\ \ \ | |/ / / |/| | |