Commit graph

325 commits

Author SHA1 Message Date
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
Thomas Willingham
b48c481b9c Tidy up 2013-03-15 15:25:39 +00: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
ffcba3db81 Fix path in photo_ablums.tpl 2013-03-13 23:56:14 +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
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
863dcda8ee clean up some funky menu interactions 2013-03-06 19:19:56 -08: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
517874ce1f stray target= which wasn't caught earlier 2013-03-06 00:34:42 -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
a132af7b6a conflicting class name 2013-03-05 19:13:33 -08:00
friendica
eebb0b323d tweaks 2013-03-05 17:30:03 -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
5612716cff taking the next step on pages 2013-02-27 17:09:04 -08:00
Michael Johnston
6199e1d5b8 add siteinfo.tpl 2013-02-20 21:56:59 -05:00
friendica
92f94a0fdc contact_template is called from multiple places with different params 2013-02-20 14:17:23 -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
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
65912ec0bf moving on 2013-02-18 15:15:55 -08:00
friendica
c42936e265 we don't need to quote or rename 'default' in mySQL if we just use the original column name 'is_default' 2013-02-15 17:23:02 -08:00
friendica
b2724f2ffd bring mod_common into the modern age 2013-02-13 15:40:24 -08:00
friendica
3ee75a795a Whinging whining stupid fucks. 2013-02-12 02:02:35 -08:00
friendica
32d07c3df7 fix profile selector on profile_photo page (unquoted mysql reserved word 'default') 2013-02-10 19:54:43 -08:00
friendica
99c5f88963 mod_display - no fun. Not working at all. But a bit of progress. 2013-02-10 04:55:29 -08:00
friendica
260a012b02 add soapbox settings 2013-02-10 00:13:34 -08:00
friendica
119ddcd147 finish the abook_edit quicklink mess, get rid of the experimental nav bar opacity. Bad idea. 2013-02-07 17:12:10 -08:00
friendica
65de97b85a auto form submission didn't work - jquery inheritance issue, disabling until we find another way. 2013-02-07 15:25:18 -08:00
friendica
d66825c734 auto-submit connection edit form when quick permissions are applied 2013-02-07 15:02:24 -08:00
friendica
386fa8e26c different background for preview so you know it's a preview 2013-02-04 19:25:24 -08:00
friendica
66b3603178 make preview work again after search/new template change 2013-02-04 18:50:55 -08:00
friendica
845ec4bef6 update search_item.tpl 2013-02-04 17:51:22 -08:00
friendica
da388f4bc5 fix new/search mod on network page, fix the parent queries on network and channel pages - which you probably didn't even notice were all stuffed up because the endless scroll made things right. 2013-02-04 17:46:04 -08:00
friendica
9dcecb6b37 finish up the "mark all xyz seen" for all known values of xyz 2013-02-03 19:07:01 -08:00
friendica
09ece497f7 more work on settings - move template utils to utils and get rid of mods 2013-02-02 16:10:27 -08:00
Thomas Willingham
1633f95db8 Clean up no longer used admin functions, plus fix summary template. 2013-02-02 14:54:40 +00:00
friendica
154ed4151a plugin_settings are now feature_settings 2013-01-31 20:39:14 -08:00
friendica
982034b87d update friends in common tool now that poco is working 2013-01-31 17:55:52 -08:00
friendica
357e71cb44 simplify friendship approval - merge with connection editing 2013-01-27 17:05:32 -08:00
friendica
493f68ca49 smarty update 2013-01-27 01:20:40 -08:00
friendica
28ab6d5bf5 lostpass fixes and login/logout flow if authenticated but no default channel exists 2013-01-27 01:19:24 -08:00
friendica
91126d8dd3 more photo backend stuff 2013-01-26 02:24:07 -08:00
friendica
a8575199af upstream fixes, template regeneration 2013-01-25 13:55:42 -08:00
friendica
50915c4692 add tooltip to toggle full screen mode 2013-01-25 03:58:36 -08:00
friendica
9a4667c77c tweaking z-index on chanview full-page mode so that everything works correctly 2013-01-25 03:52:16 -08:00
friendica
0f67657c44 ability to make chanview iframe full size (covering source window) and shrink it again 2013-01-25 02:53:41 -08:00
friendica
6e6b268e25 auto permissions (such as for forums or whatever) - untested but might just work 2013-01-23 21:15:40 -08:00
friendica
f63997f618 plug potential hole in magic auth, add link to chanview to view in dedicated window 2013-01-23 16:06:01 -08:00
friendica
cf2488e999 clean up the photo storage backend, revamp mod/wall_upload 2013-01-22 17:48:42 -08:00
friendica
d8d8dd5ced directory services cleanup 2013-01-19 01:07:35 -08:00
friendica
9725dcf41d distributed directory search from the navbar 2013-01-19 00:43:05 -08:00
friendica
4fd833b953 fix event notifications 2013-01-16 02:10:56 -08:00
friendica
f1afe68052 typo 2013-01-16 02:01:23 -08:00
friendica
b7d047483f missed adding these files yesterday, they're needed for pages to work 2013-01-15 13:59:52 -08:00
friendica
62b1eb65dc pages sorta working 2013-01-15 01:32:11 -08:00
Zach Prezkuta
690e278d95 add newline at end of header 2013-01-11 10:00:26 -07:00
Zach Prezkuta
34dc11d68e add warning messae about automatically generated templates 2013-01-11 09:57:23 -07:00
friendica
f0a08a05ae fix the "personal" network filter and introduction notifications 2013-01-09 23:07:13 -08:00
friendica
bb21c4bb13 update templates 2013-01-08 14:30:16 -08:00
friendica
948644bd46 minor notification tweaks 2013-01-08 13:38:07 -08:00
friendica
701a8e9925 update smarty templates 2013-01-08 12:05:38 -08:00
friendica
a96d3ac66f The rest of the front end for the new notifications - now only missing "mark all seen" for some types, ajax loader for a couple of types, and perhaps a birthday cake icon if any birthdays today, a bit of css cleanup of duplicated or obsolete stuff 2013-01-08 11:59:29 -08:00
friendica
ba20913c2b lots of notification tweaks 2013-01-08 02:49:08 -08:00
friendica
7f6e1144f6 The notification menu logic actually works. Yay. That means we've finally got an extensible notification system and can load arbitrary notifications of a given type into a popup (on demand), each with its own "view all" and "mark all seen". Now we just have to finish the json backends for the currently supported types and work them into the navbar. Might seem trivial or insignificant but this is a huge step forward. Online notifications are everything in an event driven world. 2013-01-07 23:28:25 -08:00
friendica
da188214c3 events are still buggered and aren't anywhere close to working, but not buggered quite as much as before. 2013-01-07 15:12:16 -08:00
friendica
479541b5f8 more work on notification popup 2013-01-06 22:00:31 -08:00
friendica
3fc6df1000 Merge pull request #13 from fermionic/20130105-smarty3
implement smarty3
2013-01-06 19:25:01 -08:00
Zach Prezkuta
b4a95460e6 fix show-stopping bugs 2013-01-06 19:34:54 -07:00
friendica
8766616e35 get sliders working again 2013-01-06 15:11:31 -08:00
Zach Prezkuta
4281a95cbc rebase and update themes 2013-01-06 16:08:56 -07:00
Zach Prezkuta
a0d19ffb72 implement Smarty3 2013-01-06 15:57:11 -07:00
friendica
7cd014e93c make preview work fix some other nits 2013-01-06 04:07:10 -08:00
friendica
d132d49e79 some work bringing acl_selectors into the modern era 2013-01-05 23:07:17 -08:00
friendica
490867ebf7 port "remember me" from Friendica 2013-01-04 21:34:36 -08:00
friendica
78a65c7c1b remove the country autofill declaration 2013-01-04 19:56:00 -08:00
friendica
b001323390 make the menu consistent and eliminate redundancy - though we need icons for mail and events (sorry Thomas if this breaks your themes in a bad way, but at least the menus make sense now). 2013-01-03 17:36:03 -08:00
friendica
9a8dec5480 place holders for mail and event icons on nav bar 2013-01-03 17:08:36 -08:00
friendica
f8bd476b88 import the toggle_mobile stuff to shut up some warnings 2013-01-03 15:52:05 -08:00
Thomas Willingham
556f38afde Add icons to redbasic, move delete button to the right, and sync nav.tpl 2013-01-01 13:15:45 +00:00
friendica
8d32477bff cleanup boot 2012-12-31 17:18:11 -08:00
friendica
4e23e700f4 requeue failed deliveries 2012-12-30 21:44:59 -08:00
friendica
70153a2274 fix connections page layout 2012-12-28 22:54:56 -08:00
friendica
ba627500d9 simplify, simplify. We don't need a photo menu on the connnections page. Click a person, goto profile edit. We can put all other operations you might wish to perform on that page. 2012-12-28 22:43:31 -08:00
friendica
da5a1be26d fix channel page permissions for public viewing 2012-12-28 19:56:01 -08:00
Thomas Willingham
d7a7679de0 Another diaspora template 2012-12-27 09:37:23 +00:00
Thomas Willingham
85049c860c Pretty sure we don't need Diaspora templates. 2012-12-27 09:24:39 +00:00
friendica
c8292b3cdd remove the private keywords stuff to reduce directory and search complexity 2012-12-26 03:49:50 -08:00
friendica
8d71fe91f6 cleanup editpost 2012-12-21 04:08:48 -08:00
friendica
ad20e1f617 directory page still needs a lot of work, look up locally if local master or standalone, need to put some basic profile info in discovery page and direct to local directory master 2012-12-19 19:51:52 -08:00
friendica
893ba371a9 set_baseurl issue, more cleanup 2012-12-19 16:48:17 -08:00
friendica
a12264193f modularise the notification popups 2012-12-18 16:17:08 -08:00
friendica
e9b5b0f0b4 several small fixes and adjustments 2012-12-16 20:20:29 -08:00
friendica
fa8b4e98b7 some cleanup - Thomas we can put the radius/shadow stuff back later for the hipster kids, it's quite distracting at the moment and makes it hard to get serious work done. Hmmm. Wonder if we could make radius/shadow configurable like colours.... and maybe even screen transparency.... that could be interesting. 2012-12-16 15:49:22 -08:00
friendica
76b289504b add live page loading and and endless scroll to home (mod_channel) 2012-12-16 00:44:38 -08:00
friendica
9d96cb37a0 pass module name to build_cmd, so we can use it elsewhere 2012-12-14 01:02:03 -08:00
friendica
4e192b108d templatise the building of page queries so we can re-use it elsewhere 2012-12-13 04:06:56 -08:00
friendica
c066793554 get rid of more targeted windows and direct all profile view to local site 2012-12-09 20:17:38 -08:00
friendica
f8c33243bf start to whip the permissions into shape, also got rid of the mce drop shadow until we can figure out how to do it without the ugly black bars. I tend to prefer "outy" shadows over "inny" shadows anyway, but maybe that's just me. 2012-12-09 18:07:36 -08:00
friendica
75ea0cfa32 make permission quick links work 2012-12-08 15:14:32 -08:00
friendica
2a39a5feee upstream fixes, revision updated, and mail autocomplete was lost after a recent change I made 2012-12-08 11:59:21 -08:00
friendica
2a7a5b2d01 move 'Connect' button to local chanview page, remove from remote profile pages - still requires some theming love 2012-12-06 19:44:13 -08:00
friendica
435836b224 templatise micropro 2012-12-06 18:17:43 -08:00
friendica
c6b8ab534f fixed several little nit bugs that cropped up during deployment 2012-12-06 00:03:24 -08:00
friendica
68c49322b7 bring back profile edit popup menu, needs some more theming 2012-12-05 21:40:30 -08:00
friendica
e17ba14696 DB: do the mail table again. Mail almost working onsite, still needs to zot though 2012-12-04 18:24:46 -08:00
friendica
c5cace552b most of the basic "make friends" stuff except for email notifications, drop community tab 2012-12-03 19:17:02 -08:00
friendica
a4bae6c29b profile viewer in iframe module, todo - magic auth 2012-12-03 16:14:34 -08:00
friendica
7082d198c2 Now if you follow somebody it will create an abook entry on the other site with blocked,ignored, and pending set. No "friend notifications" yet. 2012-11-29 18:15:13 -08:00
friendica
e138052584 backport features categories and add some new ones like the affinity slider 2012-11-28 19:23:39 -08:00
friendica
05e08cb5d2 trace through the threaded conversation spaghetti to bring back a sane looking network page 2012-11-28 18:45:11 -08:00
friendica
67a7d440d9 usability improvements 2012-11-13 02:57:15 -08:00
friendica
b1042da76c remove obsolete fields from admin template 2012-11-10 02:29:46 -08:00
friendica
593d361d2e profile/channel page view contacts 2012-11-09 00:02:46 -08:00
friendica
517c05700d turn star into a feature 2012-11-08 23:04:34 -08:00
friendica
22841e1566 start implementing zot-id 2012-11-08 19:07:19 -08:00
friendica
f66a3d26be magic auth indicator (link is dead at the moment) 2012-11-08 18:44:33 -08:00
friendica
c1b931549c permissions and contact permissions are now sticky 2012-11-08 17:33:38 -08:00
friendica
3d56ab227d turn multiple profiles into a feature, implement connection flags (block,hide,archive,etc.) 2012-11-07 18:48:31 -08:00
friendica
295b865d06 "follow" now creates an address book entry, which means we can start tying that into the "connections" module - still have to turn the "contact edit" page from a mockup to real code, but it's all starting to flow. 2012-11-06 18:13:47 -08:00
friendica
fe5f511f19 more work on the settings pages 2012-11-05 17:17:21 -08:00
friendica
4f1170b656 change permission settings from radio buttons to select boxes 2012-11-05 15:26:01 -08:00
friendica
152641bf24 that was certainly some fun debugging (not) 2012-11-04 20:53:59 -08:00
friendica
94f737b699 some cleanup of main item template 2012-11-04 16:57:09 -08:00
friendica
aaa5a2638c feature enable 'dislike' - backend 2012-11-03 23:39:38 -07:00
friendica
9d0f94bb73 add template 2012-11-03 21:38:18 -07:00
friendica
f55636aeb6 turn off categories feature by default 2012-11-03 16:51:29 -07:00
friendica
f5b1eee177 mv mod_install to mod_setup, conflict with name of install dir 2012-11-03 14:59:46 -07:00
friendica
9bb1b7e3ed fix default channel 2012-11-02 18:55:40 +11:00
friendica
3bf5677797 settings page channel permissions front-end (needs back-end still) 2012-11-01 19:47:10 -07:00
friendica
1021a4d476 add current selection to channel manager 2012-11-01 17:06:34 -07:00
friendica
9bf4508ffb cleanup channel management 2012-11-01 15:45:02 -07:00
friendica
fb173900a1 more progress on address book 2012-10-30 21:37:58 -07:00
friendica
ffadf260c0 fix channel creation and management after last changes 2012-10-30 16:21:24 -07:00
friendica
dca20f4227 zchannel rename to new_channel 2012-10-29 21:59:49 -07:00
friendica
e138876199 fix updating of bitwise 'unseen' to account for mysql operator precedence 2012-10-28 22:08:08 -07:00
friendica
0baf4bb4d2 fix a couple of things that went wonky when moving to thread objects 2012-10-27 03:05:51 -07:00
friendica
3b394ea43f comments sort of working again but now need to fix the threading which was ported when it was only half working 2012-10-25 18:42:42 -07:00
friendica
ceeb4db6e3 Give the UI a little love after all the backend mods 2012-10-24 19:13:29 -07:00
friendica
f685b67656 new install settings 2012-10-18 18:34:38 -07:00
friendica
846a9813b2 here's where the heavy lifting begins - everything is likely to be broken for quite some time as we add location and db independence to items and conversations and work through the rest of the permissions and how to federate the buggers. 2012-10-01 18:02:11 -07:00
friendica
ba4fe4ff91 allow themes to add to and/or completely over-ride the module sidebar 2012-09-25 21:35:35 -07:00
friendica
fbafd92f7f moving a lot of structure around. 'entity' is now 'channel' 2012-09-25 17:57:20 -07:00
friendica
c8957b36ea permissions responder + upstream merge 2012-09-10 22:00:56 -07:00
friendica
61cca7637a States/Countries now free form 2012-09-09 21:51:54 -07:00
friendica
e4f3e96b65 remove targeted windows 2012-09-09 21:26:36 -07:00
friendica
3ebb4a3dc7 updates 2012-09-09 21:17:06 -07:00
friendica
aff33531ac channel/identity selection manage page 2012-09-02 20:30:47 -07:00
friendica
58ddd2d565 Trying to simplify channels 2012-09-02 02:29:17 -07:00
friendica
4736fa5927 begin channel management (was "manage") page, use term "channel" instead of the vague and hard to explain "identity" 2012-08-30 22:42:51 -07:00
friendica
eac29badb2 start on contacts/profiles 2012-08-30 18:17:38 -07:00
friendica
f6d198ce5d trim a bit of fat 2012-08-29 23:03:03 -07:00
friendica
da49a27aa2 make home redirection and register link work again 2012-08-28 03:25:42 -07:00
friendica
9cd1dabe73 have to do something about that return_url - but let's just plunge forward without it. 2012-08-28 03:02:45 -07:00
friendica
7fad83cea4 Now logging in with Red zaccount/zentity instead of Friendica user. Yay. Most existing Friendica functionality is now stuffed since the Red structures are quite different. 2012-08-27 21:17:46 -07:00
friendica
5ff6e9348b a few minor changes 2012-08-26 23:05:00 -07:00
friendica
2456174cc9 back to identity creation form 2012-08-23 20:00:10 -07:00
friendica
30e86284af upstream 2012-08-21 20:03:25 -07:00
friendica
34e42c4cb3 don't count ignored events in notifications 2012-08-16 23:11:24 -07:00
friendica
a7c1c22a2a new contact edit mockup - verdict: too complicated, must simplify 2012-08-16 21:41:07 -07:00
friendica
57cf80754d invitation cleanup 2012-08-16 05:29:16 -07:00
friendica
adba0bd98a That's better 2012-08-16 01:03:53 -07:00
friendica
eb911443aa more zregister cleanup and theme separation 2012-08-16 00:51:03 -07:00
friendica
f7c6a6ff90 item table rename parent-uri, target-type, object-type (more to come later) 2012-08-15 22:33:37 -07:00
friendica
77b334efbc cleanup of mod_zregister, basic functionality working - new accounts getting stored. 2012-08-15 21:56:04 -07:00
friendica
2a49460c77 improvements in js localisation/translation 2012-08-13 22:12:16 -07:00
friendica
e80d69d25b merge upstream 2012-08-11 18:54:23 -07:00
friendica
cac2d40832 Dr. Theme-instein - It Lives! 2012-08-09 22:48:13 -07:00
friendica
c8fe8f4376 where did that !@#$ "lang" come from? Get rid of it (again). 2012-08-09 20:55:34 -07:00
friendica
f2a7fcf822 more theme modularisation and css/js management 2012-08-09 19:09:55 -07:00
friendica
0292d46e5d merge comment threading, provide plugin/theme functions to handle css/js includes 2012-08-09 16:26:44 -07:00
friendica
dcbc0c0c95 major theme re-org, only duepuntozero and slackr working atm 2012-08-01 05:02:43 -07:00