Commit Graph

Select branches

Hide Pull Requests

3.6RC

CAPTHA

develop

japanese

master

origin

0.10

0.11

0.8

0.9

1.0

1.1

1.10

1.12

1.14

1.14.2

1.2

1.3

1.3.1

1.4

1.6

1.8

2.0

2.2

2.4

2.4.2

2.6

2.6.1

2.6.2

2.6.3

2.8

2.8.1

3.0

3.0.1

3.2

3.2.1

3.2.2

3.4

3.4.1

3.4.2

3.6

3.6.1

Mono Color

• 420b330e55 the bootstrap theme is obsolete, use clean instead tobiasd 2014-01-23 11:58:56 +01:00
• bf8e73ca73 missing filename in uploaded photos (we don't really use this, but we will need to have a filename to export via DAV or API and the original filename would be the most likely choice). friendica 2014-01-22 23:54:14 -08:00
• aec78b3284 Merge branch 'master' of https://github.com/friendica/red Michael Meer 2014-01-23 08:50:27 +01:00
• bc98f4ddf4 fix api/red/photos when supplied with an album name friendica 2014-01-22 23:04:19 -08:00
• 43f2d6972c API: provide a link to photo albums in api/red/albums friendica 2014-01-22 22:56:16 -08:00
• 79c287916f Merge https://github.com/friendica/red into zpull friendica 2014-01-22 22:15:30 -08:00
• 66baa3cab0 try to reduce the number of simulaneous deliveries of the same post when dealing with owner relays that have more than one channel instance. If things melt down in the next few hours and I'm not available please revert this. I've reviewed a few times and think it's OK, but this part of the delivery code is traditionally touchy. friendica 2014-01-22 22:07:47 -08:00
• 1a3ae295e0 some intial work on a splashier homepage friendica 2014-01-22 17:01:53 -08:00
• b8ae9014e7 Nobody seems to be using that anymore Thomas Willingham 2014-01-23 00:23:49 +00:00
• e4bce90b53 Merge pull request #279 from git-marijus/master friendica 2014-01-22 14:52:31 -08:00
• 927098ae19 Merge pull request #280 from beardy-unixer/master friendica 2014-01-22 14:48:22 -08:00
• 040d87c999 update argument ?f= marijus 2014-01-22 23:24:09 +01:00
• 25f7a7fac9 Give pages enough to construct a share button. Thomas Willingham 2014-01-22 22:17:12 +00:00
• d341358afb Add $since_id to items_fetch Christian Vogeley 2014-01-22 23:15:42 +01:00
• eb868f6df8 make network tabs regard selected group (collection) and vice versa marijus 2014-01-22 17:18:40 +01:00
• 6a1e73e610 Merge branch 'master' of https://github.com/friendica/red Michael Meer 2014-01-22 13:38:47 +01:00
• 3914200223 simplify chanview authentication and make sure it carries through multiple generations friendica 2014-01-22 03:01:28 -08:00
• ffabb4cc86 reorg formula data for hubloc checks Michael Meer 2014-01-22 11:29:49 +01:00
• f28b21f99d start with hubloc ping Michael Meer 2014-01-22 09:16:22 +01:00
• 3f49114a05 remove debugging friendica 2014-01-21 23:12:03 -08:00
• 3b375a3d3f fix location of string file in Translations.md, fix some permissions and owner vagueness (potential bugs) in profile_tabs() friendica 2014-01-21 23:09:33 -08:00
• a13393fb23 seems you can't easily have a blank password for DAV guests, so the guest password is now +++ friendica 2014-01-21 20:42:10 -08:00
• c41d3b2d53 text - change remove account button to remove channel friendica 2014-01-21 19:01:23 -08:00
• 05951a9877 add primary webbie to directory popup friendica 2014-01-21 18:45:40 -08:00
• 55e4a53e01 push new messages.po friendica 2014-01-21 18:11:44 -08:00
• 0dbbe007e8 add the quota and volume size code friendica 2014-01-21 15:38:02 -08:00
• e960256466 Merge https://github.com/friendica/red into zpull friendica 2014-01-21 14:57:31 -08:00
• 60416d6f33 fix the admin interface to pending registrations friendica 2014-01-21 14:56:42 -08:00
• 6968f583ea Merge pull request #278 from zzottel/master friendica 2014-01-21 04:43:53 -08:00
• 530adb50ee sql error friendica 2014-01-21 00:40:45 -08:00
• c07c532336 Merge https://github.com/friendica/red into zpull friendica 2014-01-21 00:20:30 -08:00
• 8a5c747010 move some store things friendica 2014-01-21 00:19:53 -08:00
• 35733ca013 create store directory if it's missing before initialising DAV friendica 2014-01-21 00:02:25 -08:00
• 46252f94a3 added feed2red.pl zottel 2014-01-21 08:55:14 +01:00
• bab20689cf Merge pull request #277 from git-marijus/master friendica 2014-01-20 23:52:37 -08:00
• 19b6ed68c1 lighttpd sample conf update marijus 2014-01-21 08:51:21 +01:00
• 8c4f7216ed Nginx conf update Thomas Willingham 2014-01-21 05:51:54 +00:00
• 583be04583 Debian install script doco Thomas Willingham 2014-01-21 05:26:59 +00:00
• 13c226bdbe Merge https://github.com/friendica/red into zpull friendica 2014-01-20 17:46:11 -08:00
• ea606869a6 when loading a single thread on the channel page, tell JS that there isn't any more content to load. friendica 2014-01-20 17:45:02 -08:00
• 3469e63ef5 Add BBCode extensions to doco Thomas Willingham 2014-01-20 23:34:21 +00:00
• 8cd6c97e21 Merge https://github.com/friendica/red into zpull friendica 2014-01-20 14:19:25 -08:00
• 5b69e3b795 Add external resource list so this stuff doesn't get lost. Please update it if you know of other related projects. friendica 2014-01-20 14:18:12 -08:00
• e3e7ef51af Merge pull request #276 from MicMee/master friendica 2014-01-20 04:10:32 -08:00
• 86e2237555 no need to have a doule hublocid Michael Meer 2014-01-20 13:03:24 +01:00
• f563ea4b39 Merge pull request #275 from MicMee/master friendica 2014-01-20 03:40:00 -08:00
• a13593590b added buttons to perform later hubloc actions Michael Meer 2014-01-20 12:12:40 +01:00
• e68748afab transifex didn't like plural-forms and now they don't like it commented out. So we'll try uncommenting the sucker and see if they like it again. friendica 2014-01-20 03:11:45 -08:00
• 1fa8546d46 zidify audio/video links friendica 2014-01-20 01:29:41 -08:00
• fdfea0a8e9 catch auth exceptions friendica 2014-01-20 01:03:58 -08:00
• d5bf53c54c bring photo tagging back which hasn't worked since forking from Friendica - this is untested and displaying photo tags will now be broken as we're now storing tags with the item attached to the photo and not in the photo. But the point is we've eliminated the OStatus/SWAP0 forced spam crap and can start fresh. friendica 2014-01-19 23:37:46 -08:00
• 0250223438 revert 26dfcecf05 friendica 2014-01-19 22:34:28 -08:00
• e54a501058 Merge https://github.com/friendica/red into zpull friendica 2014-01-19 22:28:46 -08:00
• 26dfcecf05 Prevent zids messing up dav Thomas Willingham 2014-01-20 06:28:38 +00:00
• 82a5eb5d90 strip zid= from REQUEST_URI as well as QUERY_STRING - sabre uses both friendica 2014-01-19 22:27:54 -08:00
• 9fb36df8d9 Fix dav directory creation. Thomas Willingham 2014-01-20 01:54:52 +00:00
• e9ce68559e Stop Google DDoSing me by providing block_public_search, which unlike block_public will block *only* searching without an observer. Thomas Willingham 2014-01-19 23:48:26 +00:00
• 3459c717d4 don't allow the demo upload server to operate - otherwise one could find themselves with a bunch of unwanted uploads friendica 2014-01-19 14:21:26 -08:00
• f3a7bf913f add the jquery file uploader. Have been suggesting this as a replacement for the valum uploaders for quite some time - as there is client resize ability and no license incompatibilities. It still requires integration. friendica 2014-01-19 14:08:21 -08:00
• 724ad45056 add ajaxchat library - needs a lot of integration work to handle decentralisation (e.g. chatroom@website) and zotid w/permissions (e.g. ACL controlled chatrooms); we can also rip out a lot of stuff we don't need. friendica 2014-01-18 23:49:39 -08:00
• 3f7032e542 Merge https://github.com/friendica/red into zpull friendica 2014-01-18 21:46:16 -08:00
• db67f08d3c some more bookmark infrastructure plus a doc update friendica 2014-01-18 21:45:42 -08:00
• 331609cb87 vcard widget needs to include Contact if it's not included from the module that calls it. Thomas Willingham 2014-01-18 18:38:53 +00:00
• 52d52a6a4f Doco - s/chown/chmod Thomas Willingham 2014-01-18 05:24:51 +00:00
• 2e83b78d70 Merge branch 'master' of https://github.com/friendica/red Thomas Willingham 2014-01-17 23:32:03 +00:00
• a59b7c97f4 Missed these from git add...a year ago Thomas Willingham 2014-01-17 23:30:33 +00:00
• c7585e4e58 Merge pull request #274 from zzottel/master friendica 2014-01-17 12:55:01 -08:00
• 1a76f1c659 Un-break dav auth. Thomas Willingham 2014-01-17 20:52:57 +00:00
• a0d6d3c7f9 set jsAvailable cookie expire time to match PHPSESSID's zottel 2014-01-17 07:56:34 +01:00
• 359d798029 kill the ummagumma effect friendica 2014-01-16 13:26:39 -08:00
• be6a16139c Merge pull request #273 from zzottel/master friendica 2014-01-16 13:06:49 -08:00
• 1280a9abfa prevent reload loop if JS is active, but no cookies accepted zottel 2014-01-16 14:22:59 +01:00
• 5c606a19cf Update messages.po fabrixxm 2014-01-16 10:31:14 +01:00
• 898049e14f Merge https://github.com/friendica/red into zpull friendica 2014-01-16 01:20:44 -08:00
• 18a40d0c37 prevent zid's from reaching the DAV core code. friendica 2014-01-16 01:19:58 -08:00
• 6920c203d1 Remove deprecated CSS - there is a dark schema now, and shadows and stuff are cofigurable. Thomas Willingham 2014-01-16 04:18:19 +00:00
• cd72fd3f01 Tweak "typical" perms macro Thomas Willingham 2014-01-16 02:53:05 +00:00
• ec6b8e5cda Merge branch 'master' of https://github.com/pixelroot/red into pixelroot-master friendica 2014-01-15 16:14:43 -08:00
• f27d59a094 Merge pull request #272 from beardy-unixer/master friendica 2014-01-15 15:42:07 -08:00
• 9f66e5aef3 Merge remote-tracking branch 'upstream/master' Thomas Willingham 2014-01-15 23:01:02 +00:00
• 9addc83520 Log failed auth to it's own file so fail2ban doesn't have to parse MB of text Thomas Willingham 2014-01-15 22:54:51 +00:00
• 762a543249 allow menus to have special roles friendica 2014-01-15 12:57:12 -08:00
• e4217dc141 fix folder timestamps and change them when a child DAV file is written to friendica 2014-01-15 04:02:15 -08:00
• 403b01da23 Merge https://github.com/friendica/red into zpull friendica 2014-01-15 03:14:07 -08:00
• 47b8071ca7 dav: throw exception if channel for requested DAV directory is deleted friendica 2014-01-15 03:12:47 -08:00
• a49704fdb6 Probably shouldn't list REGISTER_CLOSED sites on a list of open hubs. Thomas Willingham 2014-01-14 03:50:32 +00:00
• d0e657f0f0 Merge pull request #271 from cvogeley/master cvogeley 2014-01-13 14:14:53 -08:00
• d9d894cbb3 Confirm box: fall back to standard js confirm dialog if bootstrap isn't available Christian Vogeley 2014-01-13 22:32:13 +01:00
• 4fdd9c39c5 modified: view/ru/messages.po modified: view/ru/strings.php pixelroot 2014-01-13 18:29:37 +01:00
• ecb125a47d modified: view/ru/messages.po pixelroot 2014-01-13 16:10:58 +01:00
• 9e8ed133c3 Merge pull request #269 from tobiasd/de20140113 tobiasd 2014-01-12 22:30:15 -08:00
• 87b99be785 DE: update to the strings Tobias Diekershoff 2014-01-13 07:28:16 +01:00
• df9e628495 Merge pull request #268 from cvogeley/master cvogeley 2014-01-11 17:34:37 -08:00
• 325c5e4e76 delete confirmation popup for blocks and layouts Christian Vogeley 2014-01-12 02:29:03 +01:00
• 134bb139dc Merge pull request #267 from cvogeley/master cvogeley 2014-01-11 17:09:34 -08:00
• b5fbee67b1 Do the same thang for webpage blocks Christian Vogeley 2014-01-12 02:06:59 +01:00
• 3e54ccde08 Merge pull request #266 from cvogeley/master cvogeley 2014-01-11 16:55:06 -08:00
• 7a9ea83382 Fix webpage layout title editing Christian Vogeley 2014-01-12 01:51:30 +01:00
• 3dfcb7510c Merge pull request #265 from cvogeley/master cvogeley 2014-01-11 15:58:57 -08:00
• 6403875f26 remove debug loggers Christian Vogeley 2014-01-12 00:53:28 +01:00