github
/
flarum
mirror of https://github.com/flarum/flarum
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
209 Commits
5 Branches
28 Tags
9.5 MiB
Commit Graph

209 Commits (290f1aff5586f92d23907299bd1613282f738e5c)

Author SHA1 Message Date
Toby Zerner ddc33e2f12 Merge remote-tracking branch 'origin/master' 
Conflicts:
	readme.md
 2015-05-07 21:31:43 +09:30
Toby Zerner 4ae1159d05 Automatically fetch submodule 2015-05-07 21:30:39 +09:30
Toby Zerner 626f70c3c7 Add flarum/core as submodule 2015-05-07 21:28:57 +09:30
Toby Zerner 1a3d0b5cea Update deps, vagrant install 2015-05-07 13:58:17 +09:30
Toby Zerner e5bf553d2d Revamp readme/contributing 2015-05-07 12:43:49 +09:30
Toby Zerner c9ea169bb2 Add editorconfig 2015-05-06 11:26:36 +09:30
Toby Zerner e9396984df Merge pull request #8 from gitter-badger/gitter-badge 
Add a Gitter chat badge to readme.md
 2015-05-04 21:41:25 +09:30
The Gitter Badger 7e366f5389 Added Gitter badge 2015-05-04 12:05:52 +00:00
Toby Zerner ead1b78ade Enable ExtensionsServiceProvider 2015-05-04 08:54:28 +09:30
Toby Zerner 7d8d9155a7 Change avatar path 2015-05-03 12:09:28 +09:30
Toby Zerner 3f9c5ceabb Remove submodule for now 2015-04-25 23:02:30 +09:30
Toby Zerner d9ebd27a93 New skeleton architecture 
flarum/core submodule needs to be added back in (to system/core)
 2015-04-25 22:57:04 +09:30
Franz Liedke 806ae8ab96 Revamp setup of core subdirectory. 
The most work should now be done on the host machine after cloning
by initializing and updating the submodules.
 2015-04-03 01:51:36 +02:00
Franz Liedke a7e1c191e2 Remove flarum directory from list of ignored files. 2015-04-03 01:39:44 +02:00
Franz Liedke 9d34ea0189 Specify branch of core submodule. 
This means that after pulling from the main repository, you should
run "git submodule update --remote" to ensure the submodule is fully
up-to-date.
 2015-04-03 01:21:01 +02:00
Franz Liedke e7a6c81558 Add core as submodule. 
To fetch the submodule, run "git submodule init" followed by
"git submodule update" in the root directory.
 2015-04-03 01:12:35 +02:00
Franz Liedke a569ef69e0 Install Studio in Vagrant VM. 2015-04-02 23:52:44 +02:00
Franz Liedke 0d5f949297 Update dependencies, use Studio for managing core subdirectory. 2015-04-01 12:22:28 +02:00
Toby Zerner 91050da115 Update service provider name 2015-04-01 12:56:33 +10:30
Toby Zerner 8be15711c0 Update vagrant scripts for new ember app location 2015-03-29 22:35:44 +10:30
Toby Zerner e20005bb24 Turns out putting a . there breaks Laravel 2015-03-29 22:27:19 +10:30
Toby Zerner 0263dcc107 Fix gitignoring 2015-03-29 22:26:39 +10:30
Toby Zerner eb92f6a3ac Remove font awesome 2015-03-29 22:20:50 +10:30
Toby Zerner e9609aa4c3 Move avatars directory 2015-03-29 22:20:21 +10:30
Toby Zerner 1750834122 Namespace avatars disk 2015-03-29 22:14:16 +10:30
Toby Zerner cab771a4d4 Add AdminServiceProvider 2015-03-29 22:13:53 +10:30
Franz Liedke c8568df40f Add gitignore file to avatars directory. 2015-03-26 21:53:31 +01:00
Franz Liedke 8ee8a0a9b9 Configure filesystem disk for avatars. 2015-03-26 21:04:54 +01:00
Toby Zerner ccc73498b1 Merge pull request #5 from franzliedke/patch-3 
[Vagrant] Fix ember aliases
 2015-03-08 11:50:13 +10:30
Toby Zerner 406330a1aa Merge pull request #6 from franzliedke/vagrant-windows 
Vagrant improvements
 2015-03-08 11:50:01 +10:30
Franz Liedke 165bb7ef01 Revert back to using NFS on Windows, too (encouraging the use of a plugin). 2015-03-08 02:00:59 +01:00
Franz Liedke df71ca5cf7 Use my fixed version of Vaprobash's Node installer until my PR gets merged. 2015-03-08 01:58:39 +01:00
Franz Liedke 10e6e975e6 Try to fix VM network issues that caused crashes in NPM and APT. 2015-03-08 01:58:07 +01:00
Franz Liedke 4bd1c27af0 Use the standard Vaprobash way to install global Node packages. 2015-03-08 01:57:14 +01:00
Franz Liedke c0e7b92ef4 Fix ember aliases. 2015-03-08 01:28:07 +01:00
Toby Zerner 08c34046aa Merge pull request #4 from franzliedke/patch-2 
[Vagrant] Only use NFS on non-Windows machines
 2015-03-07 06:54:01 +10:30
Franz Liedke 359646885a Only use NFS on non-Windows machines. 2015-03-06 14:00:50 +01:00
Toby Zerner eba9a7ee21 Merge pull request #3 from franzliedke/master 
Install Composer dependencies with --prefer-dist.
 2015-03-06 13:21:27 +10:30
Franz Liedke 37b76a73cf Install Composer dependencies with --prefer-dist. 
That should speed up provisioning considerably.
 2015-03-06 00:50:24 +01:00
Toby Zerner 139df0f071 Merge pull request #2 from franzliedke/patch-1 
Non-interactive APT package installation
 2015-03-06 09:52:50 +10:30
Franz Liedke ce53d935c3 Non-interactive APT package installation 2015-03-06 00:15:36 +01:00
Toby Zerner 6ddec4834b Better NFS syncing 
See https://github.com/mitchellh/vagrant/issues/4204
 2015-02-26 12:49:09 +10:30
Toby Zerner d9aad26b8e Add mail settings to env config 2015-02-25 15:31:45 +10:30
Toby Zerner c4cc65c561 Add back console Kernel 
L5 complains when it’s gone
 2015-02-24 21:43:45 +10:30
Toby Zerner f5c63354d5 Fix dud composer autoloading 2015-02-24 21:24:02 +10:30
Toby Zerner 0b3f7acf5f Upgrade to Laravel 5. Delete stuff that we don't need. 2015-02-24 20:37:26 +10:30
Toby Zerner c10031dadc Merge pull request #1 from mikedugan/master 
nginx root & asset publish in startup
 2014-12-31 13:59:43 +10:30
Mike Dugan 34d3686c4a Merge branch 'master' of github.com:mikedugan/flarum 2014-12-30 20:50:20 -05:00
Mike Dugan f7e67e58a2 update vagrantfile for nginx root 2014-12-30 20:37:35 -05:00
Toby Zerner 3d6e9f3a5a Point to flarum/core for installation instructions 2014-12-30 22:01:47 +10:30