Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-21 23:12:58 +01:00
Code Issues Packages Projects Releases Wiki Activity
20,066 Commits 72 Branches 489 Tags
dc5bd7601fb3da170aab380ff8f8c8c778342e76
Commit Graph

5262 Commits

Author SHA1 Message Date
Julian Lam
802878c371 Merge pull request #5455 from pichalite/cropper 
Make cropper in to a module
 2017-02-17 08:48:21 -05:00
barisusakli
e009ce5609 closes #5443 2017-02-17 16:46:30 +03:00
barisusakli
4d05e492cc closes #5312 2017-02-17 14:45:45 +03:00
Peter Jaszkowiak
c75391f9f5 Sound system improvements 
- Fix sound ACP uploads
- Display soundpack names with sound files
- Soundpacks can have sounds with identical names
- Link sounds during build step
- Generate map of sound name to file name during build step
- Change how soundpacks work. It's now done via a field in plugin.json
 2017-02-16 22:58:15 -07:00
pichalite
2ca8f60e77 Finalize cropper module 2017-02-17 05:32:37 +00:00
pichalite
d784a8dce8 Restore uploader.js 2017-02-17 04:26:34 +00:00
pichalite
43f4d9819e Linting 2017-02-17 00:54:53 +00:00
pichalite
484891472e Make cropper in to a module 2017-02-17 00:48:38 +00:00
barisusakli
dad5b135c3 lint 2017-02-16 15:11:31 +03:00
barisusakli
c285eb7fcd closes #5450 2017-02-16 15:01:11 +03:00
Julian Lam
8bf719b258 Merge pull request #5431 from NodeBB/ajaxify-cache-buster 
Ajaxify improvements, `/assets/uploads/` fixes, cache buster improvements
 2017-02-15 13:49:47 -05:00
Julian Lam
fcaefbadca Merge remote-tracking branch 'origin/master' into develop 2017-02-15 12:06:52 -05:00
Anil Mandepudi
c25836b5fc Option to upload without cropping (#5447) 
* Option to upload without cropping

* Fix styling

* Fix styling

* Add missing semi-colon

* I fail at styling :fail:
 2017-02-14 16:31:51 -05:00
psychobunny
0667870286 set an active state for pageview options 2017-02-13 15:50:12 -05:00
psychobunny
ccfec622d4 Merge branch 'develop' of https://github.com/NodeBB/NodeBB into develop 2017-02-13 15:28:30 -05:00
psychobunny
9e354a09d1 prettier stats on dashboard 2017-02-13 15:28:26 -05:00
Julian Lam
7f124a3ccf Merge branch 'master' into develop 2017-02-10 12:55:11 -05:00
Peter Jaszkowiak
8f27d7810b Ajaxify improvement, /assets/uploads 2017-02-09 15:50:05 -07:00
Julian Lam
7ba111acdd Merge pull request #5420 from NodeBB/assets-route 
/assets/uploads
 2017-02-09 16:08:12 -05:00
Julian Lam
a8fd1440d4 fixed incorrect language key in ip blacklist page 2017-02-09 14:42:21 -05:00
psychobunny
570efb9e4b Merge branch 'develop' into threads-enhancement 2017-02-08 16:41:16 -05:00
psychobunny
83cd960ffa improved threaded view design 2017-02-08 14:46:39 -05:00
Peter Jaszkowiak
aaacdb8413 Fix #5416, uploads path config setting 
- Finish moving uploads route to `/assets/uploads`
- Remove `upload_url` config setting, it was broken
 2017-02-08 11:41:34 -07:00
barisusakli
387110fecc closes #5315 2017-02-08 18:23:34 +03:00
Julian Lam
8a0a74d95e Merge remote-tracking branch 'origin/master' into develop 2017-02-07 16:03:54 -05:00
Julian Lam
b5daedb7a3 Merge remote-tracking branch 'origin/master' into develop 2017-02-07 15:45:21 -05:00
Peter Jaszkowiak
bb1bfb0449 Merge branch 'master' into assets-route 2017-02-06 15:52:54 -07:00
pichalite
2c5f8ed8e6 Add image options to cropper modal 2017-02-06 21:00:21 +00:00
psychobunny
dbc3113940 Merge pull request #5412 from pichalite/cropperjs 
Ability to crop profile images before uploading
 2017-02-06 14:33:49 -05:00
pichalite
b757f563df Move tpl and less to core 2017-02-06 19:11:58 +00:00
pichalite
a3df9132f7 Fix styling 2017-02-03 22:19:19 +00:00
pichalite
a41acead44 Fix tabs 2017-02-03 22:16:04 +00:00
pichalite
6a073277ac Fix ACP layout on tablets 2017-02-03 22:12:47 +00:00
pichalite
a808d1b4d9 Set aspect ratio to square and confine crop box to image 2017-02-03 17:43:51 +00:00
Julian Lam
bfd16d188e Merge branch 'master' into develop 2017-02-03 10:04:49 -05:00
barisusakli
76254942b2 closes #5190 2017-02-03 16:25:02 +03:00
Peter Jaszkowiak
360a35d0a6 Resolve merge conflicts 2017-02-02 22:15:26 -07:00
pichalite
700e2cf800 linting 2017-02-03 01:00:09 +00:00
pichalite
de28ff5d43 Ability to crop profile images before uploading 2017-02-03 00:47:09 +00:00
Peter Jaszkowiak
bb7a35b85c Fix translator catching JS errors in callbacks 2017-01-31 12:04:31 -07:00
Peter Jaszkowiak
c14a31644b Merge branch 'master' into 'develop' 2017-01-30 15:41:14 -07:00
Peter Jaszkowiak
bc9fa0a990 Remove requests to nonexistent language files 2017-01-30 15:08:03 -07:00
barisusakli
f1f00b63fb closes #5400 2017-01-27 20:38:00 +03:00
Julian Lam
7414482753 Merge branch 'master' into develop 2017-01-27 11:27:21 -05:00
Julian Lam
05c724de30 added new hook for messaging teaser retrieval, and casting input as String before execuring stripTags templates helper 2017-01-27 11:26:08 -05:00
barisusakli
33e452cc8e fix lint 2017-01-23 13:09:51 +03:00
barisusakli
0b95eab71e use roomName if availabe in taskbar 
if room is renamed update title on taskbar
 2017-01-23 13:02:40 +03:00
Julian Lam
73879b824c Merge branch 'master' into develop 2017-01-20 12:33:17 -05:00
Julian Lam
694f2382bf fix issue where navigating back to a topic listing (category.tpl) would not scroll down to the topic you had clicked on, and in some cases would exclude topics that were beyond that particular 'page' 2017-01-20 12:11:12 -05:00
Julian Lam
339845ff6b Merge pull request #5366 from pitaj/build-translations 
Compile translations in the build step
 2017-01-19 15:25:28 -05:00