Commit graph

8494 commits

Author SHA1 Message Date
Fabrixxm
11d1c1ae8e add tag to term table. fix "#xNNNN" tag filter. 2013-08-03 15:12:50 -04:00
Zered
1285cb2828 Merge pull request #2 from friendica/master
Update zered's repo
2013-08-02 10:59:13 -07:00
Zered
a0a25d0fcb Merge pull request #1 from zered/solve_741
Solving the "Disallow public access to addons listed in the apps menu" h...
2013-08-02 10:57:20 -07:00
fabrixxm
f1090b6d8c Merge pull request #747 from zered/solve_741
Solving the "Disallow public access to addons listed in the apps menu" h...
2013-08-02 09:57:17 -07:00
fabrixxm
462f19ccf2 Merge pull request #745 from mexon/redirect_fix
Appending URLs in case of redirect is incorrect
2013-08-02 08:43:01 -07:00
7169906a3a NL: update to the strings 2013-07-31 06:41:11 +02:00
fabrixxm
9aa769d250 Merge pull request #746 from fabrixxm/bug740
Close #740
2013-07-29 10:17:59 -07:00
Fabrixxm
cccdb2e5e7 api: `api_status_show()` returns correct post id 2013-07-29 10:48:30 -04:00
Matthew Exon
6a38705567 Replicate redirect URL building logic for post requests 2013-07-29 22:34:09 +08:00
Matthew Exon
eb9bd03ef8 If the header returns an absolute path as a redirect, don't simply append the path to the old URL, remove the old absolute path first.
For example, original URL:

http://www.theregister.co.uk/2013/07/28/birmingham_uni_car_cracker_muzzled_by_lords/print.html

Redirect from header:

/Print/2013/07/28/birmingham_uni_car_cracker_muzzled_by_lords/

Incorrect result:

http://www.theregister.co.uk/2013/07/28/birmingham_uni_car_cracker_muzzled_by_lords/print.html/Print/2013/07/28/birmingham_uni_car_cracker_muzzled_by_lords/

Correct result after this patch:

http://www.theregister.co.uk/Print/2013/07/28/birmingham_uni_car_cracker_muzzled_by_lords/
2013-07-29 10:15:39 +08:00
Michael Vogel
7770317f1e Preparations for a more visible reshare when exporting to twitter, statusnet or facebook.
The oauth-parts are some experimental stuff for the statusnet API - but they don't hurt.
2013-07-28 20:38:48 +02:00
Zered
a6fae9a0db Solving the "Disallow public access to addons listed in the apps menu" has no effect bug
Adding plugin_is_app function in include/plugin.php for checking if a plugin is an app or not (checking the existence of an 'app_menu' hook)

Populating the app menu conditionaly ( is the user logged or not, are apps private ) and dissalowing apps running if apps are private and the user not logged
2013-07-24 03:53:10 +02:00
7f36a6fcbd PL: update to the strings 2013-07-22 07:53:02 +02:00
0972189372 allow admins to add a new user from the admin panel (eventually fixing oldbug #383) 2013-07-21 08:46:57 +02:00
Michael Vogel
4dcd00cf4b Lockfile for onepoll, removing old smarty3 cache files. 2013-07-19 23:38:23 +02:00
fabrixxm
98105afffb Merge pull request #735 from fabrixxm/bug712
Fixes #712
2013-07-12 00:51:26 -07:00
d23e934d21 BG: update for the strings 2013-07-12 09:37:51 +02:00
497cee4311 BG: update for the strings 2013-07-12 09:37:26 +02:00
c6ac24ba00 IT: update for the strings 2013-07-12 09:37:09 +02:00
Fabrixxm
00df3ef5a7 Fixes #712 2013-07-11 03:34:49 -04:00
fabrixxm
0227372daa Merge pull request #732 from fabrixxm/bug728
Fix diaspora contacts profile image
2013-07-09 01:50:07 -07:00
1f68ffe3d1 NL: update to the strings 2013-07-08 14:42:56 +02:00
fabrixxm
c9604b776c stupid typo 2013-07-08 14:21:49 +02:00
Fabrixxm
cd35beb947 should fix #728 2013-07-08 04:52:14 -04:00
fabrixxm
8b9ae53242 Merge pull request #713 from annando/master
ejabberd and friendica
2013-07-05 12:40:30 -07:00
49785130c2 NL: update of the strings 2013-07-05 12:14:34 +02:00
b9093c300f FR: update of the strings 2013-07-05 12:14:20 +02:00
3185e49042 PT_BR: update of the strings 2013-07-05 12:13:43 +02:00
fabrixxm
a4a3ad5327 Merge pull request #720 from fabrixxm/feed_push
Feed PuSH
2013-07-01 10:16:53 -07:00
93dfdf85e8 NL: translation added from transifex 2013-06-29 10:45:25 +02:00
790257c6c2 CS: update to the strings 2013-06-28 14:36:21 +02:00
2f6d0dee7b DE: update to the strings 2013-06-28 14:35:53 +02:00
f87631b3f7 ZH_CN: update to the strings 2013-06-28 14:33:33 +02:00
95ee7a3bdc PL: update to the strings 2013-06-28 14:31:57 +02:00
fabrixxm
2ed427b8ca Merge pull request #721 from fabrixxm/master
uexport: fix full export
2013-06-28 00:19:56 -07:00
Fabrixxm
759afb4237 uexport: fix full export
- add new line after each valid json line
- export table row as single json object
2013-06-28 03:16:25 -04:00
Michael Vogel
edf8bde581 Complete oStatus conversations: Changed from file_get_contents to fetch_url 2013-06-27 22:27:59 +02:00
Fabrixxm
4748b6c4c3 remove unneeded logger function 2013-06-27 09:58:39 -04:00
Fabrixxm
0a1697d13a add pubsubhubbub support to feed contacts 2013-06-27 09:51:13 -04:00
bb59c9c32a CA: update to the strings 2013-06-27 07:29:18 +02:00
friendica
9ae4c1fb32 ignore hex escapes as numeric tags 2013-06-26 04:58:54 -07:00
friendica
1d0fccac6e Merge https://github.com/friendica/friendica into pull 2013-06-26 04:07:44 -07:00
friendica
bfc9cfb82f put tags in items 2013-06-26 04:02:04 -07:00
42644f6011 DE: update to the strings 2013-06-26 10:42:08 +02:00
dbc44f2b56 BG: added translation of the strings from transifex 2013-06-24 19:04:46 +02:00
10b8ab5e89 BG: added translation of the strings from transifex 2013-06-24 19:04:25 +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
Michael Vogel
16737298b4 Merge remote-tracking branch 'upstream/master' 2013-06-22 18:31:28 +02:00
Michael Vogel
e4ce383f2f It's now possible to authenticate an ejabberd server against friendica. See auth_ejabberd.php for details how to install. 2013-06-22 17:34:52 +02:00