Tobias Diekershoff
11a7eb8d8f
Merge pull request #1985 from annando/1510-vier-optimize-touch
...
Vier: The usability with a touch device is improved
2015-10-27 08:59:47 +01:00
Tobias Diekershoff
4079084492
Merge pull request #1975 from rabuzarus/template_rework
...
Template rework for contact related pages
2015-10-27 08:59:03 +01:00
Michael Vogel
4f9ec8efac
Vier: The usability with a touch device is improved
2015-10-25 21:01:39 +01:00
Tobias Diekershoff
03ff349a94
Merge pull request #1982 from annando/1510-reduced-profile
...
Profile data are now reduced to only the most important fields
2015-10-25 16:54:24 +01:00
rabuzarus
5b93bff6da
poke template: make use of global.css
2015-10-25 14:40:56 +01:00
Michael Vogel
4631c13d08
Profile data are now reduced to only the most important fields
2015-10-25 09:15:36 +01:00
rabuzarus
8f92b6eea4
some work on poke template
2015-10-24 19:51:58 +02:00
rabuzarus
7c9df68964
template rework: revert #b2bb600 for vier (is needed for right sidebar)
2015-10-23 15:23:00 +02:00
rabuzarus
fad8ebc355
template rework: two row contact page for vier
2015-10-23 15:18:05 +02:00
rabuzarus
b2bb600f3a
template rework: delete unused css
2015-10-23 01:04:47 +02:00
rabuzarus
f9c0c1d696
template rework: use viewcontact_template.tpl for contact dealing pages
2015-10-18 17:12:48 +02:00
Michael Vogel
66ea33623b
Vier: Some small changes in the template for events
2015-10-13 20:15:01 +02:00
Tobias Diekershoff
ce03ccc95c
Merge pull request #1929 from rabuzarus/event-attendance
...
port of reds event attendance feature
2015-10-12 15:10:03 +02:00
Michael Vogel
adba75600a
Vier: Support for the new IFTTT addon.
2015-10-11 23:36:23 +02:00
rabuzarus
649578ae33
Merge develop-new into event-attendance-new
...
Conflicts:
include/conversation.php
2015-10-11 19:39:55 +02:00
Michael Vogel
61c3ce7a21
Bugfix: The contact names had to be escaped
2015-10-08 00:25:55 +02:00
Michael Vogel
1f0b759e2f
Added resize possibility to proxy function
2015-10-07 08:25:10 +02:00
Michael Vogel
607817d1b3
Vier: Avoid an error when calling the admin settings of "vier" when "vier" is not activated.
2015-10-05 17:38:57 +02:00
Michael Vogel
1d71dde7ef
Beautyfied code. Link to "follow" on community profiles
2015-10-04 14:40:02 +02:00
Michael Vogel
3b18c6cb0c
Small optical changes in "vier"
2015-10-04 12:24:00 +02:00
Michael Vogel
3ae0deadb6
The right side now contains much stuff from diabook - but completely reworked.
2015-10-03 12:55:55 +02:00
Michael Vogel
47c855388e
Vier: Menu at the right side (inspired and copyied from diabook)
2015-10-01 08:19:35 +02:00
Michael Vogel
5fe357ee75
Rearrange the navigation bar on smaller windows
2015-09-30 21:59:55 +02:00
Michael Vogel
68a6f0298e
The events moved from the profile to the navigation bar - for supported themes
2015-09-30 18:50:44 +02:00
rabuzarus
7cb4ea52fd
port of the event attendance feature of red matrix with example implementation for vier theme.
2015-09-30 16:58:02 +02:00
rabuzarus
f5c7006f30
rest of the consensus porting work and integration into friendica
...
Credits to Mike Macgirvin for the code
2015-09-30 14:38:13 +02:00
Michael Vogel
6e981ed798
Merge remote-tracking branch 'upstream/develop' into 1509-i18n-events
2015-09-29 10:35:50 +02:00
Michael Vogel
c33957a6e9
Internationalisation of events/Move events to the navigation bar
2015-09-27 14:00:15 +02:00
Michael Vogel
6be65f4eae
Now attachments of the type "application" are displayed as well.
2015-09-18 21:09:31 +02:00
Michael Vogel
31fffcf281
Accidentally removed a file
2015-08-29 17:09:25 +02:00
Michael Vogel
82e682ef45
The click behaviour of the top menu bar is now changed completely
2015-08-29 10:14:41 +02:00
Michael Vogel
319df2ed66
The menu bar isn't clickable anymore
2015-08-28 11:36:43 +02:00
Michael Vogel
14af9cd2e8
Remove the unneeded menu buttons-
2015-08-27 00:50:04 +02:00
Michael Vogel
92fbf1bcbd
Vier: Use CSS for popup menu
2015-08-27 00:02:06 +02:00
Michael Vogel
b1dddd2936
Only offer forum search in local mode.
2015-08-25 05:54:50 +02:00
Michael Vogel
d1647222d3
Vier: The "register" page now looks better.
2015-08-24 19:03:03 +02:00
Michael Vogel
3ff196f00d
Now you can set search options so that searching for contacts or forums isn't occult science anymore.
2015-08-24 11:55:29 +02:00
Michael Vogel
72c8fff909
Improved register link and open-id input.
2015-08-15 07:08:32 +02:00
Michael Vogel
efec7e973e
This hopefully will solve issue 1348
2015-08-14 23:32:10 +02:00
Michael Vogel
e1088210a6
CSS improved
2015-08-11 22:47:37 +02:00
Michael Vogel
ccaeb00973
Better link descriptions.
2015-08-08 22:30:43 +02:00
Michael Vogel
b4d09777b9
Added many accesskeys ...
2015-08-08 17:33:43 +02:00
Michael Vogel
a8a21da6f5
Some steps for a better screen reader compatibility
2015-08-06 08:13:15 +02:00
Fabrixxm
52f9465578
filebrowser fixs, use it in comment textareas
...
move filebrowser js to single file
document filebrowser usage
replace "onclick" for comment style buttons with data-* and move logic to main.js
use filebrowser to insert images in comments
2015-07-29 11:30:04 +02:00
Fabrixxm
70b7de39a7
Upload/Browse popup for files and images
...
Jot buttons to upload images and files show a popup, where the
user can select a previously uploaded item o upload a new one
2015-07-28 17:20:40 +02:00
Michael Vogel
5f86d3d325
removed the picture width, since it is already in the style sheet.
2015-07-12 20:31:49 +02:00
Michael Vogel
6a646d68c5
Updated templates for "vier" (See issue 1733)
2015-07-12 20:27:54 +02:00
Michael Vogel
c356da2cad
Diaspora: Improved parsing of linefeeds
2015-07-05 02:33:28 +02:00
fabrixxm
5a23bd400c
Merge pull request #1715 from rabuzarus/theme_uid
...
use local theme settings for visitors
2015-06-30 08:41:07 +02:00
rabuzarus
36abf624d8
make supported themes compatible with get_theme_uid
2015-06-29 23:03:44 +02:00
Michael Vogel
b9c42c37d1
Vier: Colors for notifications changed
2015-06-29 08:00:52 +02:00
Michael Vogel
6eebfb2e13
Merge pull request #1692 from fabrixxm/desktopnotifications
...
Desktop notifications
2015-06-26 08:45:16 +02:00
Fabrixxm
6fc864c947
rework mod/ping and desktop notification logic
...
`mod/ping.php` returns all notifications ordered by date
mixing system notifications, private messages, intros, registrations
remove 'notify_full' mode
remove `&arr;` from unseen notes, 'seen' attrib now is "1" or "0"
new note attribute 'timestamp'
desktop notification logic use timestamp to check which notification show to the user
notification html template use timestamp to show full date to user in tooltip
`relative_date()` don't append full date on dates older than 24 hours
2015-06-25 10:02:26 +02:00
Michael Vogel
0bac4722cb
Vier: Just another thread improvment
2015-06-24 21:49:51 +02:00
Fabrixxm
e29d05ce4a
notifications order, unseen css class
...
ping return notfications ordered by notification id
notifications list get seen/unseen class from ping xml
global.css define 'notify-unseen'
2015-06-24 16:10:06 +02:00
Michael Vogel
3841c41186
Improved width for nested comments.
2015-06-24 14:20:08 +02:00
Michael Vogel
bc42b6440a
Vier: Improved threading
2015-06-21 20:40:39 +02:00
rabuzarus
c01dbc274c
fix remote-link button in vier
2015-06-11 02:49:09 +02:00
fabrixxm
d204e2524b
vier: style video delete button
2015-05-24 10:34:17 +02:00
rabuzarus
30348a1bc0
port of red matrix archive-widget
2015-05-19 01:03:08 +02:00
Michael Vogel
2eba5a32df
New screenshot for "vier".
2015-03-09 23:21:40 +01:00
Michael Vogel
bf0f7c3d0a
New bbcode elements h1 to h6 for a better conversion of Diaspora content
2015-03-01 20:07:56 +01:00
Michael Vogel
19af382ffb
"plus" is now the default style at "vier" for new installations
2015-02-21 09:44:13 +01:00
Michael Vogel
4a1105ede6
scrape/noscrape now contains the date the profile was last updated or the last message was sent.
2015-02-18 23:40:46 +01:00
Michael Vogel
a26d04574d
Merge remote-tracking branch 'upstream/develop' into 1502-contacts-in-scrape
2015-02-17 19:18:17 +01:00
Michael Vogel
52de6c11b1
There is now a link to the profile behind the avatar picture on the display page
2015-02-17 17:33:28 +01:00
Johannes Schwab
12d7ca9b84
improved infinite scrollling
2015-02-13 00:40:59 +01:00
Michael Vogel
842ac46857
Scrape now contains the number of contacts as well.
2015-02-08 23:35:29 +01:00
Michael Vogel
dbe52c74b5
Added Beanow as author, since he did most of the last changes.
2015-02-02 21:03:14 +01:00
Michael Vogel
9f0e19762e
New version for "Vier". The navigation was restructured and several other stuff was changed as well, thanks to Beanow!
2015-02-02 21:00:32 +01:00
Michael Vogel
848c09935a
The contact list in mails now contains not only the name but also the address.
2015-01-27 08:04:24 +01:00
Michael Vogel
cb9196f6d6
Issue 1197: New hook for "oembed_fetch_url"
2015-01-25 00:58:51 +01:00
Michael Vogel
b36d799044
Fetching "location" and "about" from diaspora. Displaying them on the "display" page.
2015-01-07 01:46:13 +01:00
hauke
a72d60f481
Added h-card and functionality for IndieAuth/Web-sign-in
2014-12-28 15:48:24 +01:00
Michael Vogel
8b433c2d11
Vier: New style "dark"
2014-12-13 23:13:34 +01:00
Silke Meyer
f493252ac8
Use a sans-serif font-family in breathe
2014-12-06 20:05:30 +01:00
Michael Vogel
2bbd7ab67f
Issue 1157: Unused javascript function is removed.
2014-09-27 14:17:50 +02:00
Michael Vogel
f9bec79a2c
In the profiles the remote connect field was missing
2014-09-11 23:38:24 +02:00
fabrixxm
fd97f3013d
fix quattro scroll and flash and vier flash on display page
2014-09-11 18:56:33 +02:00
fabrixxm
735e6bbcb4
Merge pull request #1121 from Beanow/hotfix/bug-1105
...
Fix illegal offset error for vier and quattro.
2014-09-07 12:48:13 +02:00
Beanow
8345ac7313
Fix illegal offset error for vier and quattro.
...
Fixes #1105
2014-09-07 11:47:08 +02:00
hauke
a162ea7251
bug fix #1115
2014-09-07 10:26:38 +02:00
hauke
7dcf37f053
changed cursor style on settings page globally
2014-09-06 17:01:05 +02:00
hauke
ec68e33c6b
make items on settings pages fold/unfold on click
2014-09-06 13:53:23 +02:00
hauke
9a8d106414
fixed contact action button bar, typo correction
2014-09-06 11:49:31 +02:00
hauke
191595766d
removed old comment that is no longer true
2014-09-06 00:14:25 +02:00
Michael Vogel
0e2376b457
Updated font awesome to new version
2014-09-04 01:01:39 +02:00
Michael Vogel
7eeb320085
It is now possible to ignore threads.
2014-09-04 00:58:52 +02:00
Michael Vogel
316f0a75cd
Showing the network name on the display page.
2014-08-25 16:17:49 +02:00
Michael Vogel
dd511ac70a
The "display" page now shows the current author profile with a "connect" link (if there is no current connection)
2014-08-25 14:09:56 +02:00
Michael Vogel
33b612a920
Bugfix: There was a JS error that prevented the work of the comment buttons
2014-08-25 14:07:11 +02:00
Michael Vogel
94d2557077
Vier: Some more design changes to "plus" style.
2014-08-21 01:00:56 +02:00
Michael Vogel
271a184e1e
proxy: Added support for long addresses. "vier": New style "Plus"
2014-08-16 01:40:38 +02:00
Michael Vogel
ed1dce93d6
Usage of /display/(guid) as path instead of /display/(user)/(id)
...
Bugfix for adding tags to photos
2014-07-22 00:36:20 +02:00
Michael Vogel
38fb43702f
Vier: Preview picture in admin settings is now smaller
2014-06-20 00:01:20 +02:00
Michael Vogel
8bce8b0bd2
Vier: The setting for defining the default style is now working
2014-06-16 00:00:05 +02:00
Michael Vogel
2747c19bdd
Vier: Border between side menu and content in "flat" style
2014-06-15 19:37:14 +02:00
Michael Vogel
029633c16d
Merge pull request #1020 from silke/vier-border-radius
...
Vier border radius
2014-06-15 18:26:23 +02:00
Silke Meyer
f70bdb984f
A few more changes for breathe style in vier.
2014-06-15 18:16:02 +02:00
Silke Meyer
7fdcc15182
same drop-down menu for contact details as for user menu
2014-06-15 14:57:52 +02:00
Silke Meyer
321c711a3d
top bar icons stay dark upon hover
2014-06-15 13:35:34 +02:00
Silke Meyer
dd1b28314e
space between logo and sitename
2014-06-15 13:25:27 +02:00
tobiasd
f23f6ca9c6
Merge pull request #1017 from silke/vier-border-radius
...
Vier border radius
2014-06-15 08:33:43 +02:00
Silke Meyer
d738395b0f
active tab
2014-06-15 02:00:25 +02:00
Silke Meyer
564ec8053a
top nav bar colors
2014-06-15 01:58:18 +02:00
Silke Meyer
44dacd1d82
Just kept the differences for "breathe" style
2014-06-15 01:35:41 +02:00
Silke Meyer
f15dec16d1
bg color and selected tab brighter
2014-06-15 00:56:05 +02:00
Silke Meyer
cb1f52ad93
added style to theme.php
2014-06-15 00:26:49 +02:00
Silke Meyer
db1ef0bfcf
Transformed changes into its own Vier style
2014-06-15 00:19:38 +02:00
Silke Meyer
31730ec75b
white text / icons in upper nav
2014-06-14 23:58:46 +02:00
Silke Meyer
e961681f63
comment field
2014-06-14 23:31:27 +02:00
Silke Meyer
583207b5c3
edit field
2014-06-14 23:28:28 +02:00
Silke Meyer
39604c37d8
round corners for vevent
2014-06-14 23:25:00 +02:00
Silke Meyer
e7171bb89a
softer look for code fragments in postings
2014-06-14 23:22:41 +02:00
Silke Meyer
36c55f047b
border-radius for messages
2014-06-14 23:20:08 +02:00
Silke Meyer
911777a737
border-radius for tabs again, they seems to have got lost earlier
2014-06-14 19:12:55 +02:00
Silke Meyer
6e9ed089cf
removed border at bottom of #live-network
2014-06-14 19:07:42 +02:00
Silke Meyer
f5c7b47788
made drop-down menu on user icon a bit more "softer"
2014-06-14 18:48:31 +02:00
Silke Meyer
e1b9783338
border-radius for search box
2014-06-14 18:39:23 +02:00
Silke Meyer
c324e2c9f9
Small border-radius for tabs
2014-06-14 18:37:15 +02:00
Silke Meyer
17a78e7186
added small border-radius for event notice
2014-06-14 18:29:36 +02:00
Silke Meyer
f533332ad5
added border-radius for #profile-jot-form
2014-06-14 18:25:34 +02:00
Silke Meyer
29fbedcaf4
added border-radius for tread-wrapper
2014-06-14 18:23:56 +02:00
Michael Vogel
ce29f55536
Vier: Some small color changes
2014-06-10 20:22:53 +02:00
Michael Vogel
bb641dec62
Vier: pager content is now centered
2014-06-06 00:38:27 +02:00
Michael Vogel
c83aae2f1f
Vier: Making the pager look better
2014-06-05 23:59:38 +02:00
Michael Vogel
4984a3703f
Vier: Redesigned tabs
2014-06-05 21:36:55 +02:00
Michael Vogel
e729d2e216
Show title for the reply button.
2014-06-04 00:43:43 +02:00
Michael Vogel
1fdfd614f0
Vier: Make the smiley button look better integrated into the theme.
2014-05-29 22:56:04 +02:00
Michael Vogel
b0df06dd72
Vier: When clicking on the reply button, the focus now automatically changes to the textarea.
2014-05-29 20:27:06 +02:00
Michael Vogel
0eafed3353
Vier: New "font awesome" version, changed "reply" button, comment area is now hidden until the first reply came. (Saves space)
2014-05-29 11:51:13 +02:00
Michael Vogel
d964e7e08f
New function for shortening of text (is used by the buffer export)/Vier: comment bubble is now grey.
2014-05-18 23:39:34 +02:00
Michael Vogel
665139660a
Make embedded videos look better. (better margin data)
2014-05-18 20:30:27 +02:00
Michael Vogel
0f16672176
Deleted the duplicate file "wall_attach.php"
2014-05-12 21:30:53 +02:00
Michael Vogel
059b88b7a0
The CSS code for shared messages is moved from "vier" to the global.css, so that it is usable for all themes.
2014-05-03 12:08:42 +02:00
fabrixxm
b69f6b6ade
Merge pull request #953 from tugelbend/master
...
Vier: Fix for the display of long text event entries
2014-04-29 09:07:32 +02:00
Fabrixxm
cae89749d7
vier: remove unused .less files, fix photo comments
2014-04-28 09:42:41 -04:00
hauke
b8bf26ec1f
code cleanup, replaced tabs with spaces
2014-04-27 14:53:45 +02:00
hauke
f14835ce4a
re-added missing styles for event
2014-04-27 14:50:39 +02:00
hauke
cd1a726d87
code cleanup
2014-04-27 14:44:42 +02:00
hauke
c111cec560
event entry: added some padding for a nicer look
2014-04-27 14:41:31 +02:00
hauke
21f5004821
bug fix: event entry. long text doesn't wrap in colorbox popup
2014-04-27 14:35:32 +02:00
Michael Vogel
2846dfeb05
Ther eis now a user setting to disabled notices. The Diaspora reshare now checks for empty values.
2014-04-26 02:22:30 +02:00
Michael Vogel
1227d071d1
The preview button is now a button. This is more consistent
2014-04-24 13:27:08 +02:00
Michael Vogel
97d8c03f33
Vier: removed the gray line under the user menu when it was selected
2014-04-24 13:02:50 +02:00
Michael Vogel
ec1f07d5b7
Only show the preview button when it is activated/Menü arrangement changed for settings menu.
2014-04-24 12:39:27 +02:00
Michael Vogel
c1988d7e08
Vier: Removed the delegations from the nav menu, renamed the hardcoded "impressum" to use the translations.
2014-04-24 10:19:13 +02:00
Michael Vogel
b005423ebf
New layout for connector settings. New global CSS for things that seems to be identical in most themes.
2014-04-24 10:17:19 +02:00
Michael Vogel
b6384ec5be
The postal code wasn't displayed correctly.
2014-04-22 15:53:26 +02:00
Michael Vogel
6e7d8b87bb
Vier: attached link descriptions (type-link, ...) are redesigned to make it look more modern.
2014-04-22 01:03:08 +02:00
Michael Vogel
73f0496127
Vier: Added treatment of videos like links. (See the changes in the "parse url" section)
2014-04-04 11:03:34 +02:00
Michael Vogel
a50484c27d
Vier: Larger font for content.
2014-03-18 22:52:19 +01:00
Michael Vogel
49e16b0612
Vier: Fading effects for tags, borders for links
2014-03-16 17:24:10 +01:00
Michael Vogel
51bf7f7d17
Vier: The shadows are reduced a little bit.
2014-03-09 09:22:44 +01:00
Michael Vogel
2b5345323f
"vier": Several design changes. New option for coloured network items.
2014-03-02 01:29:20 +01:00
Michael Vogel
7792c5f5f0
Vier: forgot to add template ...
2014-02-23 15:58:22 +01:00
Michael Vogel
a4ecf74a5d
Vier: Added config.php
2014-02-23 15:57:27 +01:00
Michael Vogel
f663676cca
Vier: Option to switch between shadow style and flat style.
2014-02-22 15:48:57 +01:00
Michael Vogel
83c89bf17c
Vier should now work better on some older browsers
2014-02-16 17:37:56 +01:00
Michael Vogel
01971428aa
target="_blank" instead of target="external-link"
2014-02-11 23:42:06 +01:00
Michael Vogel
6c46c8333d
Vier: Adding some shadows. In the thread view showing the application when hovering over the network name (less information is sometimes more)
2014-02-02 09:57:31 +01:00
Michael Vogel
2be9e2f246
vier: Quick fix for a missing file (taken from quattro at the moment)
2014-01-28 22:55:19 +01:00
Michael Vogel
de4d0765cb
Beautifiying export of shared posts to other networks
2014-01-18 21:32:14 +01:00
Oliver
e433dfad71
Quick fix: star and lock position on starred posts
2014-01-12 12:42:56 +01:00
Michael Vogel
aed28a24f1
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
mod/crepair.php
2014-01-05 16:22:42 +01:00
Michael Vogel
4b0e370c4c
Better handling of the network field in the item table.
2013-12-27 01:58:21 +01:00
Michael Vogel
d487cb2078
vier: Screenshot updated
2013-12-10 20:56:50 +01:00
Michael Vogel
bae844e367
New style for shared links. Preparation for changes in some addons
2013-12-08 16:49:07 +01:00
Michael Vogel
3e5b9e97e7
New "minimal" mode for displaying the network content. Preparation for e.g. a multicolumn layout.
2013-12-04 23:46:51 +01:00
Michael Vogel
0ffeb4cf92
New field "network" in item table to speed up the system.
2013-10-25 23:33:53 +02:00
Michael Vogel
8adc1bd703
Vier: Improved scrollbar when the "aside" area is to short.
2013-10-04 11:12:29 +02:00
Michael Vogel
9bbf60ac9b
Vier: A little rearrangement of the menu order.
2013-06-23 00:26:04 +02:00
Michael Vogel
bd7abe210c
Vier: Introductions are now shown. The popup menu when editing a profile is visible again.
2013-06-23 00:07:21 +02:00
Tobias Diekershoff
5113885427
fix 540 in vier
2013-05-29 17:10:49 +02:00
Fabrixxm
379c761c3f
missing "templates" folders
2013-04-23 07:47:57 -04:00
Fabrixxm
6fddd1cbbf
template: remove old 'internal' template files, move smarty3 templates into 'templates' subdir
2013-04-23 03:35:31 -04:00
Michael Vogel
eabefb2f04
vier: The background color of the right area is now white.
2013-03-29 11:18:20 +01:00
Michael Vogel
111495423c
Imported mails were deleted the second time the poller ran - when moving or deleting of mails was activated.
2013-03-14 23:15:15 +01:00
Michael Vogel
5d3613c8bc
Vier: The change from blue to black in links is now faded as well.
2013-03-07 19:34:54 +01:00
Michael Vogel
c40c61c106
OStatus conversations: Fixed a bug when a message hadn't got an id.
...
vier: Some more changes to make the side menu static.
In the index.php I did a small change to make friendica compatible with the android client for diaspora.
2013-03-06 23:23:04 +01:00
Michael Vogel
86e19dda22
Vier: Some more changes to the theme.
...
Added a switch to suppress displaying of the tags.
2013-03-05 00:46:11 +01:00
Michael Vogel
8bb6b51967
Vier: Some more transition effects
2013-03-04 21:11:31 +01:00
Michael Vogel
478a079665
Vier: Further changes: profile border is rounded.
2013-03-04 00:04:06 +01:00
Michael Vogel
8e1d253568
OStatus conversation: now the creation date of the item is store with the conversation
...
vier: The link color and the color of the top bar is changed.
2013-03-03 23:44:50 +01:00
Michael Vogel
2866f62c88
Suppoorting Open Graph and Dublin Core when displaying single item
...
Following link shorteners in parse_url
2013-03-02 14:46:06 +01:00
Zach Prezkuta
047cf0d342
some smarty templates needed updating
2013-02-23 09:36:00 -07:00
Michael Vogel
93143702ed
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
boot.php
database.sql
library/fancybox/jquery.fancybox-1.3.4.css
mod/search.php
update.php
2013-02-17 12:35:40 +01:00
Michael Vogel
3e58060b30
API: beautify the output of repeated items
...
Vier: Birthday reminder looks better
2013-02-15 20:14:45 +01:00
Zach Prezkuta
acc4d66cd3
update smart templates
2013-01-26 13:07:54 -07:00
Zach Prezkuta
488a38cd85
Decaf mobile: an (almost) Javascript-free theme
2013-01-26 13:01:57 -07:00
Michael - piratica.eu
cc9ce39e3f
Merge branch 'master' of https://github.com/annando/friendica
...
Conflicts:
include/poller.php
2013-01-20 14:17:09 +01:00
Michael - piratica.eu
7ab335c9d6
Diaspora: Auto-adding users as friend who already sharing with us
2013-01-20 14:08:28 +01:00
Michael Vogel
4e3d0018c6
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
boot.php
include/items.php
update.php
2013-01-20 14:07:57 +01:00
Zach Prezkuta
c43ff35fe7
newline at end of header
2013-01-11 10:00:10 -07:00
Zach Prezkuta
1656c63a55
add warning message about automatically generated templates
2013-01-11 09:57:11 -07:00
Oliver
a543a1a0c2
typo correction
...
we don't want to drop Hilde
2013-01-11 14:15:17 +01:00
Zach Prezkuta
cd017282e4
use Python 2.4 compatible script; update Smarty templates
2013-01-10 22:34:23 -07:00
Michael Vogel
61c78711df
Preparations for a new tag structure. Tags are now stored in a dedicated table.
2013-01-11 01:20:16 +01:00
Michael Vogel
82820d8e95
Now the third most likely languages are shown.
...
In "vier" the tag line is now suppressed. It saves a little bit of space - and is redundant.
2013-01-09 20:54:18 +01:00
friendica
88cc414355
Merge pull request #570 from annando/master
...
Vier, caches and "share" via API
2013-01-04 15:13:09 -08:00