github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-12-01 22:43:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
135 Commits 86 Branches 50 Tags 181 MiB
ecf174d62f
Commit Graph

135 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
flarum-bot
99a4d91bdd Bundled output for commit 0fdf5e6c55 [skip ci] 2018-06-20 05:23:13 +00:00
Toby Zerner
0fdf5e6c55 Remove progress flag 2018-06-20 13:54:01 +09:30
Toby Zerner
014864577d Webpack (#18) 
See https://github.com/flarum/core/pull/1367

* Replace gulp with webpack and npm scripts for JS compilation
* Set up Travis CI to commit compiled JS
* Restructure `js` directory; only one instance of npm, forum/admin are "submodules"
* Restructure `less` directory
 2018-06-20 13:36:18 +09:30
Toby Zerner
682995ef2f Merge pull request #11 from datitisev/322-notificate-user-when-suspended 
Add user notifications for suspending & unsuspending
 2018-05-13 07:21:06 +09:30
David Sevilla Martín
83cdd63737 Apply fixes from StyleCI (#3) 2018-05-12 10:50:28 -04:00
David Sevilla Martín
c3c1672993 Delete old event files 2018-05-12 10:28:36 -04:00
David Sevilla Martín
cd8d747985 Merge upstream into master 2018-05-12 10:19:52 -04:00
luceos
783ae9b72b Apply fixes from StyleCI 2018-05-11 10:27:44 +00:00
Toby Zerner
57a7c53bc1 Merge pull request #15 from flarum/dk/add-events 
adds events to hook into
 2018-05-11 19:37:28 +09:30
Franz Liedke
af61c07b15 Merge pull request #16 from afrastgeek/master 
Change fa icon prefix to fas
 2018-05-10 21:21:18 +02:00
Ammar Fadhlur Rahman
f1eefe7bf6 Change fa icon prefix to fas 2018-05-10 15:05:23 +07:00
Daniel Klabbers
4d47a24eff adds events to hook into 2018-04-30 11:19:43 +02:00
AFR
7e4e38bb74 Adapt to FontAwesome v5.0.6 icon name changes (#14) 2018-02-23 23:44:43 +01:00
David Sevilla Martín
88ab68af10 Merge branch 'master' into 322-notificate-user-when-suspended 2018-02-12 08:35:24 -05:00
David Sevilla Martín
cc285f6fc8 fix merge conflicts 2018-02-12 08:34:36 -05:00
David Sevilla Martín
62d30f140b fix issues, revert js dist 2018-02-12 08:30:27 -05:00
Franz Liedke
5a2bf0d015 SuspendUserModal: Allow re-selecting "Not suspended" 
Without this, clicking on the "Not suspended" radio option would
unmark the currently selected value, but not select the first value.

Refs flarum/core#1345.
 2018-02-08 22:39:09 +01:00
Franz Liedke
f22c792fe0 Allow unsuspending from timed suspension 
Fixes flarum/core#1345.
 2018-02-08 22:33:09 +01:00
Franz Liedke
333bb702ed Extender: List all assets explicitly 2018-01-21 21:10:56 +01:00
Franz Liedke
9c6ef9e043 Adapt new bootstrap format, use Asset extender 2018-01-16 23:20:02 +01:00
Toby Zerner
36f409d3e9 Merge pull request #13 from milescellar/patch-1 
Update license year range to 2018
 2018-01-16 15:30:34 +10:30
Miles Cellar
31eb552a1d Update license year range to 2018 2018-01-15 19:37:38 +01:00
Toby Zerner
8afe0dfe97 Require beta 8 2018-01-11 12:29:42 +10:30
Charlie
d6be091b79 Apply namespace changes for beta 8 (#12) 
* Update for beta 8

* StyleCI :)

* docBlock

* whenSavingUser
 2017-09-14 19:41:56 +02:00
Toby Zerner
4e9184ae32 Add default permissions 2017-07-22 12:16:24 +09:30
Toby Zerner
b3fd4d92bd Actually no npm lockfile, at least for now 
Since I tend to do `npm link gulp flarum-gulp` so I'm not sure if the lockfile is valid?
 2017-07-08 21:48:28 +09:30
Toby Zerner
c349e8cb54 Update dependencies 2017-07-08 21:38:57 +09:30
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
Franz Liedke
820a9db4d2 Merge pull request #10 from janga1997/patch-1 
Hide diff for compiled diff files
 2017-02-26 21:09:01 +01:00
VSN Reddy Janga
6f5ec67b30 Hide diff for compiled diff files 2017-02-20 19:34:23 +05:30
Franz Liedke
a2acf2e9a2 Merge pull request #9 from milescellar/patch-1 
Update year
 2017-01-02 20:06:58 +01:00
Miles Cellar
46a4d6f83e Update year 2017-01-01 22:47:37 +01:00
Toby Zerner
44b479fd84 Merge pull request #8 from flarum/analysis-qomYJg 
Apply fixes from StyleCI
 2016-11-29 15:58:39 +10:30
Toby Zerner
69aae68b54 Apply fixes from StyleCI 
[ci skip] [skip ci]
 2016-11-29 05:28:33 +00:00
Toby Zerner
e32202203e Recompile JS 2016-11-19 22:10:04 +10:30
Toby Zerner
2c448fe090 Update StyleCI rules 2016-11-16 15:46:26 +10:30
Toby Zerner
807c6b768b v0.1.0-beta.6 2016-10-19 21:13:51 +10:30
Toby Zerner
0c8d14b14e Use new event name 2016-06-03 11:03:04 +09:30
Toby Zerner
a27c108385 Recompile dist JS using latest version of babel 2016-06-03 11:02:58 +09:30
Toby Zerner
9907b0fa51 Require core v0.1.0-beta.5 2016-03-29 18:49:50 +10:30
Toby Zerner
2dcab6f4e4 Upgrade to flarum-gulp 0.2.0 / Babel 6 2016-03-18 09:34:02 +10:30
Toby Zerner
4352b025d5 Clean up linting stuff 2016-03-10 17:21:10 +10:30
Franz Liedke
3a2699a7bf Use new shortcuts for migrations 2016-03-04 01:12:58 +09:00
Toby Zerner
5d3b0f6f10 Merge pull request #7 from flarum/analysis-zYj0bd 
Applied fixes from StyleCI
 2016-02-26 14:27:49 +10:30
Toby Zerner
9455ca16d1 Applied fixes from StyleCI 2016-02-25 22:57:42 -05:00
Toby Zerner
a16b531fbc Add StyleCI config 2016-02-26 14:03:03 +10:30
Franz Liedke
3bfd9b7fea Use new migration format 2016-02-24 23:14:03 +09:00
Toby Zerner
1fdac619ba Use valid date (according to Illuminate Validator) for indefinite suspension 2016-02-24 16:07:50 +10:30
Toby Zerner
a87b51f511 Only validate and check for suspend permission if suspendUntil attribute is present. fixes flarum/core#826 2016-02-24 16:07:05 +10:30