Commit graph

Select branches

Hide pull requests

develop

Mono Color

• 241fcd12f5 Merge branch 'feature/timeago-locales' into 'develop' lambda 2017-11-08 22:00:20 +00:00
• 421221997f Make mentions-timeline use i18n. Shpuld Shpludson 2017-11-08 21:54:48 +00:00
• ceb13a6405 Add timeago locales. eal 2017-11-08 22:18:42 +02:00
• 3cad733593 Merge branch 'develop' into 'develop' lambda 2017-11-08 17:43:02 +00:00
• 5322f90c15 Merge branch 'fix/attachment-fixes' into 'develop' lambda 2017-11-08 17:42:42 +00:00
• be943445e9 Fix isOtherUser on pleroma-be eal 2017-11-08 19:32:11 +02:00
• bce37767f2 Update Estonian translation obrez 2017-11-08 19:30:33 +02:00
• 26a8923a87 Merge branch 'develop' into 'develop' lambda 2017-11-08 13:19:36 +00:00
• 26d27165d6 add japanese translation naf 2017-11-08 22:10:13 +09:00
• 0e716e3cd9 Fix oembeds from overflowing on Firefox, fix video border color as well as vertical size. shpuld 2017-11-08 15:09:02 +02:00
• 23d1354046 Update polandish. Roger Braun 2017-11-08 13:41:11 +01:00
• 7d84147500 Merge branch 'fix/missing-localization-strings' into 'develop' lambda 2017-11-08 11:03:51 +00:00
• 4d5782b51f Fix conflict shpuld 2017-11-08 12:55:10 +02:00
• 83297aba15 Merge branch 'develop' into 'develop' lambda 2017-11-08 10:54:08 +00:00
• a7b2d76347 Add Estonian translation obrez 2017-11-08 12:44:33 +02:00
• 37f5e0d8b6 Merge branch 'fix/polish-user-finder-and-nav-buttons' into 'develop' lambda 2017-11-08 10:44:24 +00:00
• 191bbe76a8 Add a bunch of missed localization strings, update english and finnish to match. shpuld 2017-11-08 12:34:15 +02:00
• 176421163b Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into fix/polish-user-finder-and-nav-buttons shpuld 2017-11-08 11:27:22 +02:00
• bfa04bfb11 Hide overflowing elements when userfinder is active. Don't scroll on button presses. Make buttons slightly bigger and more spaced out. shpuld 2017-11-08 11:26:42 +02:00
• 5dca57cc05 Add Polish translation. Roger Braun 2017-11-08 09:57:51 +01:00
• 62a3c63082 Unify statuses/notices. Roger Braun 2017-11-08 09:31:52 +01:00
• 3895e667d9 Merge branch 'tibike/pleroma-fe-hu-translation' into develop Roger Braun 2017-11-08 09:14:14 +01:00
• cadd42c1b2 Merge branch 'develop' into tibike/pleroma-fe-hu-translation Roger Braun 2017-11-08 09:13:35 +01:00
• c65974c8c8 Fix typo. Roger Braun 2017-11-08 09:12:48 +01:00
• 483fef731a Fix typo. Roger Braun 2017-11-08 09:10:32 +01:00
• 32cb5e1a48 Add italian translation. Roger Braun 2017-11-08 09:09:34 +01:00
• 38bd0dbfcd Add french translation. Roger Braun 2017-11-08 09:05:10 +01:00
• cdbcf569f8 Merge branch 'feature/blocks' into 'develop' lambda 2017-11-08 07:02:16 +00:00
• d6c89a9c09 Added Hungarian translation Tibike 2017-11-08 02:14:18 +02:00
• 608d1e6776 Add blocks. eal 2017-11-07 22:38:28 +02:00
• 7ab7ac7be6 Merge branch 'feature/ger-translation' into 'develop' lambda 2017-11-07 17:50:39 +00:00
• 5cf972b348 Update ja translation. Roger Braun 2017-11-07 18:44:43 +01:00
• 0320f03cd2
  make linter happy Sebastian Huebner 2017-11-07 18:43:28 +01:00
• 1b281303b5 Merge branch 'feature/ger-translation' of git.pleroma.social:pleroma/pleroma-fe into feature/ger-translation Sebastian Huebner 2017-11-07 18:38:25 +01:00
• 8a3118d1a7 added ger translation Sebastian Huebner 2017-11-07 18:22:25 +01:00
• 33ad62bf72 Japanese is ja. Roger Braun 2017-11-07 18:34:12 +01:00
• 708a338855
  rebase Sebastian Huebner 2017-11-07 18:33:53 +01:00
• df895b0510 added ger translation Sebastian Huebner 2017-11-07 18:22:25 +01:00
• 4d4282a759
  added ger translation Sebastian Huebner 2017-11-07 18:22:25 +01:00
• 71395ebca2 Add japanese translation. Roger Braun 2017-11-07 18:20:40 +01:00
• 2354255615 Merge branch 'feature/fi-language' into 'develop' lambda 2017-11-07 16:58:46 +00:00
• f89f120c44 Add fi to localization. Shpuld Shpludson 2017-11-07 16:55:08 +00:00
• ed18d44e19 update readme Roger Braun 2017-11-07 17:12:32 +01:00
• 8fb83502f0 Add translation to readme. Roger Braun 2017-11-07 15:42:34 +01:00
• 74b513122e Set locale from browser settings. Roger Braun 2017-11-07 15:23:00 +01:00
• 7516cd859f Prepare for i18n. Roger Braun 2017-11-07 15:14:37 +01:00
• 81b0849889 Merge branch 'fix/friendica-html' into 'develop' lambda 2017-11-07 10:33:02 +00:00
• acde0b316c Changes inside status html: restrict image/video sizes, make blockquotes waste less space. Shpuld Shpuldson 2017-11-07 12:22:33 +02:00
• e74e725750 Merge branch 'fix/authenticated-remote-profile-fetching' into 'develop' lambda 2017-11-06 22:37:00 +00:00
• 784eb8426c Send credentials when fetching remote profile. eal 2017-11-07 00:20:51 +02:00
• 9fedcab988 Merge branch 'fix/update-readme-new-repo' into 'develop' lambda 2017-11-06 13:27:25 +00:00
• 9eaf7087a3 Update dual boot link in README.md for new repo Shpuld Shpludson 2017-11-02 15:26:28 +00:00
• fb8b625d9a Merge branch 'fix/stop-inappropriate-scroll-auto-fetch' into 'develop' lambda 2017-11-02 14:59:31 +00:00
• 302c46741d Merge branch 'fix/disable-select-on-icons' into 'develop' lambda 2017-11-02 14:49:23 +00:00
• bfb1b3f10b Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into fix/stop-inappropriate-scroll-auto-fetch Shpuld Shpuldson 2017-11-02 16:48:01 +02:00
• 4cba955fca Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into fix/disable-select-on-icons Shpuld Shpuldson 2017-11-02 16:41:15 +02:00
• f897c656fc Also disable select on buttons Shpuld Shpuldson 2017-11-02 16:27:34 +02:00
• 10bc83018c Deregister scroll listener properly, only fetch more if timeline is visible. Shpuld Shpuldson 2017-11-02 16:26:17 +02:00
• 6e611f4039 Update .gitlab-ci.yml lambda 2017-11-02 14:20:00 +00:00
• 226f435a17 Add user-select: none to i elements. Shpuld Shpuldson 2017-11-02 11:27:52 +02:00
• 63473964f8 Merge branch 'feature/emoji-completion' into 'develop' lambadalambda 2017-10-25 10:00:28 -04:00
• ba9b04a8ba Use the API endpoint for emoji completion. eal 2017-10-19 23:39:21 +03:00
• 447ec91176 Actually actually fix image url. eal 2017-09-19 22:58:15 +03:00
• f4b1319eff Actually fix image url. eal 2017-09-19 22:54:54 +03:00
• 70d66c48ad Fix image url. eal 2017-09-19 22:50:08 +03:00
• 2162ef20b0 Add emoji completion. eal 2017-09-19 22:43:20 +03:00
• 91991e2ac1 Merge branch 'feature/tag-timelines' into 'develop' lambadalambda 2017-09-17 07:58:05 -04:00
• c96a7b582b Remove another cache file. eal 2017-09-17 14:42:04 +03:00
• 59f07c0704 Remove cache file. eal 2017-09-17 14:37:48 +03:00
• 9abfcb34ef Add tag timeline view. eal 2017-09-17 14:26:35 +03:00
• 3eaaa4c16d Merge branch 'fix/set-cookie' into 'develop' lambadalambda 2017-09-13 04:47:23 -04:00
• 7abcb13ec0 Merge branch 'feature/login-with-cookie' into 'develop' lambadalambda 2017-09-13 04:47:03 -04:00
• c6b909570a Merge branch 'fix/upload-buttons-clickable' into 'develop' lambadalambda 2017-09-13 04:46:24 -04:00
• e7691bff82 Merge branch 'fix/responsive-user-search' into 'develop' lambadalambda 2017-09-13 04:46:06 -04:00
• 5e6ffc0e45 Make user finder more pleasant. eal 2017-09-10 20:46:42 +03:00
• 8a51bc6e22 Fix hide and cancel buttons on chromium eal 2017-09-10 13:33:02 +03:00
• 9c7eb1de3c Merge branch 'feature/follow-notif-tests' into 'develop' lambadalambda 2017-09-04 02:51:06 -04:00
• 00f8857876 Merge branch 'fix/timeago-months' into 'develop' lambadalambda 2017-09-03 19:00:42 -04:00
• b35acf4628 Merge branch 'fix/usercard-css' into 'develop' Shpuld Shpuldson 2017-09-03 01:20:46 -04:00
• 298bf5cfca Revert "Include cookie in every request" eal 2017-09-02 21:12:42 +03:00
• 8b4f59e1f7 Try logging in with the existing cookie. Roger Braun 2017-07-02 13:07:35 +02:00
• 00589a9af1 Include cookie in every request eal 2017-09-02 19:29:45 +03:00
• 2b0811dddc Make sure options exists every time on fetch() eal 2017-09-02 19:29:16 +03:00
• 522110c0bc Set cookies on fetch eal 2017-08-31 11:23:17 +03:00
• 43f416297f Change better specifier for months. eal 2017-08-29 23:15:20 +03:00
• 587cd7bcfa Fix 'Statuses' being different color eal 2017-08-27 13:10:25 +03:00
• ad6d0a1f0c Move the cog to avatar height eal 2017-08-25 14:59:55 +03:00
• 04a3a44195 Add tests for follow notifications. eal 2017-08-25 14:01:18 +03:00
• 87b18da811 Merge branch 'fix/pleromabe-follow-notifs' into 'develop' Shpuld Shpuldson 2017-08-25 03:19:01 -04:00
• 5bd6abc134 Add regex for follows from pleromabe eal 2017-08-24 21:53:31 +03:00
• 205024ba9d Merge branch 'feature/post-status-clear-error-message' into 'develop' Shpuld Shpuldson 2017-08-24 09:34:09 -04:00
• 7061675e96 whoops lint Shpuld Shpuldson 2017-08-24 16:25:26 +03:00
• c6798864d4 Add an X icon to clear error message from post status form, hack to allow posting empty statuses if they have attachments Shpuld Shpuldson 2017-08-24 16:16:06 +03:00
• 8778270381 Merge branch 'fix/style-fixes-user-profile' into 'develop' Shpuld Shpuldson 2017-08-23 13:41:24 -04:00
• bf61592b56 Round the edge of the user profile user card, make sure 'follows you' stays in the right, fix avatar class conflict. Shpuld Shpuldson 2017-08-23 20:33:20 +03:00
• 2bc261afba Merge branch 'feature/follow-lists' into 'develop' Shpuld Shpuldson 2017-08-23 12:40:39 -04:00
• e1ec01dc3e Appease linter. eal 2017-08-23 19:21:15 +03:00
• ccfc2e57d0 Add follower and following views eal 2017-08-21 20:25:01 +03:00
• 5a1ad84092 Merge branch 'fix/check-if-follow-notif-matches-self' into 'develop' lambadalambda 2017-08-22 06:18:41 -04:00
• e5d0965ff1 Merge branch 'fix/user-card-changes-and-fixes' into 'develop' lambadalambda 2017-08-22 06:13:10 -04:00