Pull upstream work into your branch - which is behind upstream#1

Open

pentium10 wants to merge 278 commits intomasterjus:masterfrom

ptrofimov:master

This pull request is big! We're only showing the most recent 250 commits

Commits on Sep 16, 2014

Update config.php
pentium10
committed

Commits on Sep 17, 2014

removed hide class from modal
pentium10
committed
added modal wrapper around server columns settings
pentium10
committed
updated syntax for checkbox and label
pentium10
committed
enhanced columns selection on serverslist
pentium10
committed
Merge pull request #73 from pentium10/master
pentium10
committed
Update config.php
pentium10
committed
enhanced memory/cpu usage
pentium10
committed
add modal files
pentium10
committed
Merge pull request #74 from pentium10/master
pentium10
committed

Commits on Sep 19, 2014

Created the option to search for jobs by their data field
Florian Kirchner
committed

Commits on Sep 25, 2014

Minor typo
drewhammond
committed

Commits on Sep 26, 2014

Merge pull request #76 from drewhammond/patch-1
Petr Trofimov
committed

Commits on Nov 20, 2014

enhanced delete Delayed messages
pentium10
committed

Commits on Feb 11, 2015

Merge branch 'master' of github.com:ptrofimov/beanstalk_console
pentium10
committed

Commits on Mar 11, 2015

Commits on Mar 26, 2015

Commits on Apr 25, 2015

try to create storage.json automatically if it does not exist
d-a-n
committed

Commits on May 13, 2015

Merge pull request #86 from d-a-n/feature/auto-create-storage-file
pentium10
committed

Commits on May 16, 2015

Reformatted the composer.json file.
needcaffeine
committed

Commits on May 18, 2015

Commits on Jul 2, 2015

Commits on Aug 18, 2015

Commits on Aug 21, 2015

Commits on Aug 26, 2015

Commits on Sep 8, 2015

Commits on Sep 9, 2015

Commits on Sep 15, 2015

Commits on Sep 22, 2015

Commits on Sep 23, 2015

Merge branch 'changeglobal' of git://github.com/byjg/beanstalk_console into byjg-changeglobal
pentium10
committed
Merge branch 'byjg-changeglobal'
pentium10
committed
s
pentium10
committed
fix path
pentium10
committed

Commits on Sep 28, 2015

Update run.sh
pentium10
committed

Commits on Sep 30, 2015

Commits on Oct 10, 2015

Add missing php extension mbstring
jfilipczyk
committed

Commits on Oct 11, 2015

Merge pull request #114 from jfilipczyk/master
pentium10
committed

Commits on Jan 13, 2016

Extract apache listen ports as env vars

Francisco Lopez
authored and
pentium10
committed
Merge branch 'master' of github.com:ptrofimov/beanstalk_console
pentium10
committed
Merge pull request #115 from pentium10/master
pentium10
committed

Commits on Feb 18, 2016

Commits on Sep 29, 2016

Commits on Oct 4, 2016

bugfix from warning when null arrived for foreach loop
InstanceOfMichael
committed

Commits on Oct 6, 2016

made all URLS consistant
InstanceOfMichael
committed

Commits on Oct 7, 2016

Merge pull request #2 from SpaceGazebo/master
pentium10
authored

Commits on Oct 11, 2016

Merge pull request #126 from SpaceGazebo/master
pentium10
authored
Update config.php
pentium10
authored
added base64 decode
pentium10
committed
Merge pull request #127 from pentium10/master
pentium10
authored
开启密码验证，添加退出按钮

张鹏玄
authored and
pentium10
committed
logout when authenticated
pentium10
committed
Merge pull request #128 from pentium10/master
pentium10
authored

Commits on Nov 11, 2016

Commits on Nov 21, 2016

fixes incorrect vhost DocumentRoot which overrides the correct DocumentRoot, fixes docker issue where apache PID file is overwritten and Apache fails to stop
jorgecolonconsulting
committed

Commits on Jan 24, 2017

Commits on Feb 22, 2017

Show job age in human readable format in tube view
Sergei Beregov
committed
Show job age in human readable format in tube view
Sergei Beregov
committed
Merge pull request #137 from s22su/show-job-age
pentium10
authored
Do not show job age row when row value is zero
Sergei Beregov
committed
Merge pull request #138 from s22su/show-job-age
pentium10
authored

Commits on Jul 6, 2017

Commits on Nov 16, 2017

Add missing files in .dockerignore
Zabielski, Kamil
committed
Upgraded `docker-compose` to '3'
Zabielski, Kamil
committed
Add better documentation for `image` keyword
Zabielski, Kamil
committed
Add better port definitions
Zabielski, Kamil
committed
Refactor Dockerfile
Zabielski, Kamil
committed
Add proper naming-convention
Zabielski, Kamil
committed
Add proper `php.ini` image deployment
Zabielski, Kamil
committed
Fix changing ownership
Zabielski, Kamil
committed
Cut `ERROR_REPORTING`
Zabielski, Kamil
committed
Cut `apache_default`
Zabielski, Kamil
committed
Cut not-needed comments
Zabielski, Kamil
committed
Cut `APACHE_PORT`-s
Zabielski, Kamil
committed
Cut `BEANSTALKD_PORT`
Zabielski, Kamil
committed

Commits on Dec 6, 2017

Commits on Dec 14, 2017

show human-friendly info for several tube stats
prgTW
authored

Commits on Dec 28, 2017

added input field for kicking jobs
Thomas Tsiakalakis
committed
Merge pull request #148 from tsia/master
pentium10
authored

Commits on Jan 4, 2018

Commits on Jan 5, 2018

Commits on Jan 24, 2018

Fix link to beanstalkd protocol specification
mkopinsky
committed

Commits on Feb 8, 2018

Commits on Feb 9, 2018

Commits on Mar 6, 2018

Fixes search by calculating maximum job ID
mmenozzi
committed

Commits on May 2, 2018

Use pretty server label in HTML title
curtisgibby
authored

Commits on Oct 12, 2018

Add button to tube page to kick all buried jobs
danbartram
committed

Commits on Dec 5, 2019

Update composer.json
pentium10
authored

Commits on Dec 11, 2019

Merge pull request #1 from ptrofimov/master
fanis
authored

Commits on Apr 14, 2020

Commits on Apr 15, 2020

Merge pull request #172 from Finhaven/master
pentium10
authored

Commits on Jul 7, 2020

Commits on Nov 16, 2020

Highlight paused tubes by changing their border-left colour and show the remaining seconds in a tooltip. Automatic refreshing is supported.
netsmart-fanis
committed

Commits on Jul 20, 2021

fixing missing docker image
natsu90
authored

Commits on Aug 30, 2021

Commits on Feb 1, 2022

Sanitize input
Nav-Prak
authored

Commits on Feb 4, 2022

Commits on Feb 8, 2022

Commits on Apr 28, 2022

Force int for port due to warning in PHP8
tsmgeek
authored

Commits on Aug 1, 2022

Commits on Aug 8, 2022

Commits on Aug 20, 2022

[style-fix] Fix button group broken in Chrome UI.
divyekapoor
committed

Commits on Aug 21, 2022

Commits on Oct 6, 2022

Fix "Undefined variable $serverLabel" warning in php 8+
nyirocsaba
authored

Commits on Oct 9, 2022

Commits on Nov 27, 2022

Commits on Oct 19, 2023

Commits on Dec 2, 2024

Merge branch 'master' of github.com:ptrofimov/beanstalk_console
pentium10
committed
optimized mass delete/move
pentium10
committed
Merge pull request #194 from pentium10/master
pentium10
authored
Update config.php
pentium10
authored

Commits on Dec 11, 2024

Commits on Apr 3, 2025

Commits on Apr 4, 2025

Merge pull request #12 from ptrofimov/master
pentium10
authored

Commits on Apr 10, 2025

Commits on May 19, 2025

Updated env var syntax
kdekooter
committed