clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,808 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

7808 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fermionic 44f4b9a29f Merge pull request #665 from tobiasd/foreach_arg 
invalid arguments for a foreach loop found
 2013-04-18 18:37:39 -07:00
fermionic 7b342d7297 Merge pull request #664 from tobiasd/issue_554 
Issue 554
 2013-04-18 18:37:11 -07:00
Tobias Diekershoff 960d1d99b2 invalid arguments for a foreach loop found 2013-04-17 17:32:31 +02:00
Tobias Diekershoff b6d1a1f125 tabwidth 2013-04-14 18:19:01 +02:00
Tobias Diekershoff 4dd406055c check password when changing users email 2013-04-14 17:58:16 +02:00
Tobias Diekershoff 7be1040a63 DE: update to the strings 2013-04-14 17:26:23 +02:00
Tobias Diekershoff 5827db0ea3 check current password before changing the password 2013-04-14 17:22:42 +02:00
fabrixxm d905f0a3e3 Merge pull request #663 from fabrixxm/moveme 
uimport: remove db scheme version check
 2013-04-08 06:17:51 -07:00
Fabrixxm 659d0cc1b8 uimport remove db scheme version check 2013-04-08 09:03:31 -04:00
friendica 8b4fa33c5e Merge pull request #662 from fermionic/20130407-display-own-post 
allow visiting other people's display/ links if I have a copy of the post
 2013-04-07 16:05:10 -07:00
Zach Prezkuta 2cc73dbef3 allow visiting other people's display/ links if I have a copy of the post 2013-04-07 11:38:37 -06:00
Tobias Diekershoff 17ca6290f5 DE: update to the strings 2013-04-06 08:25:33 +02:00
fermionic dddb0570c5 Merge pull request #661 from fermionic/20130404-update-frost-decaf 
update admin options for frost, frost mobile, and decaf mobile
 2013-04-04 15:43:47 -07:00
Zach Prezkuta 2316e0d731 update admin options for frost, frost mobile, and decaf mobile 2013-04-04 16:42:39 -06:00
friendica 61bff09ecd Merge https://github.com/friendica/friendica into pull 2013-04-04 15:13:06 -07:00
friendica 9660117c70 sync username when changed in either the default profile or the settings page 2013-04-04 15:10:14 -07:00
Tobias Diekershoff bee80004db DE: update to the strings 2013-04-04 17:27:49 +02:00
friendica 1e54f0022f Merge pull request #660 from fabrixxm/moveme 
uimport: check table columns before import
 2013-04-03 17:36:40 -07:00
friendica 8b51ffefc0 Merge https://github.com/friendica/friendica into pull 2013-04-03 16:29:13 -07:00
friendica db0bb50e37 rev update 2013-04-03 16:28:49 -07:00
Tobias Diekershoff e77521c42f PL: update to the strings 2013-04-03 09:28:37 +02:00
Fabrixxm 1442fecd14 uimport: fix file formatting 2013-04-02 09:44:19 -04:00
Fabrixxm 13e315e004 uimport: check table columns before import 2013-04-02 09:16:24 -04:00
tobiasd dbc4371391 Merge pull request #659 from mexon/fetch_url_content_type 
Make the content type available after calling fetch_url
 2013-04-02 00:17:28 -07:00
pixelroot ee07251d38 modified: view/theme/smoothly/style.css 
modified:   view/theme/smoothly/theme.php
 2013-04-01 19:36:22 +02:00
Matthew Exon 5b158dbcfb Make the content type available after calling fetch_url 2013-04-01 12:36:43 +08:00
tobiasd cda327a368 Merge pull request #658 from annando/master 
Mail importing problems, a small "vier" change
 2013-03-30 01:46:13 -07:00
Michael Vogel eabefb2f04 vier: The background color of the right area is now white. 2013-03-29 11:18:20 +01:00
Tobias Diekershoff ad48ab2928 DE: update to the strings 2013-03-28 07:49:58 +01:00
friendica 74954e6c68 Merge pull request #656 from fabrixxm/master 
phpdocs for include/text.php
 2013-03-27 19:44:24 -07:00
friendica 1eb56116e8 Merge pull request #657 from mexon/cron_lock 
Add separate lock file for cronhooks, which might also take a long time ...
 2013-03-27 19:41:59 -07:00
Matthew Exon c3621407d1 Remove debug line added by mistake 2013-03-28 10:29:27 +08:00
Matthew Exon 10b68ef837 Add separate lock file for cronhooks, which might also take a long time and shouldn't be allowed to interfere with itself 2013-03-28 09:49:10 +08:00
pixelroot d685181101 modified: view/theme/smoothly/style.css 
modified:   view/theme/smoothly/theme.php
 2013-03-27 20:08:06 +01:00
Fabrixxm 1a8bdf8ae8 more phpdocs 2013-03-27 10:28:56 +01:00
Fabrixxm a161b86d1f add phpdoc 2013-03-27 05:11:40 -04:00
tobiasd e7c705c9a1 Merge pull request #654 from mexon/filter_var 
Use filter_var instead of parse_url to validate URLs, since the latter r...
 2013-03-26 11:31:11 -07:00
pixelroot 2b7dd2f72b modified: view/theme/smoothly/style.css 
modified:   view/theme/smoothly/theme.php
 2013-03-26 17:10:58 +01:00
pixelroot 296c49f4a1 modified: view/theme/smoothly/style.css 
modified:   view/theme/smoothly/theme.php
 2013-03-26 15:47:17 +01:00
pixelroot 0a446da659 modified: view/theme/smoothly/css/typography.css 
modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
 2013-03-26 11:28:22 +01:00
Tobias Diekershoff 48ba0619c5 PL: update to the strings 2013-03-26 07:27:09 +01:00
tobiasd 80b78705ef Merge pull request #655 from tobiasd/admin_ostatus_poll 
Admin ostatus poll
 2013-03-25 23:16:49 -07:00
Tobias Diekershoff 8666673175 template additions for the options 2013-03-25 11:01:54 +01:00
Tobias Diekershoff c43e65e26b OStatus conversation poll option in the admin panel 2013-03-25 11:00:13 +01:00
fermionic 04a255e393 Merge pull request #652 from mexon/edited_timestamp 
items.php edited timestamp logic
 2013-03-24 07:30:07 -07:00
fermionic 316b93f9e3 Merge pull request #653 from tobiasd/typo_itemphp 
typo found in the php logs
 2013-03-24 07:29:44 -07:00
Tobias Diekershoff 4ee23069ad typo found in the php.logs 2013-03-24 09:37:11 +01:00
Tobias Diekershoff 4986e0b3cd PL: update to the strings 2013-03-24 07:26:28 +01:00
Tobias Diekershoff d921ca26d0 RU: update to the strings 2013-03-23 08:49:40 +01:00
Tobias Diekershoff 6f382f016d RU: update to the strings 2013-03-22 07:25:08 +01:00