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

• 94dd994abc Merge pull request #823 from einervonvielen/dev_beginning mrjive 2015-01-06 17:44:58 +01:00
• 2f0d196f28 spelling Einer von Vielen 2015-01-06 17:32:57 +01:00
• ba428533bb added modification of branch Einer von Vielen 2015-01-06 17:27:52 +01:00
• a5766534fe Mainly it shows how to debug the red matrix (php) in a virtual machine and contribute changes via git. Einer von Vielen 2015-01-06 16:22:30 +01:00
• b12393ea12 Mainly it shows how to debug the red matrix (php) in a virtual machine and contribute changes via git. Einer von Vielen 2015-01-06 16:14:04 +01:00
• 5c8aca9a61 Merge pull request #822 from pafcu/master pafcu 2015-01-06 17:06:44 +02:00
• 29e0bfee2f Fix bug in readmore.js Stefan Parviainen 2015-01-06 15:54:58 +01:00
• b80c218606 Merge pull request #1 from friendica/master mrjive 2015-01-06 15:13:03 +01:00
• fac6963444 Add title to bb_observer tags to further clarify a bit what's going on Stefan Parviainen 2015-01-06 14:00:31 +01:00
• c3433bdf95 Don't update fuzzy time for items in a collapsed thread to increase performance. Stefan Parviainen 2015-01-06 12:01:50 +01:00
• ae821efbf1 Update jquery.timeago.js to add support for dispose action Stefan Parviainen 2015-01-06 11:43:59 +01:00
• 859b672e37 Merge branch 'master' into trinidad friendica 2015-01-05 21:00:32 -08:00
• 43f43d78cf regression: need float clear on manage page so footer doesn't end up floated, add default value to features so that features can be created that are default enabled, or modified later to default enabled without requiring a system config to accomplish this. friendica 2015-01-05 20:57:30 -08:00
• 39459c2d65 undo these bits of trinidad - we're going to do things differently friendica 2015-01-05 18:22:15 -08:00
• 2dca165f9b Merge branch 'master' into trinidad friendica 2015-01-05 16:14:56 -08:00
• 3185bfe3ca detect https coming through reverse proxy or load balancer using x-forwarded-proto instead of (actually in addition to testing) $_SERVER['HTTPS'] and/or $_SERVER['SERVER_PORT'] to indicate ssl is enabled friendica 2015-01-05 16:12:55 -08:00
• 8a3ef177ce Merge branch 'master' into trinidad friendica 2015-01-05 14:41:08 -08:00
• 3df3ab5630 Merge https://github.com/friendica/red into pending_merge friendica 2015-01-05 14:41:04 -08:00
• 05a237b808 revup friendica 2015-01-05 14:40:52 -08:00
• c45456fa33 Merge pull request #820 from pafcu/nomigrate RedMatrix 2015-01-06 09:40:26 +11:00
• 5ce5de7305 Remove unneeded divgrow library Stefan Parviainen 2015-01-05 22:11:24 +01:00
• 1ac9a4976f Unbreak readmore Stefan Parviainen 2015-01-05 22:09:05 +01:00
• 7c3193e26e Make slider less ugly Stefan Parviainen 2015-01-05 22:02:48 +01:00
• cf840bee11 Remove reference to non-existing colorbox.css Stefan Parviainen 2015-01-05 21:26:20 +01:00
• 6d0832e693 Fix error with undefined profile_uid Stefan Parviainen 2015-01-05 20:29:20 +01:00
• 749aef7172 Remove some unneeded libraries Stefan Parviainen 2015-01-05 20:27:01 +01:00
• b320b8cbf3 Replace fancybox with colorbox Stefan Parviainen 2015-01-05 19:49:15 +01:00
• c9f26c8b7b Update jGrowl Stefan Parviainen 2015-01-05 18:36:24 +01:00
• 128b0008ee Replace jslider with jRange Stefan Parviainen 2015-01-05 18:30:12 +01:00
• 7791d28a5d Replace divgrow with more modern readmore.js Stefan Parviainen 2015-01-05 17:10:08 +01:00
• ed19984534 Merge branch 'master' into trinidad friendica 2015-01-04 20:48:17 -08:00
• 074be42e23 regression: autocomplete hovertip with url/address missing - useful for identifying connections based on their site if they have different channels (not clones) on different sites with all other identifying info the same. friendica 2015-01-04 20:45:16 -08:00
• 0c0a004e45 Merge branch 'master' into trinidad friendica 2015-01-04 19:57:15 -08:00
• fc72762f52 Merge pull request #819 from pafcu/acl pafcu 2015-01-05 01:31:52 +02:00
• c14dc699ae Fix initEditor on non-wall pages Stefan Parviainen 2015-01-05 00:28:42 +01:00
• aa18a43eff Merge branch 'master' into trinidad friendica 2015-01-04 14:54:37 -08:00
• 3983348b96 the last checkin removed hostname from the address for autocomplete searches. This one allows it if explicitly added with a '@'. So 'mike' will find all mikes. 'mike@z' will find mike@zothub but not mike@popcorn. friendica 2015-01-04 14:51:41 -08:00
• 47526cdecf Merge branch 'master' into trinidad friendica 2015-01-04 14:48:14 -08:00
• 91cb76aa99 Merge https://github.com/friendica/red into pending_merge friendica 2015-01-04 14:48:13 -08:00
• 57d8271eba only check the LHS of xchan_addr for autocomplete, don't match on the hostname. friendica 2015-01-04 14:47:08 -08:00
• 83631ffd23 Merge pull request #817 from pafcu/acl pafcu 2015-01-04 23:42:01 +02:00
• a7db0ed071 Fix height calculation in acl.js Stefan Parviainen 2015-01-04 22:37:19 +01:00
• 82a37ebae3 Merge branch 'master' into trinidad friendica 2015-01-04 12:30:51 -08:00
• ebb1a61684 Merge pull request #816 from pafcu/acl RedMatrix 2015-01-05 07:30:07 +11:00
• cb181993a8 Fix wrong require Stefan Parviainen 2015-01-04 14:54:52 +01:00
• ac4c17dd4c Typo Stefan Parviainen 2015-01-04 14:31:27 +01:00
• 57809f20a4 Sorting of autocomplete Stefan Parviainen 2015-01-04 14:23:23 +01:00
• 386f361855 Autocmplete suggestions for non-local users, also suggest from visited channel's connections Stefan Parviainen 2015-01-04 12:54:23 +01:00
• edd1ad37c4 Merge branch 'master' into trinidad friendica 2015-01-04 00:48:18 -08:00
• 9433a0ddc8 Merge https://github.com/friendica/red into pending_merge friendica 2015-01-04 00:48:17 -08:00
• 028dff44cc remove hard-coded url to caterva.eu from events code. friendica 2015-01-04 00:47:44 -08:00
• 753e6809d9 update NL and text-background-fix in chat for alternatives schemas Jeroen 2015-01-03 15:51:01 +00:00
• 0779e3ae53 provide some info for buttons marijus 2015-01-03 13:42:05 +01:00
• 8d590068e9 Merge branch 'master' into trinidad friendica 2015-01-02 23:08:11 -08:00
• 3e073f4b62 no newline at end of file friendica 2015-01-02 23:07:37 -08:00
• 1ef1d1c2b7 Merge branch 'master' into trinidad friendica 2015-01-02 19:22:46 -08:00
• 31648d65c8 some work on the edit connection workflow explanation and connedit page. This needs a lot more attention, but it was screaming for any improvement in documenting why we tell you that the permissions have been changed but not saved. friendica 2015-01-02 19:20:52 -08:00
• 14239970a5 Merge branch 'master' into trinidad friendica 2015-01-02 17:27:12 -08:00
• ed2917118d doc updates friendica 2015-01-02 17:26:57 -08:00
• 3157304bbd Merge branch 'master' into trinidad friendica 2015-01-02 17:26:38 -08:00
• f6ab246d01 Merge pull request #813 from pafcu/checkboxes RedMatrix 2015-01-03 09:50:24 +11:00
• ff2f7f55af Merge pull request #812 from f03el/master RedMatrix 2015-01-03 09:50:05 +11:00
• 42773a1122 Reworked switch to also display text Stefan Parviainen 2015-01-02 18:14:23 +01:00
• 53a2666114 Use HTML entities Erik Lundin 2015-01-02 16:40:50 +01:00
• 0e4a10c7ec Merge pull request #810 from pafcu/aclsort pafcu 2015-01-02 13:19:18 +02:00
• 6b5f8bfbe4 Sort acl results according to match position (only type='c' for now) Stefan Parviainen 2015-01-02 12:08:36 +01:00
• 8b844ed978 Merge branch 'master' into trinidad friendica 2015-01-01 23:48:27 -08:00
• c7aa8bf1b4 syntax issues (with some php versions?), unchecked intval friendica 2015-01-01 23:47:14 -08:00
• 82d0a4af45 Merge branch 'master' into trinidad friendica 2015-01-01 22:33:28 -08:00
• 68c612c597 fix shares that are processed with markdown (regression, this was pulled from diaspora2bb a couple weeks back as it was affecting diaspora input, but here we're dealing with red input only) friendica 2015-01-01 22:30:54 -08:00
• a0052f0176 htmlpurifier update - compatibility issue with language library autoloader friendica 2015-01-01 22:18:27 -08:00
• 545e47933a Merge https://github.com/friendica/red into pending_merge friendica 2015-01-01 21:49:01 -08:00
• 9a34e18319 Merge branch 'master' into trinidad friendica 2015-01-01 21:48:40 -08:00
• 0286c5a35b revup friendica 2015-01-01 21:48:21 -08:00
• 9d4c4efb51 Merge pull request #808 from f03el/master RedMatrix 2015-01-02 12:11:20 +11:00
• e7081db19b Merge pull request #807 from pafcu/dblclicknewevent RedMatrix 2015-01-02 12:11:08 +11:00
• 817b54688e Merge pull request #805 from pafcu/moretpl RedMatrix 2015-01-02 12:10:50 +11:00
• db811ca975 Merge pull request #804 from pafcu/areyousure RedMatrix 2015-01-02 12:10:27 +11:00
• b54235234f Merge pull request #803 from pafcu/checkboxes RedMatrix 2015-01-02 12:10:08 +11:00
• 0a18ea58c6 Merge branch 'master' into trinidad friendica 2015-01-01 17:08:34 -08:00
• ffec1444e9 Update Swedish strings from Transifex Erik Lundin 2015-01-02 00:56:28 +01:00
• 81c17cffdc Swedish translation Erik Lundin 2015-01-02 00:55:22 +01:00
• 1c2dc97a4a Double click on day in calendar creats new event starting that day Stefan Parviainen 2015-01-01 18:19:17 +01:00
• 85e76773a0 Use grouped select field for role selection Stefan Parviainen 2015-01-01 15:54:16 +01:00
• 686b6ee118 Use grouped select field for timezone selection Stefan Parviainen 2015-01-01 14:44:50 +01:00
• ef94747e5e Add field template for grouped selects Stefan Parviainen 2015-01-01 14:36:17 +01:00
• 9557908875 Warn about unsaved settings using jquery.areyousure Stefan Parviainen 2015-01-01 12:32:15 +01:00
• ef6680f7ad Possibly make switches work on IE8 (untested) Stefan Parviainen 2015-01-01 11:33:00 +01:00
• 93b9470487 Merge pull request #800 from pafcu/lang RedMatrix 2015-01-01 21:23:48 +11:00
• 70f0019905 Checkboxify yesno-fields, but use CSS to show them as switches in Redbasic Stefan Parviainen 2015-01-01 10:08:20 +01:00
• 26069e6ca1 Merge pull request #802 from friendica/revert-792-cssrefactor pafcu 2014-12-31 12:01:51 +02:00
• a00d88bbaf Revert "Make redbasic css more modular" pafcu 2014-12-31 12:01:42 +02:00
• 8fa27efa7e Merge pull request #801 from friendica/revert-799-cssrefactor pafcu 2014-12-31 12:01:16 +02:00
• 8c8a10b819 Revert "Move mod_profiles.css content back into style.css, since it contains var..." pafcu 2014-12-31 12:00:47 +02:00
• 127527f9e9 Add missing vendor/-directory (due to upstream .gitignore) Stefan Parviainen 2014-12-31 10:42:47 +01:00
• 7bf7f8180d Revert "Revert "Language names via intl library."" Stefan Parviainen 2014-12-31 10:42:08 +01:00
• 24a16434bc Merge pull request #799 from pafcu/cssrefactor pafcu 2014-12-31 11:31:15 +02:00
• 5e6fa5a830 Move mod_profiles.css content back into style.css, since it contains variables Stefan Parviainen 2014-12-31 10:26:05 +01:00
• c0885c81e6 Merge branch 'master' into trinidad friendica 2014-12-30 15:47:01 -08:00
• a54f168463 Merge pull request #798 from friendica/revert-794-lang RedMatrix 2014-12-31 10:44:49 +11:00