aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'pull'friendica2012-03-248-38/+105
|\
| * Merge pull request #164 from simonlnu/masterSimon2012-03-248-38/+105
| |\ | | | | | | implement filer/file-as
| | * implement filer/file-asSimon L'nu2012-03-258-38/+105
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-252-9/+15
| | |\ | | |/ | |/| | | | | | | | | | | | | | | | * remotes/upstream/master: bug #329 - compress the plugin list on the friendica info page bug #346 - add oembed maxwidth to oembed request * master:
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-2442-122/+5673
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: prevent duplicate friend suggestions block filed items from deletion add the bang network filter is now a permission group small fix in css add right_aside to diabook-blue add connectable services to right_aside add PostIt to right_aside, fixes in css * master:
| | * \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-2343-127/+5589
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: (25 commits) diabook: theme.php remove code duplication last photos check for user "hidewall" remove unneeded regex move js code to close popup in main.js (missing stop event propagation in popup links) user settings: don't show emoticons fix in css right_aside small fix fix 1024resolution add right_aside to theme diabook ability to change tags in edited posts normalise comparison link on delegation page quattro(-green) styling the 'filed under: remove' text it's only item.filer ;-) non static filer text new lines removed removed some new lines to cut down number of changed files removed unneccessary stuff removed problem from previous commit tests for the template engine adding filer functionality to quattro(-green) missing tooltip for "file as" prevent re-registrations using a deleted username - not an issue with Friendica but could create a serious privacy issue with federated platforms add file_as-option to diabook-derivates ... * master:
| | * \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-22356-10435/+21643
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: support lowercase :-p smilie work around doubled linefeeds in tinymce3.5b2 add icons to aside diabook, fixes in css revert permissions relaxation on community add comix-plain smooth the comix comment box make autocomplete work with updated tinymce ika to ica private file in repository facepark is unsupported ATM remove stray template variable from old code add comix theme use password field for DB input added Vijay's theme from facepark.in added README to mcefixes to explain what is going on. update tinymce to 3.5b2 to fix issues with FF 11 and pasting into code blocks more friend suggestions * master:
| | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-200-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: move friend suggestions to top of contact page, add default contact profile photos if missing missed a default profile photo replacement in notifications change default profile photo to something more interesting than a reddish brown square slightly relax overly strict permissions in community and search to match those in display - tl;dr public conversations are publicly visible * master:
* | | | | | improved the inivitations and added a bit of sales pitch.friendica2012-03-242-7/+17
|/ / / / /
* | | | | bug #329 - compress the plugin list on the friendica info pagefriendica2012-03-241-7/+12
| | | | |
* | | | | bug #346 - add oembed maxwidth to oembed requestfriendica2012-03-241-2/+3
| |_|_|/ |/| | |
* | | | prevent duplicate friend suggestionsfriendica2012-03-242-1/+10
| | | |
* | | | block filed items from deletionfriendica2012-03-242-4/+4
| | | |
* | | | add the bangfriendica2012-03-241-2/+2
| | | |
* | | | Merge branch 'pull'friendica2012-03-244-4/+4
|\ \ \ \
| * | | | small fix in csstommy tomson2012-03-244-4/+4
| | | | |
* | | | | network filter is now a permission groupfriendica2012-03-242-2/+16
|/ / / /
* | | | Merge pull request #163 from tomtom84/mastertomtom842012-03-2420-94/+5443
|\ \ \ \ | | | | | | | | | | fixes in diabook-derivates
| * | | | add right_aside to diabook-bluetommy tomson2012-03-2420-94/+5443
|/ / / /
* | | | Merge pull request #162 from tomtom84/mastertomtom842012-03-2310-3/+19
|\ \ \ \ | | | | | | | | | | fixes in theme diabook
| * | | | add connectable services to right_asidetommy tomson2012-03-2410-3/+19
|/ / / /
* | | | Merge pull request #161 from tomtom84/mastertomtom842012-03-2310-17/+180
|\ \ \ \ | |_|_|/ |/| | | fixes in theme diabook
| * | | add PostIt to right_aside, fixes in csstommy tomson2012-03-2410-17/+180
|/ / /
* | | Merge pull request #160 from fabrixxm/mastertomtom842012-03-235-223/+86
|\ \ \ | | | | | | | | work on diabook theme and settings
| * | | diabook: theme.phpFabio Comuni2012-03-233-221/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | remove code duplication last photos check for user "hidewall" remove unneeded regex move js code to close popup in main.js (missing stop event propagation in popup links)
| * | | user settings: don't show emoticonsFabio Comuni2012-03-232-2/+7
| | | |
| * | | Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-03-2314-20/+5280
| |\ \ \ | |/ / / |/| | |
* | | | fix in css right_asidetommy tomson2012-03-235-34/+4953
| | | |
* | | | small fixtommy tomson2012-03-231-1/+1
| | | |
* | | | Merge pull request #159 from tomtom84/mastertomtom842012-03-222-14/+15
|\ \ \ \ | | | | | | | | | | fixes in theme diabook
| * | | | fix 1024resolutiontommy tomson2012-03-232-14/+15
|/ / / /
* | | | Merge pull request #158 from tomtom84/masterfriendica2012-03-226-11/+329
|\ \ \ \ | | | | | | | | | | add right_aside to theme diabook ... need author
| * | | | add right_aside to theme diabooktommy tomson2012-03-236-11/+329
|/ / / /
* | | | ability to change tags in edited postsfriendica2012-03-225-14/+36
| | | |
| * | | Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-03-22394-10588/+22262
| |\ \ \ | |/ / / |/| | |
* | | | Merge branch 'pull'friendica2012-03-224-7/+52
|\ \ \ \
| * \ \ \ Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-03-223-4/+246
| |\ \ \ \
| * | | | | quattro(-green) styling the 'filed under: remove' textTobias Diekershoff2012-03-224-7/+52
| | | | | |
* | | | | | normalise comparison link on delegation pagefriendica2012-03-221-1/+1
| |/ / / / |/| | | |
* | | | | Merge pull request #157 from campino/masterfriendica2012-03-223-4/+246
|\ \ \ \ \ | |/ / / / |/| | | | Tests for the template engine
| * | | | new lines removedAlexander Kampmann2012-03-222-1/+2
| | | | |
| * | | | removed some new lines to cut down number of changed filesAlexander Kampmann2012-03-223-2/+1
| | | | |
| * | | | removed unneccessary stuffAlexander Kampmann2012-03-222-23/+0
| | | | |
| * | | | Merge branch 'master' of git://github.com/friendica/friendicaAlexander Kampmann2012-03-22498-11542/+24259
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: boot.php database.sql include/template_processor.php update.php
| * | | | | removed problem from previous commitAlexander Kampmann2012-03-221-3/+0
| | | | | |
| * | | | | tests for the template engineAlexander Kampmann2012-03-222-1/+225
| | | | | |
| * | | | | integrated profilerAlexander Kampmann2012-03-153-41/+26
| | | | | |
| * | | | | added simple build-in profilingAlexander Kampmann2012-03-155-2/+64
| | | | | |
| * | | | | another test for xmlifyAlexander Kampmann2012-03-151-1/+22
| | | | | |
* | | | | | it's only item.filer ;-)Tobias Diekershoff2012-03-222-2/+2
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 20:02:25 +0000