Commit Graph

33245 Commits

Author SHA1 Message Date
Marius Blüm 2166c90484 Reintroduce HackerOne into CONTRIBUTING.md 2016-06-19 21:36:05 +02:00
Marius Blüm 3d470be8eb Reintroduce HackerOne into CONTRIBUTING.md 2016-06-19 17:49:46 +02:00
Florian Preinstorfer f6e9322f1e Remove obsolete contacts_cards_properties table
The table contacts_cards_properties was part of the contacts app until
ownCloud 8.2. It got replaced with cards_properties (part of dav).

See also: ownCloud/core #21889
2016-06-19 15:40:37 +02:00
Marius Blüm 97094b211c Merge pull request #156 from nblock/dev/remove-old-gallery-tables
Drop obsolete tables: gallery_albums and gallery_photos
2016-06-19 15:01:23 +02:00
Florian Preinstorfer 217144dd95 Drop obsolete tables: gallery_albums and gallery_photos
Commit 34a21a63ce renamed gallery_albums
to pictures_images_cache and removed gallery_photos entirely.
2016-06-19 14:01:42 +02:00
Jenkins for ownCloud d65c56d7de [tx-robot] updated from transifex 2016-06-18 01:58:51 -04:00
Markus Goetz 111bd8e57d files_external: Keep checkbox and its label on one line #20032 #22655
Else the checkbox and the decription end up on different lines in my Chrome on OS X
2016-06-17 16:19:38 +02:00
Christoph Wurst b0f2878f6e
close cursor after loading a token 2016-06-17 16:13:28 +02:00
Vincent Petry cab7106dfb Merge pull request #25158 from owncloud/removerootshares-delaygetrootfolder
Delay getRootFolder from RemoveRootShares repair step
2016-06-17 15:57:09 +02:00
Vincent Petry 2340660a5b
PasswordLoginForbidden must extend NotAuthenticated
The auth code from Sabre will forward NotAuthenticated exceptions but
in the case of a generic exception, it is packaged as "service not
available".
2016-06-17 15:50:24 +02:00
Christoph Wurst 1889df5c7c
dont create a session token for clients, validate the app password instead 2016-06-17 15:42:28 +02:00
Christoph Wurst 0c0a216f42
store last check timestamp in token instead of session 2016-06-17 15:42:28 +02:00
Christoph Wurst c4149c59c2
use token last_activity instead of session value 2016-06-17 15:42:28 +02:00
Vincent Petry a5a66f38f1
Fix tooltip position in token list 2016-06-17 15:11:31 +02:00
Sergio Bertolín 491e2654eb Added test with new endpoint (#23934)
* Added test with new endpoint

* Moved all scenarios using new dav endpoint to a new feature file

* Removed extra slash in welcome.txt

* some fixes

* Incorrect user while downloading with range

* Fixed Content-disposition
2016-06-17 14:10:43 +02:00
Thomas Müller bac96e7ffc
Wait for port being accessible in addition to the notify socket 2016-06-17 13:29:24 +02:00
Thomas Müller 5d1ef68cf0
Give mysql docker more time to start up 2016-06-17 13:29:24 +02:00
Vincent Petry 85d9e58637 Merge pull request #25153 from owncloud/fix-problem-added-in-25023
Changed global variable to local
2016-06-17 13:28:34 +02:00
Jörn Friedrich Dreyer 66560b8ed9 Capped cache for user config 2016-06-17 12:58:55 +02:00
Christoph Wurst 5a8cfab68f
throw PasswordLoginForbidden on DAV 2016-06-17 11:30:24 +02:00
Vincent Petry a636078e6c
Make getShareFolder use given view instead of static FS 2016-06-17 11:11:59 +02:00
Vincent Petry 73e284e1e1
Use getLazyRootFolder from RemoveRootShares repair step
This prevents the command registration to setup the FS too early when
FS-related apps might need upgrading.
2016-06-17 11:09:12 +02:00
Christoph Wurst 82b50d126c
add PasswordLoginForbiddenException 2016-06-17 11:02:07 +02:00
Vincent Petry a13caa0ea2
Delay files_sharing's registerMountProviders
This moves registerMountProviders until after the sharing backends were
registered. In some situations registerMountProviders will trigger
listeners which might require filesystem access which itself would
mount shares, which itself requires the sharing backends to be
initialized.
2016-06-17 11:00:09 +02:00
Sergio Bertolín 2fe67ecc3c Changed global variable to local 2016-06-17 07:35:23 +00:00
Jenkins for ownCloud cc532bb14a [tx-robot] updated from transifex 2016-06-17 02:00:01 -04:00
Vincent Petry 1a35dea8a6 Merge pull request #24965 from owncloud/streams-0.4.1
update icewind/streams to 0.4.1
2016-06-16 17:50:39 +02:00
Vincent Petry 82beee57e4 Merge pull request #25132 from owncloud/2fa-load-apps-before-query
load 2FA provider apps before querying classes
2016-06-16 17:04:19 +02:00
Vincent Petry 3917969728 Merge pull request #25146 from owncloud/butonic-patch-1
emit correct signal when disabling an app
2016-06-16 17:03:41 +02:00
Vincent Petry d8c9db6211 Merge pull request #25147 from owncloud/setup-advanced-toggle
Prevent the advanced options toggle in the setup from acting as a link
2016-06-16 17:03:09 +02:00
Thomas Müller 0b7685d326 Move birthday calendar generation to a live migration job (#25135) 2016-06-16 16:14:28 +02:00
Vincent Petry d6cf310dfc Merge pull request #25104 from owncloud/dropbox-catchratelimit
Convert Dropbox Forbidden exception to StorageNotAvailableException
2016-06-16 16:03:20 +02:00
Morris Jobke b5cf83df03 Merge pull request #133 from hailthemelody/master
revise updater.server.url to reflect nextcloud.org URL
2016-06-16 15:48:54 +02:00
Robin Appelman 8485f5bcb1 Prevent the advanced options toggle in the setup from acting as a link 2016-06-16 15:25:56 +02:00
= 60f4f99002 revise updater.server.url to reflect nextcloud.org URL, also it's comment 2016-06-16 09:16:20 -04:00
Vincent Petry 453a038e9c Merge pull request #25142 from owncloud/fix-grouped-inputs
fix grouped input fields, make sure they take precedence
2016-06-16 14:33:01 +02:00
Jörn Friedrich Dreyer 592ac6f7da emit correct signal when disabling an app 2016-06-16 14:17:06 +02:00
Morris Jobke 8b024301e4 Merge pull request #131 from nextcloud/approved-color
Use blue as approved color in app management
2016-06-16 14:13:54 +02:00
Vincent Petry 4d7ca341bc
Update submodule for 3rdparty icewind/streams update 2016-06-16 14:04:12 +02:00
Vincent Petry d7f98fcdef Merge pull request #25103 from owncloud/fed-share-disable-cleanfolder
disable cleanFolder for the federated share storage
2016-06-16 13:21:51 +02:00
Morris Jobke 41e48de84e
Use blue as approved color in app management
* only changing the color - based on #53
2016-06-16 13:09:55 +02:00
Morris Jobke b729703b6c
Re-add labels for password inputs for usability
* ref https://github.com/nextcloud/server/pull/112#discussion_r67245286
2016-06-16 13:07:22 +02:00
Morris Jobke 19f2e78604 Merge pull request #125 from nextcloud/fix-jsunit
Fix failing JS unit tests
2016-06-16 13:06:48 +02:00
Vincent Petry c1729852e6 Merge pull request #24252 from owncloud/integration_test_favorites
Added favorites integration tests
2016-06-16 12:52:51 +02:00
Jan-Christoph Borchardt 44910510f6 fix grouped input fields, make sure they take precedence 2016-06-16 11:43:57 +02:00
Christoph Wurst d36a1fed3e load authentication apps first (#25126)
* load authentication apps first

* load session apps before all other apps
2016-06-16 11:32:28 +02:00
Christoph Wurst 3521f974db
assert app is loaded in unit tests 2016-06-16 11:08:43 +02:00
Morris Jobke 51b067d603
Fix failing JS unit tests
* fixes #124
2016-06-16 11:00:58 +02:00
Christoph Wurst a40d64ff7f
load 2FA provider apps before querying classes 2016-06-16 10:12:16 +02:00
Vincent Petry 9c328de4ab Merge pull request #24415 from owncloud/optimize_sharingdisabled_for_user
Optimize isSharingDisabledForUser
2016-06-16 09:27:48 +02:00