Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:fabrixxm/friendica | Fabio Comuni | 2012-01-02 | 30 | -307/+643 |
|\ | |||||
| * | Merge remote-tracking branch 'friendica/master' | Fabio Comuni | 2011-12-22 | 3 | -7/+19 |
| |\ | |||||
| * | | quattro: contacts and first photo page | Fabio Comuni | 2011-12-22 | 10 | -114/+208 |
| * | | quattro: more on editor | Fabio Comuni | 2011-12-22 | 6 | -9/+95 |
| * | | Merge remote-tracking branch 'friendica/master' | Fabio Comuni | 2011-12-21 | 6 | -7/+33 |
| |\ \ | |||||
| * | | | quattro: more on editor | Fabio Comuni | 2011-12-21 | 3 | -0/+23 |
| * | | | Merge remote-tracking branch 'friendica/master' | Fabio Comuni | 2011-12-20 | 7 | -5/+30 |
| |\ \ \ | |||||
| * | | | | quattro: more on editor | Fabio Comuni | 2011-12-20 | 4 | -5/+67 |
| * | | | | Merge remote-tracking branch 'friendica/master' | Fabio Comuni | 2011-12-19 | 23 | -59/+276 |
| |\ \ \ \ | |||||
| * | | | | | quattro: fix icons in oauth settings page | Fabio Comuni | 2011-12-19 | 1 | -2/+2 |
| * | | | | | quattro: first work on jot style | Fabio Comuni | 2011-12-19 | 6 | -186/+253 |
| * | | | | | config: set/get arrays with pconfig | Fabio Comuni | 2011-12-19 | 1 | -4/+8 |
| * | | | | | icons: lock and unlock | Fabio Comuni | 2011-12-19 | 12 | -1/+1 |
* | | | | | | try again on the network page sql optimisation | friendica | 2012-01-02 | 1 | -7/+12 |
* | | | | | | revert sql optimisation - js updates broken | friendica | 2012-01-02 | 1 | -5/+4 |
* | | | | | | long running query on network page - optimise out the double sub-select | friendica | 2012-01-01 | 1 | -4/+5 |
* | | | | | | bug #250 typo in database.sql | friendica | 2012-01-01 | 1 | -1/+1 |
* | | | | | | extensible notify structure | friendica | 2012-01-01 | 3 | -3/+10 |
* | | | | | | change default ostatus poll interval | friendica | 2012-01-01 | 2 | -2/+2 |
* | | | | | | notification data type | friendica | 2012-01-01 | 3 | -3/+40 |
* | | | | | | function not defined | friendica | 2011-12-30 | 2 | -1/+5 |
* | | | | | | migrate more notifications | friendica | 2011-12-29 | 3 | -122/+32 |
* | | | | | | hide contacts on approval | friendica | 2011-12-29 | 5 | -4/+15 |
* | | | | | | add notifications to d* private messages | friendica | 2011-12-27 | 1 | -0/+13 |
* | | | | | | Merge branch 'pull' | friendica | 2011-12-27 | 4 | -11/+54 |
|\ \ \ \ \ \ | |||||
| * | | | | | | translation of email templates | Tobias Diekershoff | 2011-12-26 | 2 | -0/+42 |
| * | | | | | | translation of email template | Tobias Diekershoff | 2011-12-26 | 1 | -5/+6 |
| * | | | | | | translation of the email template | Tobias Diekershoff | 2011-12-26 | 1 | -6/+6 |
* | | | | | | | notification testing | friendica | 2011-12-27 | 3 | -10/+10 |
* | | | | | | | notify_intro | friendica | 2011-12-26 | 3 | -19/+40 |
* | | | | | | | extending notifications to other types | friendica | 2011-12-26 | 5 | -144/+52 |
|/ / / / / / | |||||
* | | | | | | new notification module working for "email message received" | friendica | 2011-12-25 | 3 | -128/+66 |
* | | | | | | Merge branch 'master' into notify | friendica | 2011-12-25 | 2 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'pull' | friendica | 2011-12-25 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge pull request #20 from Keith2/master | friendica | 2011-12-25 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | modified: settings.php corrected TLS email connector not working due to sp... | root | 2011-12-25 | 1 | -1/+1 |
| | |/ / / / / / | |||||
| * | | | | | | | revup | friendica | 2011-12-25 | 1 | -1/+1 |
| * | | | | | | | revup | friendica | 2011-12-24 | 1 | -1/+1 |
* | | | | | | | | more enotify | friendica | 2011-12-25 | 2 | -14/+16 |
* | | | | | | | | more enotify | friendica | 2011-12-24 | 3 | -10/+46 |
* | | | | | | | | more work on enotify | friendica | 2011-12-23 | 2 | -8/+91 |
* | | | | | | | | Merge branch 'master' into notify | friendica | 2011-12-23 | 1 | -1/+1 |
|\| | | | | | | | |||||
| * | | | | | | | revup | friendica | 2011-12-23 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'master' into notify | friendica | 2011-12-23 | 0 | -0/+0 |
|\| | | | | | | | |||||
| * | | | | | | | preparation for 3g email contacts | friendica | 2011-12-23 | 1 | -1/+7 |
| |/ / / / / / | |||||
* | | | | | | | preparation for 3rd generation email contacts | friendica | 2011-12-23 | 1 | -1/+7 |
* | | | | | | | Merge branch 'master' into notify | friendica | 2011-12-22 | 1 | -5/+3 |
|\| | | | | | | |||||
| * | | | | | | improved cid search | friendica | 2011-12-22 | 1 | -5/+3 |
* | | | | | | | Merge branch 'master' into notify | friendica | 2011-12-22 | 34 | -2483/+2848 |
|\| | | | | | | |||||
| * | | | | | | revup | friendica | 2011-12-22 | 1 | -1/+1 |
| | |_|_|_|/ | |/| | | | |