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

20401 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vincent Petry
1e631754d7 Fix share key finding algorithm in various cases 
Instead of inaccurate pattern matching, use the list of users who we
know have access to the file to build the list of share keys.

This covers the following cases:

- Move/copy files into a subfolder within a share
- Unsharing from a user
- Deleting files directlry / moving share keys to trashbin
 2014-09-23 12:33:07 +02:00
Lukas Reschke
4669ea3835 Merge pull request #10680 from helmutschneider/aws-2.6.15 
Update AWS sdk to 2.6.15
 2014-09-16 16:34:16 +02:00
Thomas Müller
ba445e85b2 Merge pull request #11082 from owncloud/deduplicateDependencyCheck 
Deduplicate dependency checks
 2014-09-16 16:33:02 +02:00
Lukas Reschke
64653223fc Merge pull request #11108 from owncloud/add-proper-descr 
Reword the description
 2014-09-16 16:00:58 +02:00
Lukas Reschke
b31b6db4de Reword the description 
The old one was just horrible wrong.
 2014-09-16 15:51:48 +02:00
Lukas Reschke
2f10b60c9e Merge pull request #10754 from cetra3/master 
Refactor internal session handler to write directly to $_SESSION
 2014-09-16 15:48:19 +02:00
Thomas Müller
1978d3d6a2 Merge pull request #11055 from owncloud/replaceprodname 
replace ownCloud with placeholder
 2014-09-16 14:49:50 +02:00
Lukas Reschke
261d07c95c Merge pull request #11084 from owncloud/no-migration-for-mssql-master 
Disable database migrations for MSSQL - scripts have to be applied manua...
 2014-09-16 14:00:24 +02:00
Lukas Reschke
ba5d3fb96b Merge pull request #11081 from owncloud/trash_fix_expire 
also expire file if timestamp = limit, happens if trashbin_retention_obl...
 2014-09-16 13:58:12 +02:00
Lukas Reschke
5813cf32dc Deduplicate dependency checks 
Some code that I also used for https://github.com/owncloud/administration/pull/11
 2014-09-16 13:07:47 +02:00
Morris Jobke
61b040cbe8 Merge pull request #10663 from owncloud/files_trashbin_original_path 
Show original path information in trashbin and for shares
 2014-09-16 12:49:17 +02:00
Vincent Petry
e2b504e61d Revert "improve logo flexibility to fix wide custom logo alignment, fix #9339" 
This reverts commit 064e6951e1.

Reverting due to regression that breaks styles in error page, setup
page and others.

Fixes #10967
 2014-09-16 11:22:54 +02:00
Morris Jobke
dd70d1b88c Merge pull request #11090 from owncloud/fix-undefined-class-and-phpdoc 
Fix unexisting class and PHPDoc
 2014-09-16 10:29:01 +02:00
Morris Jobke
ea2022661d patch tipsy in style.css - don't patch 3rdparty libraries 2014-09-16 08:45:28 +02:00
Morris Jobke
af52ffc5d5 Merge pull request #10639 from owncloud/fix_naming_schema_preview_with_aspect 
add y to with-aspect naming schema
 2014-09-16 08:36:33 +02:00
Morris Jobke
245a0e2ad8 Merge pull request #10362 from owncloud/preserve_transparency_on_fileload 
Preserve transparency when loading from a file
 2014-09-16 08:33:56 +02:00
Jenkins for ownCloud
1e6ac31bde [tx-robot] updated from transifex 2014-09-16 01:54:33 -04:00
Jan-Christoph Borchardt
513fb05947 Merge pull request #11040 from owncloud/fix-app-menu-overlapp 
Remove bottom: 0 from app-navigation-entry-utils to prevent the utils form overlapping the whole element....
 2014-09-15 23:50:30 +02:00
Lukas Reschke
59c79781f7 Merge pull request #11023 from owncloud/users-fixundo 
Add timeout to user and group deletion notification.
 2014-09-15 21:55:03 +02:00
Lukas Reschke
627252fe81 Merge pull request #11060 from owncloud/rmobslang 
remove obsolete language files
 2014-09-15 17:31:10 +02:00
Morris Jobke
d6cb489b68 add some minor fixes for IE8 2014-09-15 17:09:12 +02:00
Lukas Reschke
4f0f7e35ca Fix unexisting class and PHPDoc 
You can't add int here as hint...
 2014-09-15 17:08:56 +02:00
Morris Jobke
06eb3b62c6 Merge pull request #10109 from owncloud/issue_#9793_guestlayout 
Step one, open guest layout for different styles.
 2014-09-15 15:15:41 +02:00
Georg Ehrke
cf76933b76 add phpdoc 2014-09-15 15:10:03 +02:00
Georg Ehrke
3157d307f7 add y to with-aspect naming schema 2014-09-15 15:10:03 +02:00
Thomas Müller
d824d03fe1 Disable database migrations for MSSQL - scripts have to be applied manually 2014-09-15 15:00:32 +02:00
Morris Jobke
5357c91520 Merge pull request #11026 from owncloud/apps-styles-update 
Apps styles update
 2014-09-15 14:45:23 +02:00
Lukas Reschke
07b14bcd4f Merge pull request #10960 from owncloud/use-intl-module-master 
use intl's native normalizer_normalize() in case the module is available
 2014-09-15 14:13:30 +02:00
Vincent Petry
0d9f24a0ef Add timeout to user and group deletion notification 
Added timeout in DeleteHandler to auto-delete after a delay.

Fixed issue where OC.Notification.hide() was called twice in a row when
deleting multiple entries, causing the second notification to disappear.
Fixed issue where "undo" click event handler was registered multiple
times when calling setNotifications() twice.
Added JS unit tests for the DeleteHandler class.

Refix undo users, groups feature

Timeout is now cleared in cancel().

Fixed click handler name for "undo" to be able to work with multiple
DeleteHandler instances (in our case one for users and one for groups)
so that there is no conflict.
 2014-09-15 14:04:44 +02:00
Bjoern Schiessle
f23116ce50 also expire file if timestamp = limit, happens if trashbin_retention_obligation is set to zero 2014-09-15 13:00:04 +02:00
Bernhard Posselt
80ce598bc3 remove bottom: 0 to prevent the menu form overlapping the whole element. This happens if a folder has entries, the menu expands to the very bottom and overlaps all entries and makes them impossible to click 
fix input width which was changed likely with the icon PR

use calc because firefox and chrome have different scrollbar widths which causes firefox to push the button into the next row while everything is well in chrome

add normal width for IE8
 2014-09-15 12:53:33 +02:00
Andreas Fischer
31898aa635 Merge pull request #11021 from owncloud/do-not-double-decode 
Do not double decode values

* owncloud/do-not-double-decode:
  Do not double decode values
 2014-09-15 07:58:45 +02:00
Jenkins for ownCloud
8d647fa267 [tx-robot] updated from transifex 2014-09-15 01:54:26 -04:00
Lukas Reschke
90e91a9d10 Merge pull request #11050 from owncloud/enc-flockfix 
Remove passing by reference to allow for proper GC
 2014-09-15 00:31:10 +02:00
Jenkins for ownCloud
d8c7a52979 [tx-robot] updated from transifex 2014-09-14 01:54:35 -04:00
Thomas Müller
05fa947b6b Merge pull request #11054 from owncloud/fix-unit-tests-11041-master 
content size checks are not valid for LOCK
 2014-09-13 20:00:46 +02:00
Volkan Gezer
5d1fa60e0d remove obsolete language files 2014-09-13 15:29:11 +02:00
Jenkins for ownCloud
518ed10c77 [tx-robot] updated from transifex 2014-09-13 05:17:34 -04:00
Volkan Gezer
c04346918b replace ownCloud with placeholder 2014-09-13 01:48:18 +02:00
Thomas Müller
6dfd1733bb Don't terminate the script if the pgsql database could not be deleted 2014-09-12 22:41:22 +02:00
Thomas Müller
cfa2eb7d32 content size checks are not valid for LOCK 2014-09-12 22:02:42 +02:00
Raghu Nayyar
1145529584 Merge pull request #11041 from owncloud/no-size-check-on-lock-master 
content size checks are not valid for LOCK
 2014-09-13 00:48:52 +05:30
Vincent Petry
da9f9ae9b3 Remove passing by reference to allow for proper GC 
The garbage collector in PHP 5.3.10 does not properly release the file
handle when calling fclose() due to the fact that it is passed by
reference.
This has the side-effect of preventing file locks to be released as well
when the files_locking app is enabled.

This fix removes the useless passing by reference and now the file
handle and file lock are freed properly.
 2014-09-12 19:51:47 +02:00
Bernhard Posselt
d48b672791 Merge pull request #10974 from owncloud/fix-app-content-overflow 
This fixes the double scrollbars issue
 2014-09-12 18:41:43 +02:00
Thomas Müller
d3fc5de4c2 remove 'set -e' - causes issues during ci execution 2014-09-12 15:42:50 +02:00
Clark Tomlinson
cfd8b3f976 Merge pull request #11043 from owncloud/test-againstNull 
Return false in case the passed values are not of type string
 2014-09-12 09:42:42 -04:00
Lukas Reschke
5ff999d69d Return false in case one of the values is null 2014-09-12 13:34:45 +02:00
Thomas Müller
27cd30aa94 content size checks are not valid for LOCK 2014-09-12 09:42:32 +02:00
Jenkins for ownCloud
d6834b6389 [tx-robot] updated from transifex 2014-09-12 03:28:56 -04:00
Jan-Christoph Borchardt
7afca08255 Merge pull request #11024 from owncloud/fix-nojavascript 
fix nojavascript message alignment
 2014-09-11 23:06:17 +02:00