friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
11,546 Commits 2 Branches 63 Tags 238 MiB
Commit Graph

3770 Commits

Author SHA1 Message Date
Michael Vogel 2eb461ed2c Merge remote-tracking branch 'upstream/develop' into 1602-mixed-content 2016-02-18 08:15:58 +01:00
Michael Vogel 7d4c99ebbc "get_baseurl" and "z_root" are disappearing ... 2016-02-17 23:47:32 +01:00
Tobias Diekershoff e22d980e91 IT update to the strings 2016-02-17 15:13:45 +01:00
Michael Vogel c770b00d6d Merge remote-tracking branch 'upstream/develop' into 1602-mixed-content 2016-02-17 12:18:46 +01:00
Michael Vogel c5b724828a Just some more removed baseurls ... 2016-02-17 08:08:28 +01:00
Michael Vogel f7537c9e90 Remove the baseurl where possible to avoid mixed content 2016-02-17 00:01:24 +01:00
Sakałoŭ Alaksiej a9f80d435b Complemented and improved russian translation 2016-02-16 20:57:15 +03:00
Michael Vogel 307f90cdfe Vier: Pictures in the side bar shouldn't be larger than the side bar 2016-02-13 14:21:53 +01:00
Tobias Diekershoff c5f2157eb2 Merge pull request #2336 from stieben/move-div-pause 
Move div#pause to view/default.php
 2016-02-11 07:36:37 +01:00
Andrej Stieben e104c58191 Added div#pause to themes' default.php 
As requested by @tobiasd and @rabuzarus.
 2016-02-09 16:41:19 +01:00
Andrej Stieben 4d7a6aaed2 Moved div#pause from index.php to view/default.php 
This closes #2320.
 2016-02-09 15:54:35 +01:00
fabrixxm 102c06a41f fix error in template in notifications page 2016-02-07 14:29:07 +01:00
fabrixxm d6cf791677 Merge pull request #2324 from rabuzarus/0502_vier_dark 
vier: some consistency fixes for the dark scheme
 2016-02-07 09:53:24 +01:00
fabrixxm ecfb6ec924 Merge pull request #2313 from rabuzarus/0302_forum_class 
forums.php is now ForumManager.php and providing class ForumManager
 2016-02-07 09:28:50 +01:00
rabuzarus 95819684c2 Merge develop into 0502_vier_dark 
Conflicts:
	view/theme/vier/dark.css
 2016-02-06 13:09:41 +01:00
rabuzarus 0bccfea596 vier: some consistency fixes for the dark scheme 2016-02-06 00:54:50 +01:00
rabuzarus bcf1020635 vier smileybutton: dark.css insert new line at the end of the file 2016-02-05 21:38:55 +01:00
rabuzarus 9fd3d8116b vier smileybutton: little polish in dark.css 2016-02-05 21:30:31 +01:00
rabuzarus 41405ed0f2 vier: display smiley-preview as inline-block - needs addons update 2016-02-05 21:24:01 +01:00
Tobias Diekershoff 8bca68c77c Merge pull request #2317 from rabuzarus/0402_vier_mobile_textarea 
vier: remove some hardcoded css to be more mobile friendly
 2016-02-05 06:57:07 +01:00
Tobias Diekershoff 437784b7bb Merge pull request #2318 from annando/1602-vier-font 
Vier: The font "system" can make the system look ugly
 2016-02-05 06:56:26 +01:00
Michael Vogel b85369a03b Vier: The font "system" can make the system look ugly 2016-02-04 18:58:33 +01:00
rabuzarus a75be65860 vier: little float fix 2016-02-04 16:45:39 +01:00
rabuzarus 12c6ba9081 vier: remove some hardcoded css to be more mobile friendly 2016-02-04 16:21:40 +01:00
rabuzarus 52dbb0b4a2 Forum class - rename Class CamelCase and rename some methods 2016-02-04 14:51:54 +01:00
rabuzarus 9a54afa629 Forum class - rename Class CamelCase and rename some methods 2016-02-04 14:47:20 +01:00
fabrixxm e11ff25de2 fix empty ACL window on desktop 2016-02-03 23:22:45 +01:00
rabuzarus c1070e4655 forums.php is now forum.php and providing class forum 2016-02-03 18:05:26 +01:00
Fabrixxm f21e3e46c7 Vier mobile: better jot buttons on small screens 2016-02-03 15:01:24 +01:00
Fabrixxm 1ddae21cff Vier mobile: fix content width, events style, oembed 2016-02-03 14:48:46 +01:00
Fabrixxm 3c6ebfa5a9 Vier - mobile friendly ACL window and form fields 2016-02-03 14:03:00 +01:00
Tobias Diekershoff f0912d6219 Merge pull request #2310 from rabuzarus/0302_vier_photo 
vier: use object-fit: cover for recent photos view
 2016-02-03 07:07:38 +01:00
rabuzarus 58c1f9a60f vier: use object-fit: cover for recent photos view 2016-02-03 03:59:42 +01:00
Tobias Diekershoff 447ed7af53 IT update to the strings 2016-01-31 12:02:05 +01:00
rabuzarus 8e0f04026c vier: some fixes for mobile view 2016-01-30 01:53:21 +01:00
Michael Vogel 4208acf4b6 Merge remote-tracking branch 'upstream/develop' into 1601-dfrn 2016-01-25 23:51:11 +01:00
Tobias Diekershoff d395959e41 DE update to the strings 2016-01-25 07:13:29 +01:00
Michael Vogel f38f1806c1 We don't need these templates anymore 2016-01-24 08:22:09 +01:00
Tobias Diekershoff 6174017048 Merge pull request #2275 from rabuzarus/2101_event_reminder 
fix events_reminder popup
 2016-01-21 16:18:36 +01:00
rabuzarus 03bef2c8f8 fix events_reminder popup 2016-01-21 13:44:38 +01:00
Tobias Diekershoff c012017023 DE update to the strings 2016-01-21 11:56:19 +01:00
Tobias Diekershoff f635e81d94 NL update to the strings THX Dasrakel 2016-01-20 17:54:40 +01:00
fabrixxm a1eb7a8791 Merge pull request #2266 from tobiasd/20160119-de 
DE update to the strings
 2016-01-19 13:47:43 +01:00
Tobias Diekershoff fe6d8ecd1c DE update to the strings 2016-01-19 10:55:55 +01:00
Tobias Diekershoff 846153d388 some beautification to the template code 2016-01-19 07:20:07 +01:00
Michael Vogel 32c7896c5d Merge remote-tracking branch 'upstream/develop' into 1601-network-performance 2016-01-18 18:49:04 +01:00
Tobias Diekershoff c6f0333026 moved some CSS stuff from the template to global.css 2016-01-18 13:22:07 +01:00
Michael Vogel 6c7cf2a766 Merge remote-tracking branch 'upstream/develop' into 1601-network-performance 2016-01-18 00:53:18 +01:00
Michael Vogel 36ba415df3 Merge pull request #2257 from rabuzarus/locked_features_united 
feature management for admins
 2016-01-18 00:51:50 +01:00
Tobias Diekershoff 98be92f48c DE update to the strings 2016-01-17 22:25:05 +01:00