mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-09-02 20:52:45 +02:00
Code Issues Releases Wiki Activity
8,781 Commits 89 Branches 54 Tags
tk/3787-flags-pagination
Commit Graph

8781 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Clark Winkelmann
86496f3e06 Keep images and links when quoting (#25) 
* Keep images and links when quoting

* Fix bower dependencies
 2017-06-29 08:26:15 +09:30
Clark Winkelmann
2bbf4a2b4b Drop bower usage (#27) 2017-06-29 08:25:24 +09:30
David Sevilla Martín
eac6e2e32f Use mentioned_by_self_text correctly (#26) 
* Use mentioned_by_self_text correctly

* Whoops! Use , not david

* Fix dist js error
 2017-06-25 10:54:18 +09:30
Franz Liedke
8cd0b61cdb Merge pull request #107 from datitisev/patch-1 
Add `core.admin.basics.show_language_selector_label`
 2017-06-23 16:56:59 +02:00
Franz Liedke
cbe49d6d07 Merge pull request #1201 from Luceos/patch-3 
Update AbstractSerializer.php
 2017-06-23 00:02:16 +02:00
Franz Liedke
47fce2f8bf Merge pull request #1202 from Luceos/patch-4 
Update WebAppView.php
 2017-06-23 00:02:02 +02:00
Daniël Klabbers
e5efc5e758 Update WebAppView.php 
Added argument type hinting where absent.
 2017-06-22 16:27:10 +02:00
Daniël Klabbers
32a59af593 Update AbstractSerializer.php 
Fixes missing argument in method. Verified it has to be a string.
 2017-06-22 14:28:51 +02:00
Franz Liedke
d46fd7805c Merge pull request #1199 from Luceos/patch-2 
Update StartSession.php
 2017-06-20 08:17:39 +02:00
Daniël Klabbers
8760df5697 Update StartSession.php 
Fixed CookieFactory typo in phpdoc.
 2017-06-19 16:47:20 +02:00
David Sevilla Martín
f33ee0dd43 Add core.admin.basics.show_language_selector_label 2017-06-12 09:20:27 -04:00
Daniël Klabbers
4e628ad47e making posts and discussions private (#1153) 
* flagrow/byobu#11 making posts and discussions private

* tested migrations and tested setting is_private on discussion and post manually

* added phpdoc for Post and Discussion and added the casting for these attributes

* satisfying styleci

* fixes for review

* added new private discussion event and included it in the access policy

* added new private post event and included it in the access policy
 2017-05-27 14:19:15 +09:30
Davis
af86795ed1 Allow JSON to be used for Install Command (#1193) 
* Allow JSON to be used for Install Command

* Return configuration as array instead of object.

* Update InstallCommand.php
 2017-05-27 14:18:09 +09:30
Toby Zerner
64ca39c28e Merge pull request #106 from datitisev/patch-1 
Add view user list locale
 2017-05-27 10:23:52 +09:30
David Sevilla Martín
3945dbf760 Fix capitalization. Whoops! 2017-05-26 20:45:35 -04:00
David Sevilla Martín
7f59657230 Add view user list locale 2017-05-26 19:15:23 -04:00
David Sevilla Martín
acb92282a5 Add viewUserList permission (#1190) 2017-05-24 22:06:56 +09:30
Toby Zerner
08bb6feceb Merge pull request #105 from milescellar/patch-2 
Optimize Union Jack SVG with SVGO
 2017-05-24 12:43:35 +09:30
Franz Liedke
266742cadb Merge pull request #1189 from datitisev/762-exclude-files-from-distribution 
Update .gitattributes to exclude files for distribution
 2017-05-20 13:42:34 +02:00
David Sevilla Martín
01124e5c59 Apply fixes from StyleCI (#1) 2017-05-19 08:12:52 -04:00
David Sevilla Martin
59de5cceac add alert & email notifications for suspend & unsuspend 2017-05-18 20:32:23 -04:00
David Sevilla Martin
962b4f596f Exclude files for distribution using .gitignore 2017-05-18 18:46:55 -04:00
Miles Cellar
8a034a21c3 Optimize Union Jack SVG with SVGO 
The SVG now weighs 259 bytes only (27.45% saving).
 2017-05-18 22:23:55 +02:00
Franz Liedke
549ad55b4a Merge pull request #104 from milescellar/patch-1 
Add IPv4/IPv6 validation messages
 2017-05-18 22:11:34 +02:00
Miles Cellar
19ae5c0252 Add IPv4/IPv6 validation messages 
Source: 7e5739d266
 2017-05-18 22:07:12 +02:00
David Sevilla Martín
ab564958b2 #1184 Fix /api/posts returning 500 (#1188) 
* Fix ListPostsController::applyFilters not receiving array if argument not present

* Whoops! Use `[]` instead of `array()`

* Update AbstractSerializeController.php

* Update ListPostsController.php
 2017-05-18 22:04:00 +02:00
Franz Liedke
4c71f193ef Recompile dist JavaScript 2017-05-18 09:14:06 +02:00
Franz Liedke
84dc6a17a7 Merge pull request #1186 from flarum/Luceos-patch-1 
Update UserControls.js
 2017-05-18 09:13:28 +02:00
Daniël Klabbers
31ca6dad1b Update UserControls.js 
Possibly c/p mistake with argument name. UserControls using argument discussion in controls method.
 2017-05-17 14:07:38 +02:00
Zeokat
76775d58c8 Support PNG avatars with transparent backgrounds and fix EXIF rotation (#1168) 
As `orientate` requires the EXIF extension, we can only call it if the extension is installed.

Fixes #1161 and #1163.
 2017-05-10 21:23:08 +02:00
StoneSoldier
4cbb914cdc flagged_by text grammar fix (#103) 
* flagged_by text grammar fix

changed "{username} flagged" to "Flagged by {username}" and "{username}
flagged as {reason}" to "{username} flagged this as {reason}"

* changed to "Flagged by {username} as {reason}"
 2017-05-10 20:47:09 +02:00
Franz Liedke
14d925fa02 Merge pull request #1179 from flarum/Luceos-patch-1 
Update mixin.js
 2017-05-09 23:07:16 +02:00
Daniël Klabbers
24d224c986 Update mixin.js 
Typo fixed
 2017-05-09 13:58:07 +02:00
Franz Liedke
b47fbf9732 Merge pull request #1178 from flarum/Luceos-patch-1 
Update HandleErrors.php
 2017-05-09 08:57:26 +02:00
Daniël Klabbers
dfc9b5a286 Update HandleErrors.php 
@franzliedke forgot to make variables available to the method, just triggered this but got a warning that all three variables are undefined.
 2017-05-08 16:45:58 +02:00
issyrocks12
70fd50314d Change to switch to fit style 2017-05-04 22:36:37 +02:00
Franz Liedke
007c6c69bb Fix incorrect sort field name 
Closes #1175.
 2017-05-04 21:37:03 +02:00
Franz Liedke
b04f28dbd9 Merge pull request #1172 from tpokorra/fixDefaultLanguageSelection 
Admin: fix default language selector
 2017-05-02 08:37:32 +02:00
Timotheus Pokorra
7c33befc48 Admin: fix default language selector 
the binding of the control to the value was missing
fixes #1164
 2017-05-01 18:46:12 +02:00
Franz Liedke
81a311c256 Fix order of imports 2017-04-13 09:30:38 +02:00
Franz Liedke
ffa5e8b8c7 Disallow editing if discussions are locked 
Fixes flarum/core#1156.
 2017-04-13 08:22:08 +02:00
Franz Liedke
c452fa43f3 Merge pull request #1155 from ssfinney/feature/mediumtext_for_post_content_column 
Change content column from TEXT to MEDIUMTEXT
 2017-04-13 08:04:05 +02:00
Toby Zerner
49504da31e Merge pull request #40 from dshoreman/eagerload 
Lazy-load any included relationships on /api/tags
 2017-04-12 06:38:29 +09:30
Dave Shoreman
c2fe1fdce5 Lazy-load any included relationships on /api/tags 2017-04-11 14:01:17 +01:00
Dave Shoreman
f61d834a76 Enable parent to be set during creation via API (#39) 
* Enable parent to be set during creation via API

Sets the parent ID as long as it exists and is a top-level primary tag.
If it's not, it'll simply be ignored. Position is set automatically to
be one higher than the current highest, or 0 if parent has no children.

Example data (in addition to the usual attributes):
```
"relationships": {
    "parent": {
        "data": {
            "id": 1
        }
    }
}
```

* Add support for creating top-level tags

To set a top-level primary tag, pass parent id of 0
For a secondary tag, pass null or remove it from the request
To set as a child, pass the parent tag's id
 2017-04-11 13:54:35 +09:30
Toby Zerner
61321c32ed Merge pull request #38 from dshoreman/include-fix 
Specify available includes for /api/tags endpoint
 2017-04-11 10:38:59 +09:30
Dave Shoreman
941a0b2c8a Specify available includes for /api/tags endpoint 2017-04-10 23:23:32 +01:00
Stephen Finney
ddea8490aa Change content column from TEXT to MEDIUMTEXT 
Fixes #1044
 2017-04-09 16:12:34 -04:00
Toby Zerner
dfe094981b Merge pull request #36 from dshoreman/fix-api-error 
Fix Internal Server Error for blank API requests
 2017-04-07 18:05:28 +09:30
Dave Shoreman
fb8ad8fe9a Fix Internal Server Error for blank API requests 
Attempting to send an empty body to the create and update endpoints will
result in Flarum outputting "Internal Server Error" as plain text,
instead of failing gracefully with a json-ised validation exception.

This commit adds an empty array as the third parameter to array_get,
which sets the default value and thus allows Flarum to do its thing.
 2017-04-06 04:16:40 +01:00