Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Merge branch 'master' of git://github.com/friendica/friendica | Alexander Kampmann | 2012-03-22 | 1 | -18/+40 | |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: boot.php database.sql include/template_processor.php update.php | |||||
| * | | | added simple build-in profiling | Alexander Kampmann | 2012-03-15 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | rev update | friendica | 2012-04-05 | 1 | -1/+1 | |
| |_|/ |/| | | ||||||
* | | | bug: diaspora_enabled setting turns it on but doesn't fully turn it off. | friendica | 2012-04-04 | 1 | -1/+2 | |
| | | | ||||||
* | | | remove loozah themes which fell too far behind to recover | friendica | 2012-04-03 | 1 | -1/+1 | |
| | | | ||||||
* | | | bug #363 and a couple of other reported ssl link issues | friendica | 2012-04-02 | 1 | -1/+1 | |
| | | | ||||||
* | | | allow users to set categories on their posts | Michael Johnston | 2012-04-01 | 1 | -0/+5 | |
| | | | ||||||
* | | | slight improvement in handling of plaintext feeds | friendica | 2012-04-01 | 1 | -1/+1 | |
| | | | ||||||
* | | | send unverified private mail using zrl | friendica | 2012-04-01 | 1 | -0/+7 | |
| | | | ||||||
* | | | ensure all new users get a timezone. We'll use UTC until they choose otherwise. | friendica | 2012-03-31 | 1 | -0/+4 | |
| | | | ||||||
* | | | escape % in file_tag_query as it is ultimately embedded in a sprintf | friendica | 2012-03-31 | 1 | -1/+1 | |
| | | | ||||||
* | | | settings for unknown private mail acceptance | friendica | 2012-03-31 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge branch 'pull' | friendica | 2012-03-30 | 1 | -5/+10 | |
|\ \ \ | ||||||
| * | | | allow themes to use "style.php" instead of "style.css". | Fabio Comuni | 2012-03-30 | 1 | -5/+10 | |
| | | | | | | | | | | | | | | | | Load style.php trhu mod/view.php to pass it friendica framework. | |||||
* | | | | don't delete contact from a friend request if friendship was already established | friendica | 2012-03-30 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | use zrl to get home again | friendica | 2012-03-29 | 1 | -0/+18 | |
| | | | ||||||
* | | | typo in function name | friendica | 2012-03-29 | 1 | -1/+1 | |
| | | | ||||||
* | | | network permission ids | friendica | 2012-03-28 | 1 | -1/+23 | |
| | | | ||||||
* | | | bug #349 - email notls setting | friendica | 2012-03-28 | 1 | -1/+1 | |
| | | | ||||||
* | | | viewsrc: return only body if page is requested via ajax | Fabio Comuni | 2012-03-28 | 1 | -0/+4 | |
| | | | ||||||
* | | | profile_tabs hook | friendica | 2012-03-27 | 1 | -1/+6 | |
| | | | ||||||
* | | | turn on gecko spellcheck in tinymce | friendica | 2012-03-27 | 1 | -1/+1 | |
| | | | ||||||
* | | | revup | friendica | 2012-03-26 | 1 | -1/+1 | |
| | | | ||||||
* | | | theme screenshots | friendica | 2012-03-25 | 1 | -1/+1 | |
| | | | ||||||
* | | | NOTIFY_SYSTEM | friendica | 2012-03-25 | 1 | -0/+3 | |
| | | | ||||||
* | | | prevent duplicate friend suggestions | friendica | 2012-03-24 | 1 | -1/+1 | |
| | | | ||||||
* | | | network filter is now a permission group | friendica | 2012-03-24 | 1 | -1/+1 | |
| | | | ||||||
* | | | ability to change tags in edited posts | friendica | 2012-03-22 | 1 | -1/+1 | |
| |/ |/| | ||||||
* | | prevent re-registrations using a deleted username - not an issue with ↵ | friendica | 2012-03-22 | 1 | -1/+1 | |
| | | | | | | | | Friendica but could create a serious privacy issue with federated platforms | |||||
* | | add comix-plain | friendica | 2012-03-21 | 1 | -1/+1 | |
| | | ||||||
* | | slightly relax overly strict permissions in community and search to match ↵ | friendica | 2012-03-20 | 1 | -1/+1 | |
| | | | | | | | | those in display - tl;dr public conversations are publicly visible | |||||
* | | refactor openid logins/registrations | friendica | 2012-03-19 | 1 | -1/+1 | |
| | | ||||||
* | | some openid fixes, use identity url from openid server and normalise it. | friendica | 2012-03-19 | 1 | -2/+3 | |
| | | ||||||
* | | revup | friendica | 2012-03-18 | 1 | -1/+1 | |
| | | ||||||
* | | bug #337, call template_unescape() only at the end of template processing | friendica | 2012-03-17 | 1 | -1/+1 | |
| | | ||||||
* | | compare ssl_policy precisely in case somebody was bitten by template ↵ | friendica | 2012-03-17 | 1 | -1/+1 | |
| | | | | | | | | processor bug | |||||
* | | scheme checking for webservers without $_SERVER['HTTPS'] | friendica | 2012-03-16 | 1 | -1/+6 | |
| | | ||||||
* | | wrong link in d* comment notifications | friendica | 2012-03-16 | 1 | -1/+1 | |
| | | ||||||
* | | track whether contact is a community page or not | friendica | 2012-03-15 | 1 | -2/+2 | |
| | | ||||||
* | | roll protocol version due to ssl_policy settings | friendica | 2012-03-14 | 1 | -1/+1 | |
| | | ||||||
* | | force login to ssl on SSL_POLICY_SELFSIGN | friendica | 2012-03-14 | 1 | -7/+11 | |
| | | ||||||
* | | ssl_policy stuff | friendica | 2012-03-14 | 1 | -4/+15 | |
| | | ||||||
* | | revup | friendica | 2012-03-14 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'pull' | friendica | 2012-03-13 | 1 | -2/+2 | |
|\ \ | ||||||
| * \ | Merge pull request #129 from CatoTH/master | friendica | 2012-03-13 | 1 | -2/+2 | |
| |\ \ | | | | | | | | | CSRF-Protection and minor changes | |||||
| | * | | Merge branch 'master' of git://github.com/friendica/friendica | Tobias Hößl | 2012-03-12 | 1 | -1/+1 | |
| | |\| | ||||||
| | * | | Merge branch 'master' of git://github.com/friendica/friendica | Tobias Hößl | 2012-03-11 | 1 | -1/+1 | |
| | |\ \ | ||||||
| | * \ \ | Merge branch 'master' of git://github.com/friendica/friendica | Tobias Hößl | 2012-03-09 | 1 | -2/+2 | |
| | |\ \ \ | ||||||
| | * \ \ \ | Merge remote branch 'upstream/master' | Tobias Hößl | 2012-02-28 | 1 | -2/+2 | |
| | |\ \ \ \ | ||||||
| | * | | | | | Avoid notices | Tobias Hößl | 2012-02-28 | 1 | -1/+1 | |
| | | | | | | |