Commit graph

Select branches

Hide pull requests

master

#1

#12

#12

#18

#19

#2

#20

#21

#22

#23

#26

#27

#28

#30

#31

#32

#33

#34

#35

#36

#37

#38

#41

#42

#46

#51

#52

#53

#54

#56

#57

#59

#61

2.2

2.21

2.3

2.32

2.33

2.34

2.35

2.36

2.37

2.38

2.39

2.3beta1

2.3beta2

3.0

3.01

3.1

3.2

3.3

3.3-RC

3.3.1

3.3.2

psr4-example

Mono Color

• 2940f25df9 Merge pull request #514 from hmeine/master Thomas Willingham 2012-10-16 09:05:50 -07:00
• ba503b9927 diabook: use proper defaults in popup sidebar config Hans Meine 2012-10-16 13:44:27 +02:00
• d0775be2e2 diabook boxes: use a common hide/show form entry definition Hans Meine 2012-10-16 13:42:18 +02:00
• 2d614b6700 remove lots of duplicated code in diabook config handling Hans Meine 2012-10-16 13:33:53 +02:00
• 2c15bdd99e merge HEAD Simon L'nu 2012-10-15 22:48:25 -04:00
• 80513e4332 Trying this fix for endless redirection friendica 2012-10-15 18:51:22 -07:00
• fd6a21f522 oops - missingfile from last checking, the important one friendica 2012-10-15 16:33:00 -07:00
• a02e5f692e disabling auto_redir until we prevent it from infinite looping friendica 2012-10-15 16:28:43 -07:00
• 3af16ff92a Merge https://github.com/friendica/friendica into pull friendica 2012-10-14 17:16:41 -07:00
• dec5298248 rev update friendica 2012-10-14 17:16:25 -07:00
• 4bf6604d88 Merge pull request #513 from unary/photo-comments friendica 2012-10-14 14:33:10 -07:00
• 939227e820 Moved comment box on photos to be after the last comment, added text for the Preview link Michael Johnston 2012-10-14 14:30:10 -04:00
• f5a458d139 DE/FR/PT-BR: update to the strings Tobias Diekershoff 2012-10-13 09:38:47 +02:00
• a126005877 Merge branch 'master' of https://github.com/friendica/friendica Thomas Willingham 2012-10-12 21:35:32 +01:00
• a01dd4d9be German help file images Thomas Willingham 2012-10-12 21:34:17 +01:00
• 022c1e8995 German helpfiles Thomas Willingham 2012-10-12 21:33:21 +01:00
• ca21f1bbc8 Merge pull request #512 from fermionic/auto-redir-for-local-hub-contacts fermionic 2012-10-11 17:24:11 -07:00
• 2f3d118e77 Merge pull request #508 from fermionic/no-theme-control-of-live-update-location fermionic 2012-10-10 17:34:28 -07:00
• 816db4396a better fix for threads with no parent showing up as unseen friendica 2012-10-10 16:17:40 -07:00
• 8a1f9d32ab Merge https://github.com/friendica/friendica into pull friendica 2012-10-10 15:59:05 -07:00
• 675aa56b02 rev update - prevent messages with no parent from being counted as unseen, because they cannot ever be cleared friendica 2012-10-10 15:57:40 -07:00
• 1c66fed5c4 Merge pull request #507 from fermionic/imagick-profile-photos-squashed fermionic 2012-10-10 07:04:22 -07:00
• 14d8033e54 Merge pull request #510 from fermionic/lockview-plugin-support fermionic 2012-10-10 07:04:08 -07:00
• 551ab568ab Merge pull request #511 from fermionic/manage-doesnt-obey-startpage-plugin fermionic 2012-10-10 07:03:49 -07:00
• 49ec50b36e Merge https://github.com/friendica/friendica into pull friendica 2012-10-09 17:04:13 -07:00
• 987b8b4880 tinymce tag complete - only replace tagged text friendica 2012-10-09 17:03:00 -07:00
• 17679152d5 rev update friendica 2012-10-09 17:00:29 -07:00
• d9e2dd0523 Typo Thomas Willingham 2012-10-09 23:25:51 +01:00
• 8dd10940d6 Add a link to the wiki from the install guide for nginx, MariaDB, etc Thomas Willingham 2012-10-09 20:46:51 +01:00
• 76c1fec196 Merge pull request #509 from fermionic/frost-0.3 fermionic 2012-10-09 09:07:13 -07:00
• b9818185db for profile and photos, detect contacts from local hub and auto-redir Zach Prezkuta 2012-10-09 09:50:24 -06:00
• 86d6f380dc add home_init hook to manage to call startpage plugin Zach Prezkuta 2012-10-09 09:47:14 -06:00
• 96a245409b allow changing the lockview content with a plugin Zach Prezkuta 2012-10-09 09:45:54 -06:00
• 0d56f82efa frost style improvements; various tweaks Zach Prezkuta 2012-10-09 09:44:56 -06:00
• 0ea89852d2 allow themes to decide where live updates appear Zach Prezkuta 2012-10-09 09:41:33 -06:00
• c3cf459b27 use getWidth and getHeight, which are agnostic to Imagick being enabled Zach Prezkuta 2012-10-09 09:35:32 -06:00
• c0c8869f89 CS: update to the strings Tobias Diekershoff 2012-10-09 08:23:52 +02:00
• 6df274006c Merge https://github.com/friendica/friendica into pull friendica 2012-10-07 15:29:13 -07:00
• e24fd2410d rev update friendica 2012-10-07 15:28:05 -07:00
• d804e2ceb9 Merge pull request #506 from hmeine/master fabrixxm 2012-10-07 01:29:09 -07:00
• 1fa88bb79e DE/PT-BR: update to the strings Tobias Diekershoff 2012-10-06 10:43:14 +02:00
• ffe7209114 Darkzero - make "visible to" legible. Thomas Willingham 2012-10-06 01:18:03 +01:00
• 1b43ef9205 Add link to issue tracker to README Hans Meine 2012-10-05 16:44:47 +02:00
• c4b3ea3a73 Merge https://github.com/friendica/friendica into pull friendica 2012-10-05 02:10:48 -07:00
• 52062ac9e0 rev update friendica 2012-10-05 02:09:55 -07:00
• 4d029e891a Merge pull request #505 from fermionic/nets-broken-in-themes fermionic 2012-10-04 19:00:48 -07:00
• 5f2826f84e update themes for new All Networks option Zach Prezkuta 2012-10-04 19:59:30 -06:00
• d33abe2de9 Dispy - selecting any network and then switching back to "all networks" didn't work. Remove nets.tpl to make it use the default one. Thomas Willingham 2012-10-04 23:19:50 +01:00
• ceb8b8b77f new file: view/theme/smoothly/file.gif modified: view/theme/smoothly/search_item.tpl modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php pixelroot 2012-10-04 16:37:02 +02:00
• ef9eec5561 DE: update to the strings Tobias Diekershoff 2012-10-04 10:33:49 +02:00
• 0bfca14048 Merge https://github.com/friendica/friendica into pull friendica 2012-10-03 18:28:27 -07:00
• 1e93c85a49 rev update friendica 2012-10-03 18:26:53 -07:00
• eeb184df80 Merge pull request #503 from CyberDomovoy/valid_html fermionic 2012-10-03 08:36:32 -07:00
• 65b52878c4 CS: update to the strings Tobias Diekershoff 2012-10-03 09:00:59 +02:00
• 122cf96ffd FR: update to the strings Tobias Diekershoff 2012-10-03 07:56:29 +02:00
• d651291916 DE: update to the strings Tobias Diekershoff 2012-10-03 07:56:12 +02:00
• 86f907d715 Merge pull request #504 from cvogeley/master Thomas Willingham 2012-10-02 13:27:58 -07:00
• 44acbb25e4 Bring back BB-Code in comments Christian Vogeley 2012-10-02 21:29:00 +02:00
• 8e50b3f9ce Use saved_searches_aside.tpl in search.php Domovoy 2012-10-02 16:03:20 +02:00
• d6226a5337 Merge pull request #502 from fermionic/frost-categories-update fermionic 2012-10-01 13:25:36 -07:00
• e850e0c6d5 frost suport for categories and folder updates Zach Prezkuta 2012-10-01 14:22:32 -06:00
• 9daafe7489 Merge pull request #501 from fermionic/network-remember-filters fermionic 2012-10-01 13:08:48 -07:00
• c6061d598f don't set a date as a group Zach Prezkuta 2012-10-01 14:07:32 -06:00
• 9d4fdee65d Merge pull request #500 from fabrixxm/quattro-fontsoptions fabrixxm 2012-10-01 07:05:58 -07:00
• 864d022468 editpost: add short jot action text to edit post form Fabrixxm 2012-10-01 10:00:25 -04:00
• c7a4c08081 quattro: fix jot "video link" tooltip Fabrixxm 2012-10-01 09:59:55 -04:00
• 871f182414 quattro: add quattro-lilac to theme Makefile Fabrixxm 2012-10-01 09:53:02 -04:00
• ca34d89482 quattro: fix post tags style, add icons for mentions, folders and categories Fabrixxm 2012-10-01 09:38:25 -04:00
• 9d738570ee quattro: options for posts and textareas font size Fabrixxm 2012-10-01 08:58:05 -04:00
• 112fafcc81 consistent handling of scaled images when using imagick friendica 2012-09-30 03:25:20 -07:00
• 84199e6e71 Merge https://github.com/friendica/friendica into pull friendica 2012-09-30 02:08:56 -07:00
• 0f09cb46ab rev update friendica 2012-09-30 02:08:01 -07:00
• a620d5d9f3 Merge pull request #493 from fermionic/toggle-mobile-all-themes friendica 2012-09-30 01:58:51 -07:00
• e0dbd2e8e4 Merge pull request #494 from fermionic/diaspora-contact-lookup-fails friendica 2012-09-30 01:58:37 -07:00
• e60c729b51 Merge pull request #495 from fermionic/email-optimization friendica 2012-09-30 01:58:07 -07:00
• 35905ebf1c Merge pull request #496 from fermionic/deleted-group-stays-in-default-permissions friendica 2012-09-30 01:57:52 -07:00
• d93e34b2ae Merge pull request #497 from fermionic/permission-denied-to-allowed-contact friendica 2012-09-30 01:57:02 -07:00
• c9536ac056 Merge pull request #498 from fermionic/more-robust-tag-conversion friendica 2012-09-30 01:55:23 -07:00
• b03edcd8e5 Merge pull request #499 from fermionic/network-remember-filters friendica 2012-09-30 01:54:00 -07:00
• db81050edd IT: update to the strings Tobias Diekershoff 2012-09-30 09:07:14 +02:00
• cacd28d045 deleted nb_NO folder manually Tobias Diekershoff 2012-09-30 09:01:40 +02:00
• e476a7126c should be nb-no Tobias Diekershoff 2012-09-30 08:52:40 +02:00
• 2e8ac578cc RU: update to the strings Tobias Diekershoff 2012-09-30 08:49:16 +02:00
• f547387ada FR: update to the strings Tobias Diekershoff 2012-09-30 08:43:15 +02:00
• f73df7d209 DE: update to the strings Tobias Diekershoff 2012-09-30 08:41:43 +02:00
• 4845aa229c nb_NO: added from Transifex Tobias Diekershoff 2012-09-30 08:41:03 +02:00
• 421c72d10f remember combination of last tab selected, last group selected, and last network selected; update only items seen in selected filters Zach Prezkuta 2012-09-29 17:56:50 -06:00
• ce73cd560f allow tagging of people by name or nickname Zach Prezkuta 2012-09-29 17:55:40 -06:00
• 34081010ff allow contact if in allowed group, even if not in non-empty allowed contacts Zach Prezkuta 2012-09-29 17:54:37 -06:00
• 4af4e9aa9f remove groups from default permissions when removed; bug in group_add_member Zach Prezkuta 2012-09-29 17:53:06 -06:00
• 4c2dd162a4 add new template file Zach Prezkuta 2012-09-29 17:51:39 -06:00
• f4f3c8375f send less messages to server; remove delete option Zach Prezkuta 2012-09-29 17:50:34 -06:00
• 59ace4f4d7 look for DFRN contacts as well Zach Prezkuta 2012-09-29 17:48:56 -06:00
• cee50502d3 toggle mobile on all themes; Frost updates Zach Prezkuta 2012-09-29 17:47:47 -06:00
• ebabd25717 order photo album list in blog (reverse date) order friendica 2012-09-29 06:08:44 -07:00
• c357fddea7 photo "conversation streams" need work - quite a bit of it friendica 2012-09-29 06:04:01 -07:00
• 8416cff2a5 slight adjustment to Photo scaling - also discovered imagick resize may need some additional work friendica 2012-09-29 05:46:01 -07:00
• 0693afd6b7 only constrain horizontal image dimension for scaling very tall photos friendica 2012-09-29 05:20:29 -07:00
• c884e82776 rev update friendica 2012-09-29 05:19:45 -07:00
• ea6ced8359 Merge remote branch 'upstream/master' Michael Vogel 2012-09-29 08:35:17 +02:00