aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'upstream/master'tony baldwin2012-03-2165-403/+1121
|\
| * some tweakings for intro boxes (finally got an intro i could see :). dispy ↵Simon L'nu2012-03-203-13/+148
| | | | | | | | | | | | synced with dispy-dark Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * community discovery cont., cleanup of DB debuggingfriendica2012-03-182-1/+3
| |
| * Merge pull request #147 from CatoTH/masterfriendica2012-03-182-1/+2
| |\ | | | | | | CSRF-Protection in the group-related form
| | * CSRF-Protection in the group-related form (creating, renaming and dropping a ↵Tobias Hößl2012-03-182-1/+2
| | | | | | | | | | | | group, adding/removing members from it)
| * | fix the comment box being too wide and looking off-kilterSimon L'nu2012-03-182-2/+2
| |/ | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * [fix] whitespace in photo_view and like_noshare. dispy-dark clean upSimon L'nu2012-03-174-16/+10
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * remove auto-complete from darkzero-NS, dispys, since the comment one is now ↵Simon L'nu2012-03-162-6/+0
| | | | | | | | | | | | global Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * make auto-complete in darkzero-NS. other themes can use this easily. might ↵Simon L'nu2012-03-161-0/+3
| | | | | | | | | | | | need to edit the id it hooks into Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * make profiles-menu disappear when clicked outside itSimon L'nu2012-03-162-0/+18
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * Merge pull request #141 from CatoTH/masterSimon2012-03-162-3/+9
| |\ | | | | | | Private messages - tabindex
| | * Bugfix of old IEsTobias Hößl2012-03-161-1/+1
| | |
| | * Forgot to remove a debug lineTobias Hößl2012-03-161-1/+0
| | |
| | * Use tabindex to enable easy navigation in the dialog to write private mails; ↵Tobias Hößl2012-03-162-4/+11
| | | | | | | | | | | | Recipient -> Subject -> Text field (tabindex has to be set to the IFRAME element after TinyMCE started) -> Send button
| * | weee, dispys get another updateSimon L'nu2012-03-1615-195/+294
| |/ | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * missing close double quote in mail_list.tplSimon L'nu2012-03-161-1/+1
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * more changes in dispy-darkSimon L'nu2012-03-161-0/+6
| | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * Merge branch 'pull'friendica2012-03-1515-32/+86
| |\
| | * added icons to profile_side, fixes in csstommy tomson2012-03-1615-32/+86
| | |
| * | undo git stuffupfriendica2012-03-153-4/+8
| |/
| * Merge pull request #136 from annando/masterfriendica2012-03-153-8/+17
| |\ | | | | | | Mail improvements, item caching and so on
| | * Merge commit 'upstream/master'Michael Vogel2012-03-1575-404/+1216
| | |\
| | * | Removed changesMichael Vogel2012-03-112-19/+11
| | | |
| | * | Merge commit 'upstream/master'Michael Vogel2012-03-1152-542/+7157
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: view/theme/diabook/wall_item.tpl view/theme/diabook/wallwall_item.tpl
| | * | | Pages: Show every community page - even from foreign servers (with caching)Michael Vogel2012-03-111-0/+3
| | | | |
| | * | | Enabled Caching for items. Changed color of tags in diabook.Michael Vogel2012-03-101-2/+2
| | | | |
| | * | | diabook: Moving the location between the iconsMichael Vogel2012-03-103-5/+7
| | | | |
| * | | | fixed the sidebar edit thingy. haven't synced dispy yet.Simon L'nu2012-03-152-24/+27
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | | commit latest to dispy-dark. fixes in html css and jsSimon L'nu2012-03-1516-85/+115
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | | Merge branch 'pull'friendica2012-03-1510-21/+74
| |\ \ \
| | * \ \ Merge https://github.com/friendica/friendica into pullfriendica2012-03-1510-21/+74
| | |\ \ \
| | | * | | add links to wall, photos, events, etc to aside on networkpage, fixes in csstommy tomson2012-03-1510-21/+74
| | | | | |
| * | | | | force login to ssl on SSL_POLICY_SELFSIGNfriendica2012-03-142-2/+2
| | | | | |
| * | | | | ssl_policy stufffriendica2012-03-141-0/+1
| |/ / / /
| * | | | Merge pull request #132 from campino/masterfriendica2012-03-141-10/+10
| |\ \ \ \ | | | | | | | | | | | | Test cases
| | * \ \ \ Merge branch 'master' of git://github.com/friendica/friendicaAlexander Kampmann2012-03-1469-689/+7698
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: view/de/strings.php
| | * \ \ \ \ Merge branch 'master' of git://github.com/friendica/friendicaAlexander Kampmann2012-03-0988-190/+11452
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | * | | | | Merge branch 'master' of git://github.com/friendica/friendicaAlexander Kampmann2012-03-0721-133/+238
| | |\ \ \ \ \
| | * \ \ \ \ \ mergedAlexander Kampmann2012-03-0794-2529/+7640
| | |\ \ \ \ \ \
| | * | | | | | | added test blueprints, fixed? encoding issuesAlexander Kampmann2012-03-051-10/+10
| | | | | | | | |
| * | | | | | | | Merge pull request #133 from tonybaldwin/masterfriendica2012-03-142-0/+102
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | slack-NS
| * \ \ \ \ \ \ \ \ Merge https://github.com/friendica/friendica into pullfriendica2012-03-147-7/+189
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge pull request #134 from simonlnu/masterSimon2012-03-1434-137/+356
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | PHP Fatal error: Call-time pass-by-reference has been removed in mod/item.php on line 630
| | * | | | | | | | | fix in navtommy tomson2012-03-141-4/+0
| | | |_|_|_|_|_|/ / | | |/| | | | | | |
| | * | | | | | | | add links to home, profile, photos, events, notes to aside in network-streamtommy tomson2012-03-146-3/+189
| | | | | | | | | |
| * | | | | | | | | Merge pull request #131 from simonlnu/masterSimon2012-03-139-128/+247
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | massive work done to both dispys, mostly -dark
| | * | | | | | | | massive work done to both dispys, mostly -darkSimon L'nu2012-03-149-128/+247
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| * | | | | | | | | more work on filer, comment level and file tag removalfriendica2012-03-133-4/+9
| |/ / / / / / / /
* | | / / / / / / added Vijay's theme from facepark.intony baldwin2012-03-2124-0/+3661
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | added slack-NS, non-scrolly, slackr-based theme.Tony Baldwin2012-03-132-0/+102
|/ / / / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 18:27:23 +0000