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

17776 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vincent Petry
6b02126dc1 Merge pull request #8382 from owncloud/enc_fix_decrypt_all 
fix shouldEncrypt() method and improved decryptAll() unit tests
 2014-04-29 12:15:11 +02:00
Robin Appelman
77e6278d09 Preserve keys when sorting parameters when generatings urls 2014-04-29 11:55:19 +02:00
icewind1991
b95aa43a5d Merge pull request #8285 from owncloud/better_getmountby_handling 
Handle return values better from Filesystem::getMountBy*
 2014-04-29 11:22:11 +02:00
Joas Schilling
ced2a4fcf2 Remove unneccessary statement from test 2014-04-29 10:42:49 +02:00
Joas Schilling
39bf700790 Update tests to test for create and update aswell 2014-04-29 10:34:28 +02:00
Joas Schilling
c060f6ec7b Deduplicate code 2014-04-29 10:34:28 +02:00
Joas Schilling
c1caaa6241 Correctly emit create/update hooks when a large file is being created/update 
after being uploaded in .part files

Fix #8131
 2014-04-29 10:34:27 +02:00
Joas Schilling
4fa9e46d2b Emit a new hook, when a file is being updated only 
The write-hook also is triggered for created files

Fix #8131
 2014-04-29 10:34:26 +02:00
Jan-Christoph Borchardt
158b870589 Merge pull request #6870 from owncloud/uncheck-remember-checkbox 
do not check 'remember' log in by default
 2014-04-29 10:22:02 +02:00
Jenkins for ownCloud
b4a5093da8 [tx-robot] updated from transifex 2014-04-29 01:56:49 -04:00
Lukas Reschke
369522dbf5 Merge pull request #8388 from owncloud/reset-3rdparty-master 
Update 3rdparty
 2014-04-28 22:25:34 +02:00
Thomas Müller
7c0340c63c Merge pull request #7852 from josh4trunks/basic_auth_fix 
Fixes login / logout when HTTP Basic Headers are avilable.
 2014-04-28 21:46:52 +02:00
Lukas Reschke
318eaa9f56 Merge pull request #8387 from wakeup/master 
Update outdated comment
 2014-04-28 21:00:22 +02:00
Thomas Müller
6935364b33 add class Pimple to autloader 2014-04-28 20:57:44 +02:00
Thomas Müller
bb2f4260c2 Update 3rdparty 2014-04-28 20:32:48 +02:00
Volkan Gezer
e7c6111ae3 Update outdated comment 2014-04-28 20:23:18 +02:00
Sjors van der Pluijm
e8a287f5bb refs #8376; spaces=>tabs 2014-04-28 19:52:06 +02:00
Sjors van der Pluijm
54f482ff9c refs #8376; added comment and applied patch on other files 2014-04-28 19:32:25 +02:00
Arthur Schiwon
837a02184b the group manager calls exists check less often, adjust test accordingly 2014-04-28 19:19:37 +02:00
Thomas Müller
535302b25e typos, indentation and remove of unused code 2014-04-28 17:59:50 +02:00
Bart Visscher
66b1ad0a9b Merge branch 'master' into type-hinting-sharing 
Conflicts:
	apps/files_sharing/lib/share/file.php
	apps/files_sharing/tests/api.php
	lib/private/share/share.php
 2014-04-28 17:59:41 +02:00
Thomas Müller
05dc265ea2 html input tag has no closing tag 2014-04-28 17:58:23 +02:00
Thomas Müller
ac9e07c589 $RUNTIME_APPTYPES is no longer used - left over from pre OC4 2014-04-28 17:56:20 +02:00
Vincent Petry
af22e7ec95 Added unit test in files app for sort function in helper class 
Added unit test for the Helper class in the files app that tests the
different sort orders.
 2014-04-28 17:42:04 +02:00
Vincent Petry
c0e5975ab6 Set default sort of trashbin to timestamp descending 2014-04-28 17:42:04 +02:00
Vincent Petry
688f6162da Add sorting to files list, trashbin and public files 2014-04-28 17:42:04 +02:00
Thomas Müller
e055a411ea Merge pull request #7167 from owncloud/files-ajaxload-infscroll 
Infinite scrolling for files app
 2014-04-28 17:39:02 +02:00
Thomas Müller
be6431bab0 Merge pull request #8380 from owncloud/kill_office_fallback 
remove preview office fallback as it makes too much trouble and generates inacceptable results
 2014-04-28 17:18:36 +02:00
Thomas Müller
bf61d841a2 typos, naming, remove unused code, identation 2014-04-28 16:51:57 +02:00
Thomas Müller
197b8ee052 Merge pull request #8340 from tribut/htaccess-escape-dots 
Escape literal dots in mod_rewrite regexes
 2014-04-28 16:09:03 +02:00
Vincent Petry
f99f451026 Fixed drag and drop into folder and onto breadcrumb 
Fixed drag and drop code to use FileList.getSelectedFiles() instead of
the visible DOM elements.
 2014-04-28 14:55:01 +02:00
Vincent Petry
a15b68c10f Fixed selection summary calculation issue 2014-04-28 14:55:01 +02:00
Vincent Petry
c29e8b0bae Cleanup of event handlers 
Now using _.bind() for event handlers so we can use "this" which is more
readable than a static access to FileList.
 2014-04-28 14:55:01 +02:00
Vincent Petry
3c006a5a4d Cleanup and fix trashbin "clear all files" operation 2014-04-28 14:55:01 +02:00
Vincent Petry
3159c2ee64 Fixed drag shadow file sorting 2014-04-28 14:55:01 +02:00
Vincent Petry
fd982df6ae Fixed selection to be based on FileList.files 
The file selection is now based on the internal model array
FileList.files instead of the visible checkboxes.

This makes it possible to virtually select files that haven't been
rendered yet (select all, then deselect a visible one)

Added more unit tests for selection (with shift and ctrl as well)
 2014-04-28 14:55:01 +02:00
Vincent Petry
a952d80ad9 Fix trashbin previews and "delete selected" 2014-04-28 14:55:01 +02:00
Vincent Petry
8909b574fa Make sure there are always enough elements visible on the page 2014-04-28 14:55:01 +02:00
Vincent Petry
2883f231d0 Fixed insertion of files 
Removed "insert" flag, inserting is by default for FileList.add().
Added "animate" flag to FileList.add().
Added logic to correctly detect when to insert/append elements whenever
the insertion point is visible or not.
Fixed "render next page" logic to work correctly when many pages of
files have been added.
 2014-04-28 14:55:01 +02:00
Vincent Petry
f6586f6bdf Fixed file sorting to work with scrolling 
The FileList.files model is now updated with file operations.
Adding files to the list will add to the model first, then to the DOM.
If the insertion point isn't visible yet, the file won't be added to the
DOM until the user scrolls down.

Updated unit tests to include checking for the correct insertion point.
 2014-04-28 14:55:00 +02:00
Vincent Petry
9c2fbea6a4 Fix file selection for infinite scrolling 
- moved file selection code to FileList
- fix selection summary when all files are selected
- nextPage now auto-selects files if "select all" checkbox is checked
- fixed trashbin to use the same selection logic as FileList
 2014-04-28 14:55:00 +02:00
Vincent Petry
9f62059efa Fix file summary to use the whole file list 
- moved the summary code into a new class FileSummary
- FileSummary is calculated only once, then updated with add/remove
- added new OC.Util namespace for JS utility functions
 2014-04-28 14:49:39 +02:00
Bjoern Schiessle
73a2d87ab4 fix shouldEncrypt() method and improved decryptAll() unit tests 2014-04-28 14:49:19 +02:00
Vincent Petry
efdf0c4df0 Added infinite scrolling (in-memory list) 2014-04-28 14:34:28 +02:00
Thomas Müller
f685c3cceb Merge pull request #8381 from owncloud/files_irods 
drop files_irods from apps_external
 2014-04-28 14:31:31 +02:00
Arthur Schiwon
45e42c25de Group Database backend must not gather user details itself but ask user 
backends. This is a port to master from PR #7745

remove OC_GROUP_BACKEND_GET_DISPLAYNAME option for group backends

Conflicts:
	lib/private/group/backend.php

LDAP: getDisplayNamesInGroup is not an option for group backends anymore

Conflicts:
	apps/user_ldap/group_ldap.php
	apps/user_ldap/group_proxy.php

clean up group backends

Conflicts:
	lib/private/group/database.php

remove now unnecessary test

implement getDisplayNames in group manager

adjust user manager tests

test for group manager's displayNamesInGroup

trim must not be used in empty in PHP < 5.5

keep the constant to not provoke PHP warnings

Conflicts:
	lib/private/group/backend.php
 2014-04-28 13:49:56 +02:00
Sjors van der Pluijm
d7ec1fe447 rewind iterator before iteration starts 2014-04-28 13:05:20 +02:00
Thomas Müller
9128900c56 drop files_irods from apps_external 2014-04-28 12:39:28 +02:00
Thomas Müller
e27dc5b6f9 Merge pull request #8309 from DavidPrevot/chosen 
Adapt chosen (css) path
 2014-04-28 12:34:40 +02:00
Georg Ehrke
b68098ebba remove preview office fallback as it makes too much trouble and generates inacceptable results 2014-04-28 12:05:10 +02:00