Commit graph

8013 commits

Author SHA1 Message Date
Michael Vogel ed33d28e61 redoing the change concerning the hostname. 2013-08-12 11:09:11 +02:00
Michael Vogel 61020cf174 Merge remote-tracking branch 'upstream/master' 2013-08-11 21:20:36 +02:00
Michael Vogel e746c4955b Added an option to configure the hostname manually. And there was a problem when APC wasn't present. 2013-08-11 21:19:26 +02:00
Michael Vogel d92a348cf0 - Using APC to store config values (when present)
- Enabling interlacing for pictures
2013-08-09 18:28:50 +02:00
fabrixxm 1df7211dfd Merge pull request #751 from fabrixxm/master
move register_adminadd_eml.tpl to view/en/
2013-08-08 08:36:22 -07:00
Fabrixxm e8171a03d1 move register_adminadd_eml.tpl to view/en/ 2013-08-08 11:35:12 -04:00
Tobias Diekershoff 1b3961286d PT BR: update to the strings 2013-08-06 20:12:37 +02:00
fabrixxm 7e61c23994 Merge pull request #744 from annando/master
- More visible reshares
- lockfile for onepoll.php
- clear old smarty3 cache files
- rework tag serarch
- add more logs for diaspora messages
2013-08-06 09:50:51 -07:00
Michael Vogel 6576aae938 If APC is enabled then store config data there 2013-08-06 00:20:16 +02:00
Michael Vogel e40bcbb4bc Some debugging information added 2013-08-05 23:06:40 +02:00
Michael Vogel 741b932cc9 Merge remote-tracking branch 'upstream/master' 2013-08-05 20:32:02 +02:00
Michael Vogel f70a80bbe5 Changed the tag search. This hopefully speeds it up on larger systems. 2013-08-05 20:31:08 +02:00
fabrixxm 3e4c4f53f7 Merge pull request #750 from zered/deleted_user_disp
Deleted user display in admin page
2013-08-05 04:24:54 -07:00
Zered 82972be85e Adding a "User waiting for permanent deletion" table in admin page 2013-08-05 06:08:33 +02:00
fabrixxm 9b79c6607c Merge pull request #748 from fabrixxm/bug739
add tag to term table. fix hex tag filter. close #739
2013-08-04 00:17:07 -07:00
Fabrixxm 3f36d375e2 hex tag filter: look at entire string 2013-08-04 03:12:17 -04:00
Fabrixxm 2f6333c751 remove debug code. again. 2013-08-04 03:11:01 -04:00
Tobias Diekershoff 14474f965f NL: update to the strings 2013-08-04 08:40:55 +02:00
Fabrixxm 50233ba290 remove debug code 2013-08-03 15:18:41 -04:00
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
Tobias Diekershoff 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
Tobias Diekershoff 7f36a6fcbd PL: update to the strings 2013-07-22 07:53:02 +02:00
Tobias Diekershoff 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
Tobias Diekershoff d23e934d21 BG: update for the strings 2013-07-12 09:37:51 +02:00
Tobias Diekershoff 497cee4311 BG: update for the strings 2013-07-12 09:37:26 +02:00
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 49785130c2 NL: update of the strings 2013-07-05 12:14:34 +02:00
Tobias Diekershoff b9093c300f FR: update of the strings 2013-07-05 12:14:20 +02:00
Tobias Diekershoff 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
Tobias Diekershoff 93dfdf85e8 NL: translation added from transifex 2013-06-29 10:45:25 +02:00
Tobias Diekershoff 790257c6c2 CS: update to the strings 2013-06-28 14:36:21 +02:00