aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:fabrixxm/friendicaFabio Comuni2012-01-0230-307/+643
|\
| * Merge remote-tracking branch 'friendica/master'Fabio Comuni2011-12-223-7/+19
| |\
| * | quattro: contacts and first photo pageFabio Comuni2011-12-2210-114/+208
| * | quattro: more on editorFabio Comuni2011-12-226-9/+95
| * | Merge remote-tracking branch 'friendica/master'Fabio Comuni2011-12-216-7/+33
| |\ \
| * | | quattro: more on editorFabio Comuni2011-12-213-0/+23
| * | | Merge remote-tracking branch 'friendica/master'Fabio Comuni2011-12-207-5/+30
| |\ \ \
| * | | | quattro: more on editorFabio Comuni2011-12-204-5/+67
| * | | | Merge remote-tracking branch 'friendica/master'Fabio Comuni2011-12-1923-59/+276
| |\ \ \ \
| * | | | | quattro: fix icons in oauth settings pageFabio Comuni2011-12-191-2/+2
| * | | | | quattro: first work on jot styleFabio Comuni2011-12-196-186/+253
| * | | | | config: set/get arrays with pconfigFabio Comuni2011-12-191-4/+8
| * | | | | icons: lock and unlockFabio Comuni2011-12-1912-1/+1
* | | | | | try again on the network page sql optimisationfriendica2012-01-021-7/+12
* | | | | | revert sql optimisation - js updates brokenfriendica2012-01-021-5/+4
* | | | | | long running query on network page - optimise out the double sub-selectfriendica2012-01-011-4/+5
* | | | | | bug #250 typo in database.sqlfriendica2012-01-011-1/+1
* | | | | | extensible notify structurefriendica2012-01-013-3/+10
* | | | | | change default ostatus poll intervalfriendica2012-01-012-2/+2
* | | | | | notification data typefriendica2012-01-013-3/+40
* | | | | | function not definedfriendica2011-12-302-1/+5
* | | | | | migrate more notificationsfriendica2011-12-293-122/+32
* | | | | | hide contacts on approvalfriendica2011-12-295-4/+15
* | | | | | add notifications to d* private messagesfriendica2011-12-271-0/+13
* | | | | | Merge branch 'pull'friendica2011-12-274-11/+54
|\ \ \ \ \ \
| * | | | | | translation of email templatesTobias Diekershoff2011-12-262-0/+42
| * | | | | | translation of email templateTobias Diekershoff2011-12-261-5/+6
| * | | | | | translation of the email templateTobias Diekershoff2011-12-261-6/+6
* | | | | | | notification testingfriendica2011-12-273-10/+10
* | | | | | | notify_introfriendica2011-12-263-19/+40
* | | | | | | extending notifications to other typesfriendica2011-12-265-144/+52
|/ / / / / /
* | | | | | new notification module working for "email message received"friendica2011-12-253-128/+66
* | | | | | Merge branch 'master' into notifyfriendica2011-12-252-2/+2
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'pull'friendica2011-12-251-1/+1
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge pull request #20 from Keith2/masterfriendica2011-12-251-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | modified: settings.php corrected TLS email connector not working due to sp...root2011-12-251-1/+1
| | |/ / / / / /
| * | | | | | | revupfriendica2011-12-251-1/+1
| * | | | | | | revupfriendica2011-12-241-1/+1
* | | | | | | | more enotifyfriendica2011-12-252-14/+16
* | | | | | | | more enotifyfriendica2011-12-243-10/+46
* | | | | | | | more work on enotifyfriendica2011-12-232-8/+91
* | | | | | | | Merge branch 'master' into notifyfriendica2011-12-231-1/+1
|\| | | | | | |
| * | | | | | | revupfriendica2011-12-231-1/+1
* | | | | | | | Merge branch 'master' into notifyfriendica2011-12-230-0/+0
|\| | | | | | |
| * | | | | | | preparation for 3g email contactsfriendica2011-12-231-1/+7
| |/ / / / / /
* | | | | | | preparation for 3rd generation email contactsfriendica2011-12-231-1/+7
* | | | | | | Merge branch 'master' into notifyfriendica2011-12-221-5/+3
|\| | | | | |
| * | | | | | improved cid searchfriendica2011-12-221-5/+3
* | | | | | | Merge branch 'master' into notifyfriendica2011-12-2234-2483/+2848
|\| | | | | |
| * | | | | | revupfriendica2011-12-221-1/+1
| | |_|_|_|/ | |/| | | |