wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
41459 commits 157 branches 562 tags 714 MiB
Commit graph

41459 commits

This branch
This branch
All branches
Author SHA1 Message Date
Daniel Calviño Sánchez
2af3d8a9b2 Make possible to provide a specific HTTP request object to File 
This will be used in a following commit to test how the X-OC-MTime
header is handled.

This commit is based on the "make File::put() more testable" commit
(included in 018d45cad97e0) from ownCloud by Artur Neumann.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-11-27 20:39:41 +01:00
Daniel Calviño Sánchez
01e346b2ae Ensure that X-OC-MTime header is an integer also with chunked uploads 
This commit extends the changes introduced in pull request #3793 also to
chunked uploads.

The "sanitizeMTime" method name is the same used in the equivalent pull
request to this one from ownCloud (28066).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-11-27 20:37:51 +01:00
Morris Jobke
892d2630fe
Merge pull request #7275 from nextcloud/disable-elements-while-a-comment-is-being-deleted 
Disable elements while a comment is being deleted
 2017-11-24 16:14:53 +01:00
Lukas Reschke
14a6fbe809
Merge pull request #7271 from nextcloud/fix-menu-loading-position 
Fix loading icon position in the app menu
 2017-11-24 16:03:23 +01:00
Lukas Reschke
ee4262f567
Merge pull request #7263 from nextcloud/clean-bruteforce-attempt-on-success 
Reset bruteforce attempt table on successful login
 2017-11-24 15:53:08 +01:00
Morris Jobke
44adcad757
Merge pull request #7273 from nextcloud/remove-unused-code 
Remove unused checkCode method
 2017-11-24 15:08:29 +01:00
Morris Jobke
5a270c2715
Reset bruteforce attempt table on successful login 
* only clear the entries that come from the same subnet, same action and same metadata

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-24 14:58:57 +01:00
Daniel Calviño Sánchez
5e6d4ad27c Disable elements while a comment is being deleted 
When a comment is being deleted the "disabled" class is added to the
comment div, which causes it to look disabled. However, the input
elements and the content editable div were not truly disabled, and thus
it was still possible to interact with them. This commit ensures that
they are properly disabled while the comment is being deleted.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-11-24 13:17:55 +01:00
Morris Jobke
05abb9ea66
Remove unused checkCode method 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-24 10:50:50 +01:00
Lukas Reschke
3a6d16e6d4
Merge pull request #7268 from nextcloud/update-crl 
Update CRL due to files_frommail
 2017-11-24 10:01:21 +01:00
Nextcloud bot
dc1d13a18d
[tx-robot] updated from transifex 2017-11-24 01:09:53 +00:00
Julius Härtl
cd7aba3171
Fix loading icon position in the app menu 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-11-23 21:15:05 +01:00
Morris Jobke
7a49270c64
Update CRL due to aboutconfig 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-23 18:37:23 +01:00
Morris Jobke
eaafa72ae0
Update CRL due to files_frommail 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-23 17:56:58 +01:00
Morris Jobke
2f3484ba88
Merge pull request #7260 from nextcloud/cleanup-unused-code 
Use basename() instead of self implementation
 2017-11-23 13:07:47 +01:00
Morris Jobke
be4e921306
Use basename() instead of self implementation 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-23 12:35:47 +01:00
blizzz
98cdd9885f
Merge pull request #7168 from nextcloud/fix-user-list 
Fix accesslist when a user has an ID only containting 0-9
 2017-11-23 12:17:11 +01:00
Morris Jobke
106d932e8f
Merge pull request #7137 from nextcloud/shared-jailed-source-root 
Use the correct root for shared jail when the source storage is also a jail
 2017-11-23 12:03:36 +01:00
Nextcloud bot
b6a39b7927
[tx-robot] updated from transifex 2017-11-23 01:09:47 +00:00
Jan-Christoph Borchardt
90c1d3e129
Merge pull request #7247 from nextcloud/give-audio-icons-shadow 
Give audio-white and audio-off-white shadow via CSS
 2017-11-22 18:07:06 +01:00
Marin Treselj
c5e51b34be Give audio-white and audio-off-white shadow via CSS 
Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-11-22 14:16:39 +01:00
Jan-Christoph Borchardt
968da5ef23
Merge pull request #7239 from nextcloud/larger-close-button 
Make close icon fill more space
 2017-11-22 14:00:57 +01:00
Nextcloud bot
3aaccc9a23
[tx-robot] updated from transifex 2017-11-22 01:10:09 +00:00
Marin Treselj
bf68d6374b Less exaggerated size increase for close icon 
Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-11-21 16:07:43 +01:00
Marin Treselj
7f36c2090a Make close icon fill more space 
Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-11-21 15:33:23 +01:00
John Molakvoæ
399a965240
Merge pull request #7236 from nextcloud/remove-deprecated-icons 
Remove unused, deprecated icons
 2017-11-21 14:52:08 +01:00
Marin Treselj
2f4e036a15 Remove unused, deprecated icons 
Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-11-21 14:06:46 +01:00
Nextcloud bot
a8ec62dcc2
[tx-robot] updated from transifex 2017-11-21 01:10:07 +00:00
Morris Jobke
fe3f094127
Merge pull request #7230 from nextcloud/fix-autoload-section-failure 
Remove wrong entry in admin_settings that causes 500
 2017-11-20 22:14:20 +01:00
Morris Jobke
6fd51426bf
Remove wrong entry in admin_settings that causes 500 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-20 20:49:03 +01:00
Morris Jobke
c277800ba4
Merge pull request #7231 from nextcloud/fix-broken-svg-5 
Re-optimize and clean up settings, social and logo icons #7209
 2017-11-20 18:09:50 +01:00
Marin Treselj
0709f38ed8 Make user-related icons bigger. 
Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-11-20 17:28:25 +01:00
Marin Treselj
8615ca8bd2 Re-optimize and clean up settings, social and logo icons 
Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-11-20 17:27:30 +01:00
Björn Schießle
f347e2e4a6
Merge pull request #7047 from nextcloud/add-support-for-files-with-no-permissions 
Add support for files with no permissions
 2017-11-20 16:15:52 +01:00
Morris Jobke
bca165805e
Merge pull request #7195 from nextcloud/app-content-list 
Add app content list
 2017-11-20 14:41:11 +01:00
Jan-Christoph Borchardt
a61015d647 Increase clickable area of actions to 44*44px 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-11-20 14:10:04 +01:00
Jan-Christoph Borchardt
5ea14192ee Move star to top right instead of top left, fix checkbox overlay 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-11-20 14:00:00 +01:00
Jan-Christoph Borchardt
1dd8746395 Reduce size of date in list 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-11-20 13:57:49 +01:00
Morris Jobke
93e34fb61b
Merge pull request #7211 from nextcloud/fix-5916 
only replace permission popupmenu
 2017-11-20 11:36:12 +01:00
Nextcloud bot
96b15cec83
[tx-robot] updated from transifex 2017-11-20 01:09:40 +00:00
Nextcloud bot
dd5373795f
[tx-robot] updated from transifex 2017-11-19 01:09:52 +00:00
Nextcloud bot
39ec541b23
[tx-robot] updated from transifex 2017-11-18 01:10:43 +00:00
Roeland Jago Douma
07af58df5f
Merge pull request #7121 from nextcloud/fix_7119 
If there is no internet connection don't try to contact appstore
 2017-11-17 21:07:10 +01:00
Roeland Jago Douma
6bbda28881
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-17 20:41:58 +01:00
Roeland Jago Douma
2eb2b6e437
If there is no internet connection don't try to contact appstore 
Fixes #7119

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-17 20:35:04 +01:00
Jan-Christoph Borchardt
059be95d6c
Merge pull request #7163 from nextcloud/force-breaks-on-extremely-long-words-in-comments 
Force breaks on extremely long words in comments
 2017-11-17 19:02:36 +01:00
Arthur Schiwon
a1d4ac6d43
only replace permission popupmenu 
the contacts popovermenu is also present and is being replaces, ending
up in two permission popupmenus with checkboxes duplicating the id,
breaking further permission changes.

plus, fixing a selector

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-11-17 17:08:29 +01:00
Daniel Calviño Sánchez
5d85af79b6 Force breaks on extremely long words 
If not broken extremely long words overflow their container.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-11-17 15:10:50 +01:00
Björn Schießle
19e4a3373b
Merge pull request #7206 from nextcloud/fix-object-storage-touch 
touch opertation on object storage, don't create the file cache entry to early
 2017-11-17 14:49:06 +01:00
Bjoern Schiessle
1ade6b0817
only create the file cache entry after the empty file was created successfully, otherwise file_exists() call on the initial file_put_content() will indicate that the file already exists 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-11-17 12:45:46 +01:00