Commit Graph

5262 Commits

Author SHA1 Message Date
Julian Lam
ae261e073b updating markdown and moving app.load back into ajaxify.end 2017-10-13 09:58:26 -04:00
Julian Lam
cfacc4f133 potential fix for #5980 2017-10-12 17:01:01 -04:00
Julian Lam
9cbf1597cd Merge remote-tracking branch 'origin/master' into develop 2017-10-12 14:01:14 -04:00
Julian Lam
cd6dcff38b Split up customJS into customHTML and customJS for better organisation (#5981)
* WIP

* fixed customJS not actually working in footer

* Moving scripts to footer, #5980

* Added upgrade scripts for #5980
2017-10-12 13:38:27 -04:00
Peter Jaszkowiak
1c35213934 Fix #5970 and forking while debugging (#5965)
* Fix forking while debugging

Debugger address in use no longer happens

* Fix cropper error
2017-10-09 11:40:36 -04:00
Julian Lam
6852c92ed6 Merge remote-tracking branch 'origin/develop' 2017-10-03 13:37:43 -04:00
RoiEX
e1f180ea3f Remove uneccessary undefined declaration 2017-10-03 09:47:59 -04:00
RoiEX
ce9a3f20c5 Optimize transition 2017-10-03 09:47:59 -04:00
RoiEX
5e4e523198 Make progress bar finer 2017-10-03 09:47:59 -04:00
RoiEX
1fd160a4e6 Add Support for Firefox OSD 2017-10-03 09:43:33 -04:00
Peter Jaszkowiak
da9da8190f Bump dependencies
Bumping eslint & configs meant making some linting fixes

For future reference, the `xmlhttprequest-ssl` library must be of equal versioning to the one in `engine.io-client`, otherwise it won't be deduped which causes the socket.io tests to fail
2017-10-02 09:24:27 -04:00
Chế Tiệp Chân Khoa
1f5d14dda4 place some code under the right loop (#5945) 2017-09-29 09:27:41 -04:00
Peter Jaszkowiak
dc87d7fc0f Use .js instead of .jst
Fix #5934
2017-09-23 12:51:20 -06:00
Baris Usakli
8276e20254 closes #5937 2017-09-21 14:30:12 -04:00
Baris Usakli
a2508161c6 fix hover bg color 2017-09-14 15:57:22 -04:00
Julian Lam
b8ce4023c3 finish redirect if success returned 5x, via installer 2017-09-14 13:42:48 -04:00
Julian Lam
e64c1d28e6 closes #5931 2017-09-14 09:40:24 -04:00
Julian Lam
514317ab20 using translator.unescape instead of replaces 2017-09-13 17:06:00 -04:00
Julian Lam
211482bbc0 fixes #5927 2017-09-13 12:09:31 -04:00
Baris Usakli
bf79857b7d closes #5908 2017-09-01 17:42:55 -04:00
Julian Lam
1034626896 Merge remote-tracking branch 'origin/develop' 2017-09-01 16:07:12 -04:00
Peter Jaszkowiak
23e7222dfa Update Nodemailer to v4
also filter out .jst files from email template dropdowns
2017-08-30 14:26:41 -06:00
Peter Jaszkowiak
cfba8970e1 Fix posts block usage in categories page 2017-08-30 12:43:11 -06:00
Peter Jaszkowiak
c91dfb46f6 Switch module t.js usage to Benchpress 2017-08-30 11:32:23 -06:00
Peter Jaszkowiak
71aab79a9a Switch client t.js usage to Benchpress 2017-08-30 11:31:29 -06:00
Peter Jaszkowiak
dc3f89a505 ajaxify t.js usage to Benchpress 2017-08-30 10:51:25 -06:00
Peter Jaszkowiak
5885e37127 Switch admin t.js usage to Benchpress 2017-08-30 10:50:28 -06:00
Julian Lam
cd60d79a13 closes #5904 2017-08-29 09:28:18 -04:00
Andrew Rodrigues
60e0f4ced9 minor typo 2017-08-25 15:53:35 -04:00
Barış Soner Uşaklı
5cc39e8546 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
# Conflicts:
#	package.json
#	src/views/admin/manage/ip-blacklist.tpl
2017-08-24 19:29:15 -04:00
Peter Jaszkowiak
abffc29128 Use Benchpress (#5901)
* Use Benchpress

* Use Benchpress.compileParse

* Error for template load failure

* Use benchpressjs package

* Compile templates on demand

* Fix user settings page

* Fix admin search to exclude `.jst` files

* Fix 500-embed

So ajaxify can still show an error if the server goes down
2017-08-24 19:26:50 -04:00
Julian Lam
53ca6d1199 closes #5889 2017-08-24 12:39:57 -04:00
Julian Lam
73d4517d27 Revert "fixes #5894"
This reverts commit e2b40ddf34.
2017-08-23 21:38:58 -04:00
Julian Lam
9d2bf4746c Revert "fix reload loop for guests"
This reverts commit a67a0b0a08.
2017-08-23 19:32:10 -04:00
Julian Lam
a67a0b0a08 fix reload loop for guests 2017-08-23 19:30:30 -04:00
psychobunny
a13a5c02e9 closes #5899 2017-08-23 18:14:59 -04:00
Julian Lam
e2b40ddf34 fixes #5894 2017-08-23 15:11:15 -04:00
psychobunny
d5db97930d prevent "plugins" menu from being highlighted when going to Extend -> Plugins 2017-08-21 18:50:50 -04:00
psychobunny
e8c40c8dc6 scroll to the actual subsection in the ACP when clicking on links pointing to that hash 2017-08-21 18:46:03 -04:00
Barış Soner Uşaklı
ff88be91fa Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2017-08-18 20:09:40 -04:00
Barış Soner Uşaklı
5dfb2fb83a up themes, fix notif test 2017-08-18 19:00:48 -04:00
Julian Lam
c1d7b06ded Fixes #5873
- Notifications.getMultiple now takes an optional uid parameter
- If a notification link in dropdown points to a topic and you're
  in said topic, you will be scrolled to the post instead of
  ajaxified to it.
2017-08-18 16:30:54 -04:00
Baris Usakli
bc0645dc26 Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2017-08-16 15:17:26 -04:00
Baris Usakli
5a968730d5 closes #5880 2017-08-15 14:43:43 -04:00
Baris Usakli
575c9a41cd Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2017-08-15 13:00:18 -04:00
Barış Soner Uşaklı
f161bbf956 Post queue (#5878)
* #5876

* add user to post queue table

* add time of post into queue

add posting restrictions to queue

* fix shouldQueueLogic for guests

* add test for post-queue route
2017-08-15 12:59:40 -04:00
Baris Usakli
27a6b8a713 lint fixes 2017-08-11 11:55:46 -04:00
Baris Usakli
bc6b1a8f56 Merge remote-tracking branch 'refs/remotes/origin/master' into develop
# Conflicts:
#	public/src/admin/extend/plugins.js
2017-08-11 11:33:06 -04:00
Julian Lam
d9ad26c7c5 the meat of #5862, making chat loading not require an ajaxification 2017-08-10 17:00:43 -04:00
Julian Lam
902b823f4d adding mobile handling of chats' recent list links 2017-08-10 16:21:28 -04:00