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

• 33394f58ff Moved RedBrowser class from reddav.php to it's own file. Klaus Weidenbach 2014-10-06 23:20:17 +02:00
• cef8955d57 We have no submodules, so no need for .gitmodules file. Klaus Weidenbach 2014-10-06 23:03:58 +02:00
• 6e4f7383f1 Merge https://github.com/friendica/red into pending_merge friendica 2014-10-06 15:16:46 -07:00
• dc6b789871 Merge https://github.com/friendica/red into pending_merge friendica 2014-10-06 15:02:48 -07:00
• 5236516145 install doc double escapes the store/[data] path. friendica 2014-10-06 15:01:55 -07:00
• 7577227a6d Merge pull request #618 from solstag/master RedMatrix 2014-10-07 09:01:54 +11:00
• 5be36112ed This one had a minor glitch. Jeroen 2014-10-06 19:59:50 +00:00
• 532417f4e4 Re-created the new png avatars in SVG and exported them directly from Inkscape to PNG. Result: super sharp. Jeroen 2014-10-06 17:20:15 +00:00
• 6b40c2cd09 Merge remote branch 'upstream/master' habeascodice 2014-10-06 08:43:29 -07:00
• c528eef4b4 new version of moment.js to match datetimepicker Alexandre Hannud Abdo 2014-10-06 11:55:37 -03:00
• 34ef3fda76 attempt to deal with the diaspora recursive reshare from hell (Bob reshared Nancy's reshare of George's reshare of Lilly's reshare of Nathan's post). The attribution may be wrong so this is still a work in progress. friendica 2014-10-05 22:17:51 -07:00
• 2cadc5a840 send dislike activities to diaspora as comments, also send likes and dislikes of comments as additional comments. We won't go into why this is necessary for a service that claims to support activitystreams. friendica 2014-10-05 17:27:52 -07:00
• e0854a6815 Merge https://github.com/friendica/red into pending_merge friendica 2014-10-05 17:18:28 -07:00
• 4d049741ef try and guess mimetype for openid profile photo friendica 2014-10-05 17:17:25 -07:00
• 43898031d8 Merge pull request #617 from solstag/master RedMatrix 2014-10-06 09:44:09 +11:00
• bf6c72fc0e Merge https://github.com/friendica/red into pending_merge friendica 2014-10-05 15:42:25 -07:00
• d4a6a6b4f5 diaspora share not rendering issue - still have one remaining (the recursive share from hell) friendica 2014-10-05 15:41:03 -07:00
• b15301aabb New tag version of datetimepicker avoids hanging some browsers Alexandre Hannud Abdo 2014-10-05 19:06:58 -03:00
• 7bad7e505a Merge pull request #616 from dawnbreak/docu RedMatrix 2014-10-06 09:02:21 +11:00
• a17eae941b image/jpeg > image/png Jeroen 2014-10-05 21:38:47 +00:00
• 0fd55707f5 Licenses issues. Jeroen 2014-10-05 21:22:53 +00:00
• 0049f4c71a +png support jeroenpraat 2014-10-05 21:05:50 +02:00
• ae9b0c0e1b Changed default avatars to PNG as agreed with Mike here: https://redmatrix.nl/channel/jeroenpraat/?f=&mid=83603d8f0876c040efafce87755fcd252dbe8da4a75d82fdb230519e3c8dcb72@redmatrix.nl. Added a few new. You can set it like this: util/config system default_profile_photo red_avatar Jeroen 2014-10-05 18:32:28 +00:00
• fe9de8e834 Merge pull request #613 from unary/typo Klaus 2014-10-05 17:34:55 +02:00
• 305498eb16 Some documentation for include/reddav.php and a bit code cleanup. Removed some duplicate code in RedBasicAuth and restructured a bit. Still work in progress. Klaus Weidenbach 2014-10-05 15:24:16 +02:00
• 0875448ab9 Some documentation of include/auth.php. Klaus Weidenbach 2014-10-05 14:51:58 +02:00
• 82ba42586c add blueimp-jquery-file-upload library friendica 2014-10-05 01:18:50 -07:00
• 191ef124cf add 'nopush' option to the post API so somebody could bulk load a bunch of existing content via the API without invoking the notifier and sending each out as a fresh post. friendica 2014-10-05 01:09:57 -07:00
• 9135ad30d8 network page default option friendica 2014-10-04 23:53:05 -07:00
• b0544cc9e7 +urls to pubsites and install jeroenpraat 2014-10-04 13:49:44 +02:00
• c4ee971b52 updated it with the same text as in assets/home.html jeroenpraat 2014-10-04 13:39:48 +02:00
• 5eba3c17cb typo Michael Johnston 2014-10-03 20:33:35 -04:00
• f618e02117 Merge https://github.com/friendica/red into pending_merge friendica 2014-10-03 16:52:01 -07:00
• ec604a4158 more infrastructure for sharing page design elements friendica 2014-10-03 16:51:22 -07:00
• 62f7bf51ba Merge pull request #612 from beardy-unixer/master RedMatrix 2014-10-04 07:56:42 +10:00
• 55b75381ad it seems this is needed also to not allow editing profile photo album marijus 2014-10-03 19:15:37 +02:00
• 557894bc01 That's a string, not an integer Thomas Willingham 2014-10-03 15:16:05 +01:00
• e2f45a76b1 remove the privacy macros in settings and connedit now that we have privacy roles attached to the channel. One can still use the advanced permission dialogues, but they shouldn't have a reason to if they created the channel with a suitable channel type - plus it's just a bunch of extra permissions settings to confuse people. friendica 2014-10-03 04:54:27 -07:00
• a177cd1bd4 more work on shared design elements friendica 2014-10-03 04:05:05 -07:00
• 328d72971d Merge https://github.com/friendica/red into pending_merge friendica 2014-10-03 03:35:50 -07:00
• 2bd4b36238 rev update friendica 2014-10-03 03:35:01 -07:00
• f5623ae11d doc updates friendica 2014-10-03 03:34:50 -07:00
• dfd39ebb3c Merge pull request #611 from tuscanhobbit/dev RedMatrix 2014-10-03 18:51:16 +10:00
• 09e0b4e2a1 Set timezone when creating a channel. Thomas Willingham 2014-10-03 00:57:07 +01:00
• df70c2c9b6 more work on photos marijus 2014-10-02 21:04:50 +02:00
• 9495aba499 site language in siteinfo/json has been re-added Paolo Tacconi 2014-10-02 16:25:34 +02:00
• a932c20dc4 Merge pull request #610 from tuscanhobbit/dev RedMatrix 2014-10-02 23:05:59 +10:00
• 15c1529e83 query for statistics are now executed by poller Paolo Tacconi 2014-10-02 13:43:48 +02:00
• 16b94f1dc0 issues with diaspora comment signatures on relayed comments that are relayed through a redmatrix site (parent post is redmatrix) and involve a private post. friendica 2014-10-02 02:43:07 -07:00
• 9cebe8ccf0 Merge from master Paolo Tacconi 2014-10-02 11:31:56 +02:00
• cc95f91c54 Rebase from upstream Paolo Tacconi 2014-10-02 11:31:51 +02:00
• baa0b0f393 only auto-follow the site recommendations if creating the first channel for an account. friendica 2014-10-01 15:40:19 -07:00
• 467c6c72f0 ability to pre-populate connections for new channels. e.g. "MySpace Tom" friendica 2014-10-01 14:48:08 -07:00
• b39cd90e07 site language was left out of siteinfo tuscanhobbit 2014-10-01 20:11:11 +02:00
• 9cce852ac7 Merge from upstream tuscanhobbit 2014-10-01 19:26:21 +02:00
• f19d718631 that's why remove_obsolete_hublocs() isn't telling anybody when it does its thing, I forgot to uncomment the bit that tells everybody after I tested it. I needed extensive testing to make sure we didn't accidentally wipe out all hublocs everywhere. Testing went fine so I just assumed it was all working as planned; but went back today to find out why I wasn't told of a recent change. friendica 2014-09-30 23:41:50 -07:00
• 79f1d48e19 Merge https://github.com/friendica/red into pending_merge friendica 2014-09-30 21:31:31 -07:00
• cb44d015f3 allow site specific templates, css, js, whatever friendica 2014-09-30 21:30:27 -07:00
• e12872fdae Merge pull request #608 from beardy-unixer/master RedMatrix 2014-10-01 14:11:16 +10:00
• bfa4cc8678 Merge pull request #609 from tuscanhobbit/dev RedMatrix 2014-10-01 14:09:12 +10:00
• 1a4a248a26 A...typo? Relic of some kind. Thomas Willingham 2014-09-30 21:09:11 +01:00
• 49b351d86a Couple of site specific files missing from gitignore Thomas Willingham 2014-09-30 21:08:09 +01:00
• bfeac36702 useless file: knownhubs Paolo Tacconi 2014-09-30 13:32:08 +02:00
• 1cc5babd39 added directory status to siteinfo Paolo Tacconi 2014-09-30 13:30:04 +02:00
• 018f1b813c Added mod returning a list of known hubs, for a lightweight hub crawler Paolo Tacconi 2014-09-30 12:24:49 +02:00
• cef570991a Merge https://github.com/friendica/red into pending_merge friendica 2014-09-29 23:37:16 -07:00
• f8468b4c3a allow custom role permissions and fix site timezone. friendica 2014-09-29 23:36:41 -07:00
• 0283720302 no spaces in file names as requested Jeroen 2014-09-30 05:48:29 +00:00
• 5292e3a100 implement a "powered-by" but leave it turned off until somebody with a good eye for layout can figure out where best to put it. friendica 2014-09-29 21:58:35 -07:00
• 79bb60aafd Merge remote branch 'upstream/master' habeascodice 2014-09-29 15:46:56 -07:00
• e62a95aaba regex missing terminator char habeascodice 2014-09-29 15:41:47 -07:00
• 7c3b428e67 Merge branch 'master' of https://github.com/friendica/red Thomas Willingham 2014-09-29 19:12:12 +01:00
• 90378e8ef8 Silence insanely noisy log - should probably stick this in a dlogger if we need it - we're getting literally hundreds of thousands of these. Thomas Willingham 2014-09-29 19:06:43 +01:00
• 43d2a8ceae ok, last commit so far on the simple schemas Jeroen 2014-09-29 15:37:50 +00:00
• 6c4a54dbfd transp back Jeroen 2014-09-29 15:20:04 +00:00
• 67035a5507 minor modification simple black on white schema. Jeroen 2014-09-29 15:06:47 +00:00
• d33b9e3a91 Added 3 new schemas, all named 'simple' in 3 variants. Please enjoy. Jeroen 2014-09-29 14:23:26 +00:00
• 9de5b6b905 Pluggable page templates Thomas Willingham 2014-09-29 15:13:39 +01:00
• f7595cc11a Merge pull request #607 from tuscanhobbit/dev RedMatrix 2014-09-29 20:43:44 +10:00
• d09003dcff Numbers shouldn't be strings Paolo Tacconi 2014-09-29 10:05:31 +02:00
• 3e9fb3be5a Merge pull request #606 from tuscanhobbit/dev Paolo T 2014-09-29 10:02:44 +02:00
• a30af47ed7 Italian strings updated Paolo Tacconi 2014-09-29 10:01:34 +02:00
• 6370713cc1 Merge pull request #605 from habeascodice/master RedMatrix 2014-09-29 13:08:56 +10:00
• c07643e407 Allows extra content to be inserted at end of profile_photo page. Needed for openclipatar addon. habeascodice 2014-09-28 19:33:37 -07:00
• 5f58603158 relevant now that site statistics are all the hotness habeascodice 2014-09-28 19:32:13 -07:00
• 73ebdff083 Merge remote branch 'upstream/master' habeascodice 2014-09-28 19:31:19 -07:00
• c0b59ae36a Typo in regex causes runtime error habeascodice 2014-09-28 19:30:47 -07:00
• a548f644d0 Merge from upstream tuscanhobbit 2014-09-28 23:19:44 +02:00
• f104dc840c Merge from origin tuscanhobbit 2014-09-28 23:17:47 +02:00
• e18dfbe3ce Merge branch 'master' of https://github.com/friendica/red marijus 2014-09-28 23:15:24 +02:00
• 97c6ba77c7 some more work on photos marijus 2014-09-28 23:14:49 +02:00
• 114394c6ca Merge pull request #604 from tuscanhobbit/dev RedMatrix 2014-09-29 06:25:08 +10:00
• 9dee1779cf added statistics to siteinfo json tuscanhobbit 2014-09-28 19:31:04 +02:00
• ffe6d20dc0 BBCode - $1 wrote doesn't make sense as a spoiler. $1 spoiler does. Thomas Willingham 2014-09-28 03:20:49 +01:00
• c20c9e99b6 Merge branch 'master' of https://github.com/friendica/red marijus 2014-09-27 15:42:28 +02:00
• 38605eefdd more css shifting marijus 2014-09-27 15:41:49 +02:00
• 2b02f611ad Merge https://github.com/friendica/red into pending_merge friendica 2014-09-27 05:11:32 -07:00
• 913109796e provide backup copy of post for diaspora reshare and re-fetch friendica 2014-09-27 05:10:09 -07:00
• e1ae60246a Merge pull request #603 from dawnbreak/docu RedMatrix 2014-09-27 17:19:41 +10:00
• 51c0904a8a Merge https://github.com/friendica/red into pending_merge friendica 2014-09-27 00:15:43 -07:00