Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | more work on mail2 (introductions), added 'm' (mail) flag to ACL backend for ↵ | friendica | 2012-04-23 | 2 | -6/+49 |
| | | | | autocomplete of PM recips | ||||
* | protect jappixmini/proxy from typo check, more work on email2 connector | friendica | 2012-04-23 | 1 | -1/+49 |
| | |||||
* | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-22 | 2 | -12/+28 |
|\ | |||||
| * | Merge pull request #258 from unary/api | friendica | 2012-04-22 | 1 | -12/+26 |
| |\ | | | | | | | api: add support for StatusNet-style media param to API | ||||
| | * | api: add support for StatusNet-style media param to API | Michael Johnston | 2012-04-22 | 1 | -12/+26 |
| | | | |||||
| * | | Merge branch 'master' of git://github.com/friendica/friendica | Tobias Hößl | 2012-04-22 | 1 | -0/+99 |
| |\| | |||||
| * | | Add a hook | Tobias Hößl | 2012-04-22 | 1 | -0/+2 |
| | | | |||||
* | | | don't allow non-existent themes as choices | friendica | 2012-04-22 | 1 | -2/+2 |
| |/ |/| | |||||
* | | Merge remote-tracking branch 'CatoTH/master' into req245 | Fabio Comuni | 2012-04-20 | 1 | -24/+96 |
|\| | |||||
| * | XSRF protection and PHPdoc for mod/admin.php | Tobias Hößl | 2012-04-18 | 1 | -4/+13 |
| | | |||||
| * | XSRF protection and PHPdoc for mod/admin.php | Tobias Hößl | 2012-04-18 | 1 | -20/+83 |
| | | |||||
* | | filebrowser: fix style, show 10 recent photos if not in an album | Fabio Comuni | 2012-04-18 | 1 | -2/+7 |
| | | |||||
* | | filebrowser: more style, load min and max scale photos | Fabio Comuni | 2012-04-18 | 1 | -29/+23 |
| | | |||||
* | | tinymce: add filebrowser for photos and attached files | Fabio Comuni | 2012-04-18 | 1 | -0/+100 |
|/ | |||||
* | Merge pull request #240 from CatoTH/master | friendica | 2012-04-17 | 2 | -2/+1 |
|\ | | | | | Some bugfixes / Notices | ||||
| * | Some Bugfixes, and variable checks | Tobias Hößl | 2012-04-17 | 2 | -2/+1 |
| | | |||||
* | | naked br appearing when attaching and textplain | friendica | 2012-04-17 | 1 | -1/+6 |
|/ | |||||
* | rev update | friendica | 2012-04-16 | 1 | -2/+5 |
| | |||||
* | Merge pull request #238 from annando/master | friendica | 2012-04-15 | 1 | -0/+29 |
|\ | | | | | API: Support of the statusnet application | ||||
| * | Merge commit 'upstream/master' | Michael Vogel | 2012-04-14 | 6 | -15/+218 |
| |\ | |||||
| * \ | Merge commit 'upstream/master' | Michael Vogel | 2012-04-13 | 2 | -50/+43 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: include/dba.php | ||||
| * \ \ | Merge commit 'upstream/master' | Michael Vogel | 2012-04-11 | 14 | -60/+130 |
| |\ \ \ | |||||
| * | | | | API: Improved the timeline. Several (disabled) tests with caching of photos. | Michael Vogel | 2012-04-11 | 1 | -0/+29 |
| | | | | | |||||
* | | | | | function name typo | friendica | 2012-04-15 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | track requested profile error msg | friendica | 2012-04-14 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | zrl on random profile | friendica | 2012-04-14 | 1 | -1/+1 |
| |_|_|/ |/| | | | |||||
* | | | | pass zrl's to/through global directory | friendica | 2012-04-14 | 1 | -1/+1 |
| | | | | |||||
* | | | | well that was a silly mistake... | friendica | 2012-04-13 | 1 | -2/+2 |
| | | | | |||||
* | | | | setting wasn't being applied | friendica | 2012-04-13 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge remote-tracking branch 'friendica/master' | Fabio Comuni | 2012-04-13 | 4 | -4/+179 |
|\ \ \ \ | |||||
| * | | | | bug #369 - show contacts who are not in any groups | friendica | 2012-04-12 | 1 | -0/+65 |
| | | | | | |||||
| * | | | | extended the "interesting" profile attributes | friendica | 2012-04-12 | 1 | -1/+8 |
| | | | | | |||||
| * | | | | send link directly to profile tab | friendica | 2012-04-12 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | stray log statements | friendica | 2012-04-12 | 1 | -2/+0 |
| | | | | | |||||
| * | | | | profile change activities | friendica | 2012-04-12 | 2 | -7/+102 |
| | | | | | |||||
| * | | | | allow setting default new friend notify | friendica | 2012-04-12 | 2 | -1/+11 |
| | | | | | |||||
| * | | | | turn off new friend activity by default | friendica | 2012-04-12 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* / | | | admin: change global theme settings | Fabio Comuni | 2012-04-13 | 1 | -9/+37 |
|/ / / | |||||
* | | | reverting recent db driver changes - won't install cleanly, won't update ↵ | friendica | 2012-04-12 | 1 | -1/+1 |
| | | | | | | | | | | | | cleanly, and leaks DB credentials over the web if there's a connection problem | ||||
* | | | settings: remove call to profile_load() | Fabio Comuni | 2012-04-12 | 1 | -4/+0 |
| | | | |||||
* | | | settings: move tabs to aside. add a new template "generic_links_widget.tpl" | Fabio Comuni | 2012-04-12 | 1 | -45/+42 |
| |/ |/| | |||||
* | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-10 | 1 | -2/+2 |
|\ \ | |||||
| * \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-10 | 1 | -2/+4 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: profile redir - goto correct profile page even if contact blocked, you just can't do anything. * master: | ||||
| * | | | [fix] absolute links in docs and newmember.php; breaks sub-dir installs | Simon L'nu | 2012-04-10 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | | | | visit "random profile" feature | friendica | 2012-04-10 | 2 | -1/+11 |
| |/ / |/| | | |||||
* | | | profile redir - goto correct profile page even if contact blocked, you just ↵ | friendica | 2012-04-10 | 1 | -2/+4 |
|/ / | | | | | | | can't do anything. | ||||
* | | more backend work on mail2 followers | friendica | 2012-04-10 | 1 | -9/+54 |
| | | |||||
* | | make editplain work everywhere | friendica | 2012-04-10 | 2 | -5/+22 |
| | | |||||
* | | move all fix_mce to one function so it can easily be undone | friendica | 2012-04-10 | 2 | -4/+2 |
| | | |||||
* | | duplicate community posts | friendica | 2012-04-10 | 1 | -4/+4 |
| | |