rabuzarus
|
ce1faf17d1
|
rework autocomplete: some polishing
|
2016-04-14 17:05:19 +02:00 |
|
rabuzarus
|
01b02dbcaa
|
Merge develop into 1404_reworked_autocomplete
Conflicts:
include/text.php
view/templates/head.tpl
view/theme/duepuntozero/style.css
view/theme/vier/style.css
|
2016-04-14 16:23:51 +02:00 |
|
|
|
0a3cd33cb0
|
Merge pull request #2447 from annando/1604-bugfix-default-group
Bugfix: "default_group" behaviour wasn't implemented correctly
|
2016-04-13 22:36:10 +02:00 |
|
Michael Vogel
|
d6a79abb68
|
Bugfix: "default_group" behaviour wasn't implemented correctly
|
2016-04-13 22:21:23 +02:00 |
|
|
|
6d0b4f92bc
|
Merge pull request #2446 from rabuzarus/1304_quatro_event_acl
quattro fix for #2385 - respect acl on event edit
|
2016-04-13 19:21:15 +02:00 |
|
rabuzarus
|
c73e93b19b
|
quattro fix for #2385 - respect acl on event edit
|
2016-04-13 17:43:46 +02:00 |
|
|
|
a7d6fa1bc9
|
Merge pull request #2444 from annando/1604-twidere-html
API: Just some more elements where Twidere has problems ...
|
2016-04-13 08:19:14 +02:00 |
|
|
|
7f7bd724d3
|
Merge pull request #2445 from annando/1604-vanished-mentions
Bugfix: Sometimes mentions vanished - now they shouldn't do this anymore
|
2016-04-13 08:18:39 +02:00 |
|
Michael Vogel
|
71caebdae0
|
Bugfix: Sometimes mentions vanished - now they shouldn't do this anymore
|
2016-04-13 07:00:36 +02:00 |
|
Michael Vogel
|
018b3ed25f
|
API: Just some more elements where Twidere has problems ...
|
2016-04-12 22:53:54 +02:00 |
|
|
|
df62bcab2e
|
Merge pull request #2443 from annando/1604-fbrowser
fbrowser: Take the picture as that mostly fits
|
2016-04-10 19:45:24 +02:00 |
|
Michael Vogel
|
90f5cb23f2
|
fbrowser: Take the picture as that mostly fits
|
2016-04-10 13:36:26 +02:00 |
|
|
|
f27cadae8d
|
Merge pull request #2442 from annando/1604-api
API: Improvement for Twidere/Conversation call improved
|
2016-04-10 06:37:33 +02:00 |
|
Michael Vogel
|
34dc23b871
|
API: Improvement for Twidere/Conversation call improved
|
2016-04-09 22:44:32 +02:00 |
|
fabrixxm
|
0370a2e6f3
|
Merge pull request #2440 from tobiasd/issue2241
Issue 2241: added language selector to the admin wizard
|
2016-04-08 10:41:36 +02:00 |
|
|
|
dfa5183774
|
Merge pull request #2441 from rabuzarus/0704_doxygen_forum
Update ForumManager.php
|
2016-04-07 21:06:32 +02:00 |
|
rabuzarus
|
d5bf386cf7
|
Update ForumManager.php - small correction
|
2016-04-07 16:58:26 +02:00 |
|
rabuzarus
|
a3c79d2007
|
Update ForumManager.php
fix some doxygen description
|
2016-04-07 14:43:56 +02:00 |
|
|
|
ac9d392264
|
make en the default language
|
2016-04-06 20:21:41 +02:00 |
|
|
|
a28372c032
|
intendation...
|
2016-04-06 20:18:33 +02:00 |
|
|
|
5df20fda11
|
Issue 2241: added language selector to the admin wizard
|
2016-04-06 20:13:34 +02:00 |
|
fabrixxm
|
295489e9a5
|
Merge pull request #2434 from tobiasd/20160403-lng
lang info in HTML header
|
2016-04-06 09:04:13 +02:00 |
|
|
|
9d2864fc58
|
Merge pull request #2437 from annando/1604-session
"remember me" in session does work now
|
2016-04-06 08:08:21 +02:00 |
|
Michael Vogel
|
952f8514a5
|
"remember me" in session does work now
|
2016-04-05 23:28:33 +02:00 |
|
fabrixxm
|
ff886bbaca
|
Merge pull request #2435 from tobiasd/20160404-login
added aria describedby elements to input templates
|
2016-04-04 08:47:19 +02:00 |
|
|
|
1ee405c9c3
|
added aria describedby elements refering to field help to the input templates
|
2016-04-04 08:10:27 +02:00 |
|
|
|
d9b6355bb8
|
added lang info to frost themes
|
2016-04-03 21:00:18 +02:00 |
|
|
|
a88d950c33
|
set language in HTML header to selected UI language
|
2016-04-03 20:55:39 +02:00 |
|
|
|
b9d9ffbd01
|
Merge pull request #2429 from annando/1604-item-shadow
New post update function, search is now using the "global" field
|
2016-04-03 19:55:34 +02:00 |
|
|
|
477614df26
|
Merge pull request #2431 from annando/1604-scrape-profile
Scrape: Changed detection for the profile link
|
2016-04-03 19:52:23 +02:00 |
|
Michael Vogel
|
1f61efc7fe
|
Scrape: Changed detection for the profile link
|
2016-04-03 19:29:35 +02:00 |
|
Michael Vogel
|
3fdaafd54a
|
Some more documentation
|
2016-04-03 18:49:41 +02:00 |
|
Michael Vogel
|
47563d34ee
|
Merge remote-tracking branch 'upstream/develop' into 1604-item-shadow
|
2016-04-03 18:46:14 +02:00 |
|
|
|
945652b24a
|
Merge pull request #2430 from annando/issue-2247
issue 2247: Update more fields when relocation the server
|
2016-04-03 18:34:38 +02:00 |
|
Michael Vogel
|
94e8139c7e
|
issue 2247: Update more fields when relocation the server
|
2016-04-03 18:18:36 +02:00 |
|
Michael Vogel
|
f192767d7a
|
Some reverted stuff
|
2016-04-03 16:38:32 +02:00 |
|
Michael Vogel
|
9f57425d08
|
Post update ist now done.
|
2016-04-03 16:36:05 +02:00 |
|
Michael Vogel
|
beb1e04069
|
New field in item table ("shadow") that indicates if there is a shadow entry
|
2016-04-03 13:48:31 +02:00 |
|
|
|
2172384d4f
|
Merge pull request #2428 from annando/1604-parent-like
Small bugfix: We always liked the parent instead of the child
|
2016-04-02 18:07:07 +02:00 |
|
Michael Vogel
|
ce2c1b4fc1
|
Small bugfix: We always liked the parent
|
2016-04-02 17:43:53 +02:00 |
|
|
|
4a3a63dfc1
|
Merge pull request #2427 from annando/1604-salmon-like
OStatus: Likes do work more reliable, alias should be okay now
|
2016-04-02 16:33:19 +02:00 |
|
Michael Vogel
|
68b88c0384
|
Notify and poll aren't fetched at the moment
|
2016-04-02 15:49:57 +02:00 |
|
Michael Vogel
|
b4b62493e6
|
Bugfix: The nickname vanished/better way to fetch the alias
|
2016-04-02 15:41:55 +02:00 |
|
Michael Vogel
|
e5377a5e91
|
Merge remote-tracking branch 'upstream/develop' into 1604-salmon-like
|
2016-04-02 14:12:02 +02:00 |
|
Michael Vogel
|
fd965b046a
|
Update contact data for uid=0 at feed import
|
2016-04-02 14:10:40 +02:00 |
|
|
|
c30306e085
|
Merge pull request #2424 from annando/1603-scrape-alias
Scrape: Always take the first alias
|
2016-04-02 09:48:31 +02:00 |
|
Michael Vogel
|
bc05984786
|
Only update contact when scrape runs with "probe_normal"
|
2016-04-02 09:06:10 +02:00 |
|
Michael Vogel
|
08fb662b4a
|
OStatus: Salmon now works with "likes"/The alias is stored now as well
|
2016-04-02 00:24:56 +02:00 |
|
Michael Vogel
|
eeb462cd04
|
Only update the contact entry with uid=0
|
2016-04-01 21:41:37 +02:00 |
|
|
|
d4fd01e25e
|
Merge pull request #2426 from annando/1604-cron-optimize
Don't optimize the tables when the maximum size is lower than zero
|
2016-04-01 21:26:12 +02:00 |
|
