Commit graph

2326 commits

Author SHA1 Message Date
friendica
c3590f6454 Merge https://github.com/friendica/red into zpull 2013-03-21 15:41:23 -07:00
friendica
b3417e4854 main_slider hook 2013-03-21 15:41:00 -07:00
Michael Meer
c1f3c72099 otherwise add profile wont work 2013-03-21 18:38:34 +01:00
friendica
6db6f6640e Merge pull request #38 from beardy-unixer/master
Small fixes
2013-03-21 02:20:32 -07:00
zottel
166596939b write notify settings to channel table when saving settings 2013-03-21 09:02:10 +01:00
Thomas Willingham
499083d5d4 Revert randprof - that was stupid. If you have a local channel, you also have it's xchan. 2013-03-20 23:43:02 +00:00
Thomas Willingham
28975931b5 Add a fallback or two to randprof. 2013-03-20 23:35:21 +00:00
Thomas Willingham
39028d6184 Make the channels profile tab actually do something. 2013-03-20 20:46:43 +00:00
Thomas Willingham
9c4b3b03db Allow admins to specify default mobile/accessibility theme. 2013-03-17 18:51:17 +00:00
friendica
104b41164f Merge pull request #34 from beardy-unixer/master
Admin panel
2013-03-15 15:38:38 -07:00
Thomas Willingham
b48c481b9c Tidy up 2013-03-15 15:25:39 +00:00
friendica
6a4170ab01 prepare for multiple content types 2013-03-14 22:21:38 -07:00
Thomas Willingham
d07971b909 Merge remote-tracking branch 'upstream/master'
Conflicts:
	view/theme/redbasic/css/style.css
2013-03-14 22:50:30 +00:00
Thomas Willingham
fbc5260995 Get admin/users mostly working. Still need to associate channels with accounts. 2013-03-12 02:35:18 +00:00
friendica
bcf4592cb0 likes were somewhat confused. Unconfuse them. 2013-03-11 00:14:12 -07:00
friendica
26499981b6 cleanup 2013-03-10 20:39:27 -07:00
friendica
952b2ef2ab . 2013-03-10 18:45:58 -07:00
Michael Johnston
41cd10f903 some fixes related to events
- add backticks around column "desc" in sql query
    - fixed query for data passed to showEvent
      - showEvent was picking up on id from item instead of id from event
    - fixed references to author info in template
2013-03-07 02:07:51 -05:00
friendica
5a9dae78a2 get rid of html from mod_suggest 2013-03-06 17:52:58 -08:00
friendica
c5d0da43e5 tweaky tweak, plus add share tracking db, and don't show acl for guest postings, and experiment with compressing pcss on the fly 2013-03-06 15:13:54 -08:00
friendica
5754d18286 replace old intro link 2013-03-06 02:01:57 -08:00
friendica
5054b6e363 add a fixme 2013-03-06 00:25:37 -08:00
friendica
59ea4e32a0 randprof sorta working 2013-03-06 00:21:02 -08:00
friendica
e8109a7652 send to chanview, not remote profile 2013-03-05 21:08:13 -08:00
friendica
4062be2869 basic friend suggestions (but not "new to the network and have no friends at all" suggestions) 2013-03-05 21:00:25 -08:00
friendica
481f8d3e18 typo in directing mod/follow to a login if not logged in 2013-03-05 16:01:07 -08:00
friendica
dd22e1b582 just tinkering and trying a few things - don't get upset. It can all be reverted it it sucks. Freedom's just another word for "nothin' left to lose" and I'm not sure it's possible to create a UI that's hated more than Friendica. So that gives us plenty of artististic license to explore some different directions and see if they lead to anything interesting. 2013-03-05 15:48:56 -08:00
friendica
8d442e6fc1 fix timeago (again), webfinger new spec implemented, some theme work 2013-03-04 20:58:39 -08:00
friendica
1aa7561a2c improve mod/display for local users - use their own copy if possible 2013-03-02 14:46:09 -08:00
friendica
70e766c2bf xss attack vector in bbcode.php - check for proc_open being disabled for security reasons in install 2013-02-26 19:41:44 -08:00
friendica
b69fca14e7 initial doco 2013-02-26 15:49:37 -08:00
friendica
c45a8e2763 make sure old fetch_url calls (and those that provided their own curl wrapper) go through z_fetch_url 2013-02-25 20:06:33 -08:00
friendica
46a89910ae partial port of embedded shares 2013-02-25 19:06:31 -08:00
friendica
cfd0dc1bff little fixes 2013-02-24 20:21:37 -08:00
friendica
32aef838f8 allow embedded content via ajax on page load 2013-02-23 01:27:43 -08:00
friendica
1abce176ff add groups and personal configs to export/import 2013-02-21 21:18:36 -08:00
Michael Johnston
6199e1d5b8 add siteinfo.tpl 2013-02-20 21:56:59 -05:00
friendica
130cad8cd8 give plugins control over magic auth so one could create plugins with policy controls (like friends only, etc.) or block lists to prevent automatic authentication. 2013-02-20 15:07:13 -08:00
friendica
92f94a0fdc contact_template is called from multiple places with different params 2013-02-20 14:17:23 -08:00
friendica
3ba267d0c0 unset auto increment keys on import 2013-02-19 22:55:34 -08:00
friendica
23718e5e28 that should be the last critical piece. Everything else is gravy. 2013-02-19 20:22:04 -08:00
friendica
ef360f0a5c dang - this is almost testable. Still have to figure out the best way to deal with the profile photo. Otherwise if you're really brave you could give it a go and see what happens. The worst that could happen is that it destroys the universe. Not a big deal. More likely you could end up with a bunch of imported things that have to be cleaned up. Less likely but entirely possible is that nothing useful will happen at all and it'll white screen. 2013-02-19 19:08:04 -08:00
friendica
24eac8c656 the heavy lifting is done for location migration aka channel import - now it's just connecting all the dots. Don't get impatient, there are a lot of dots. 2013-02-19 17:13:23 -08:00
friendica
d1190efe92 add renamed file 2013-02-19 03:01:58 -08:00
friendica
488714290f global rename viewcontacts to viewconnections 2013-02-19 03:00:29 -08:00
friendica
2d6027150f viewcontacts update 2013-02-19 00:20:47 -08:00
friendica
cf2bcfdd52 Merge pull request #27 from unary/connections
change collections to connections
2013-02-18 15:42:05 -08:00
friendica
65912ec0bf moving on 2013-02-18 15:15:55 -08:00
Michael Johnston
2fb44aa31b change collections to connections 2013-02-17 14:33:34 -05:00
friendica
e754845c80 add rating support to poco 2013-02-15 22:34:01 -08:00