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

31838 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
62a59854f0
Fix LDAP race conditions 
* getFromCache is wrapped in isCached
* inbetween the two calls the cache entry hits it's TTL
* getFromCache returns null
* this fix only checkes if the returned value is null and
  return only non-null values
 2016-04-20 21:50:28 +02:00
Thomas Müller
7e2a1656f9 Merge pull request #24132 from owncloud/fix-web-updater 
Fix web updater
 2016-04-20 21:50:00 +02:00
Roeland Jago Douma
269eaeed0b
Move \OC\Tagging to PSR-4 2016-04-20 21:24:23 +02:00
Morris Jobke
6b66f2dfb4 Merge pull request #23990 from owncloud/heartbeat-debounce 
Debounce heartbeat ajax calls to lower the number of requests
 2016-04-20 21:23:10 +02:00
Thomas Müller
42b25f7821 Merge pull request #23951 from owncloud/cleanlocks-chunk 
chunk the cleaning up of shared locks
 2016-04-20 20:40:32 +02:00
Thomas Müller
1ab27ddd4a Merge pull request #24081 from owncloud/migrate-deprecated-jquery-v1-functions 
migrate deprecated jQuery 1.x functions
 2016-04-20 20:38:38 +02:00
Thomas Müller
1ef92621ab Merge pull request #24064 from owncloud/update-3rdparty 
Update 3rdparty to remove unneeded files
 2016-04-20 20:38:00 +02:00
Thomas Müller
cd01c440a0 Merge pull request #23919 from owncloud/cyclyc-share-dep-example 
SharedStorage to new sharing code + cleanup
 2016-04-20 20:37:27 +02:00
Thomas Müller
cdcabbd0b3 Merge pull request #24098 from owncloud/fix_23782 
When calling file_put_contents clear the checksum
 2016-04-20 20:37:01 +02:00
Thomas Müller
01b09b4f92 Merge pull request #24118 from owncloud/add-load-script-events-for-settings 
Add loadAdditionalScripts events to admin and personal settings
 2016-04-20 20:36:27 +02:00
Thomas Müller
22db0f17a8 Fix web updater - fixes #24115 2016-04-20 20:32:47 +02:00
Thomas Müller
f92054acf2 Merge pull request #24123 from owncloud/preview_psr4 
Move \OC\Preview to PSR-4
 2016-04-20 20:21:45 +02:00
Thomas Müller
7fea9974b7 In case an app has issues while loading the app is disabled and request processing continues 2016-04-20 18:02:37 +02:00
Thomas Müller
6a6fc742dc Catch class Error on all root entrypoints 2016-04-20 18:01:47 +02:00
Thomas Müller
069af51dd0 With PHP7 Throwable is the new base interface for all Exception and Error - we should be capable to log Throwable as well 2016-04-20 17:56:08 +02:00
Björn Schießle
2a6a336e87
always share with same default permissions, no special handling for remote shares 2016-04-20 17:47:33 +02:00
Björn Schießle
2edbb7d4bd
if share-permissions exists we use this information as indicator to check if the file has changed or not 2016-04-20 17:47:33 +02:00
Björn Schießle
e906796f99
ask for share-permissions on propfind 2016-04-20 17:47:32 +02:00
Robin McCorkell
bd9a380d53 Delay reloading the page if an ajax error occurs, show notification 2016-04-20 16:31:04 +01:00
Roeland Jago Douma
702046d4aa
Move \OC\Preview to PSR-4 2016-04-20 15:02:44 +02:00
Lukas Reschke
afad27fafd Merge pull request #24075 from owncloud/no-html-on-cli 
In case of fatal php errors and other unhandled exceptions no html er…
 2016-04-20 13:50:43 +02:00
Thomas Müller
ae27583fe2 Merge pull request #24116 from owncloud/fix_24095 
preserve information if it is a rename operation or not
 2016-04-20 13:48:24 +02:00
Thomas Müller
fff272b5cc Merge pull request #23760 from owncloud/fix-setup-mysql 
Fix conditional check in MySQL setup
 2016-04-20 13:46:42 +02:00
Thomas Müller
784cf3d722 Merge pull request #24120 from owncloud/mail_psr4 
Move \OC\Mail to PSR-4
 2016-04-20 13:45:54 +02:00
Robin McCorkell
440b5caad7 Fix conditional check in MySQL setup 2016-04-20 11:58:27 +01:00
Roeland Jago Douma
bc4185a6fe
Move \OC\Mail to PSR-4 2016-04-20 12:49:23 +02:00
Joas Schilling
c670c23455
Add loadAdditionalScripts events to admin and personal for plugins that have no section 2016-04-20 12:30:48 +02:00
Björn Schießle
4f438eee56
preserve information if it is a rename operation or not 2016-04-20 12:17:15 +02:00
Thomas Müller
34b753baa0 Merge pull request #23952 from owncloud/hide-hidden-files 
Add option to hide hidden files
 2016-04-20 11:58:38 +02:00
Thomas Müller
aa33ab0c03 Merge pull request #24094 from owncloud/move_dummy_group_backend_to_test 
Move the group dummy backend to test
 2016-04-20 11:55:00 +02:00
Thomas Müller
a6676f31ec Merge pull request #24097 from owncloud/fix_23632 
init users mount point before recovery
 2016-04-20 11:54:45 +02:00
Thomas Müller
98f854ba1c Merge pull request #24104 from tyrylu/accessibility_settings_fix 
App settings screen accessibility fixes
 2016-04-20 11:54:23 +02:00
Thomas Müller
64956ec2cf Merge pull request #24103 from owncloud/diagnostics_psr4 
Move \OC\Diagnostics to PSR-4
 2016-04-20 11:53:24 +02:00
Jan-Christoph Borchardt
5fe630c4f1 Merge pull request #23980 from owncloud/remember-email-when-setting-expirationdate 
remember email when setting expiration date
 2016-04-20 11:42:02 +02:00
Joas Schilling
9ebae0bdeb
Chunk the users correctly in the trashbin and versions background job 2016-04-20 10:36:15 +02:00
Björn Schießle
17eb11cce8 Merge pull request #23915 from owncloud/activity-505-always-stream-for-comments 
Always add activities for comments to the stream
 2016-04-20 10:21:09 +02:00
Morris Jobke
66799670b4
Update 3rdparty to remove unneeded files 2016-04-20 09:19:18 +02:00
Jenkins for ownCloud
a296cbd203 [tx-robot] updated from transifex 2016-04-20 01:54:55 -04:00
Roeland Jago Douma
0dbcbc4cae
When the scanner detects a file is changed clear checksum 
Fixes #23782 and #23783

If the file scanner detects a changed file we clear the checksum while
we update the cache.

* Unit test added
 2016-04-19 20:20:45 +02:00
Lukáš Tyrychtr
c2f2edc092 Fix reporting of the categories in app settings as links by screen readers. 2016-04-19 19:49:31 +02:00
Roeland Jago Douma
e2bff0b35d
Move \OC\Diagnostics to PSR-4 2016-04-19 19:29:47 +02:00
Björn Schießle
a3381b1d0c
we need to initialize the mount points of the given user before we recover 
access to his files
 2016-04-19 17:04:21 +02:00
Christoph Wurst
e4a8456d01
replace $().attr('checked') by $().prop('checked', state) or $().is(':checked') 2016-04-19 16:20:17 +02:00
Christoph Wurst
6c5696d3a8
filter hidden files on the web interface 
add checkbox to toggle show/hide hidden files

persist show hidden setting

fix settings menu layout

test ApiController::showHiddenFiles

don't show hidden files by default

Store config in Backbone model and inject it into FileList

Filter files only temporarily when rending the file list

Fix file rename validation
 2016-04-19 16:08:56 +02:00
Thomas Müller
b441d3dcb3 Merge pull request #24062 from owncloud/fix-gitignore 
Fix gitignore for core/vendor
 2016-04-19 16:06:59 +02:00
Thomas Müller
c0d132150a Merge pull request #24079 from owncloud/console_psr4 
Move \OC\Console to PSR-4
 2016-04-19 16:05:34 +02:00
Thomas Müller
5b2ef92eb2 Merge pull request #24004 from owncloud/dont-transfer-files-to-not-ready-user 
Introduce isReadyForUser and verify in file transfer ownership
 2016-04-19 15:56:47 +02:00
Roeland Jago Douma
dd7e0d13e5
Move the group dummy backend to test 
The dummy backend is only used for testing and should thus reside in
tests.
 2016-04-19 15:13:31 +02:00
Christoph Wurst
05d203a989
replace $.parseJSON() by JSON.parse() 2016-04-19 15:06:42 +02:00
Lukas Reschke
a86fd873d6 Merge pull request #24076 from owncloud/fix-initial-calendar-and-addressbook-names 
Fix displayname for initial calendars and address books
 2016-04-19 14:30:35 +02:00