 Roeland Jago DoumaandGitHub
|
040507fce6
|
Merge pull request #135 from nextcloud/oc_up
Merge upstream changes
|
2018-01-25 20:31:35 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
84b26e0d4d
|
Merge pull request #133 from nextcloud/fix-notification-dismiss-button
Uses QString::number to get a string equivalent of the notification_id number
|
2018-01-24 19:29:21 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
4e7c033ae5
|
Merge pull request #121 from nextcloud/removes-logout-login-all-accounts
Removes 'Log in to all accounts' and 'Log out to all accounts' from the primary client menu.
|
2018-01-16 09:20:47 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
8c178bd035
|
Merge pull request #95 from nextcloud/fix-libcloudproviders-conditions
Fix build on windows
|
2017-12-15 12:58:13 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
ac524d8e85
|
Merge pull request #92 from nextcloud/drone_up
Bump drone images
|
2017-12-14 14:54:46 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
de4492a2fd
|
Merge pull request #55 from nextcloud/libcloudproviders-integration
Integrate libcloudproviders support
|
2017-12-14 11:50:43 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
09fa5966da
|
Merge pull request #90 from nextcloud/oc_up
Merge upstream
|
2017-12-14 11:18:54 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
18b456ea2c
|
Merge pull request #77 from nextcloud/bump_drone
Bump drone images to contain WebEngine
|
2017-11-29 12:51:59 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
8c411b32f7
|
Merge pull request #67 from edent/patch-3
Update ownCloud references to NextCloud
|
2017-11-27 20:40:01 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
ccd050455a
|
Merge pull request #62 from bceverly/master
Added build support for FreeBSD
|
2017-11-27 20:39:19 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
0ee0243595
|
Merge pull request #65 from edent/patch-2
Typo in documentation
|
2017-11-25 15:55:41 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
b6e986bb1b
|
Merge pull request #64 from edent/patch-1
Typo
|
2017-11-25 15:55:14 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
84a093e450
|
Merge pull request #53 from nextcloud/build_appimage
Automatically start building AppImages on PR's
|
2017-11-21 14:27:53 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
e7b7b8923f
|
Merge pull request #52 from nextcloud/single_drone
No double building on PR's
|
2017-11-21 10:18:01 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
407d71b305
|
Merge pull request #50 from nextcloud/correct_app_password_link
Have correct app password link
|
2017-11-21 09:48:01 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
d63e18aa9d
|
Merge pull request #51 from nextcloud/no_jenkins
We don't use Jenkins
|
2017-11-21 09:38:37 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
2236d05d25
|
Merge pull request #49 from nextcloud/nc_theme
Nextcloud theme
|
2017-11-20 16:47:31 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
b835bdc55b
|
Merge pull request #48 from nextcloud/oc_master
Bump to oc master
|
2017-11-20 13:43:34 +01:00 |
|
|
Roeland Jago DoumaandGitHub
|
f9b1c724d6
|
Merge pull request #19 from nextcloud/no_5.6_drone
Our 5.6 container is to old. Lets focus on the others for now
|
2017-10-18 21:29:47 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
f56e1d167d
|
Merge pull request #18 from nextcloud/up_mas
Update to oC master
|
2017-10-18 21:13:24 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
9eabd2a32a
|
Merge pull request #6 from nextcloud/mergeWithOrigin
Update master from current owncloud master
|
2017-10-09 08:50:13 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
cba78eb11f
|
Merge pull request #2 from nextcloud/update-readme
Update README
|
2017-09-27 14:03:23 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
cacba220f9
|
Merge pull request #48 from nextcloud-gmbh/master-oc
Bump to oc master
|
2017-08-25 15:06:26 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
63d99f3e30
|
Merge pull request #47 from nextcloud-gmbh/drone_qt5.9
Add Qt5.9 to drone
|
2017-08-05 21:15:30 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
993e1eb89c
|
Merge pull request #46 from nextcloud-gmbh/drone_57_58
Add qt5.7 and qt5.8 CI tests
|
2017-08-05 14:37:26 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
ceccc661f1
|
Merge pull request #43 from nextcloud-gmbh/drone
Get drone up and running
|
2017-08-04 10:55:06 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
d810c13304
|
Merge pull request #27 from nextcloud-gmbh/wording-fix
Change wording from synchronizing to synchronized
|
2017-06-29 16:06:07 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
e240904a32
|
Merge pull request #33 from nextcloud-gmbh/update_doc
Point to NC doc repo
|
2017-06-28 16:44:31 +02:00 |
|
|
Roeland Jago DoumaandGitHub
|
501394ec6f
|
Merge pull request #32 from nextcloud-gmbh/oc_master
Oc master
|
2017-06-28 13:24:24 +02:00 |
|
|
Roeland DoumaandMarkus Goetz
|
31c13f74fb
|
Add spinner during sharee search (#4764)
Fixed #4740
When searching for sharees we should display a loading spinner.
|
2016-04-29 14:11:27 +02:00 |
|
|
Roeland Douma
|
7d285d0225
|
Merge pull request #4717 from owncloud/fix_webdav_property
Only 1 : between namespace and property
|
2016-04-22 14:40:55 +02:00 |
|
|
Roeland Douma
|
33459b48c8
|
Merge pull request #4700 from owncloud/fix_4409
Use expireDate if returned by the OCS Share API
|
2016-04-19 13:14:04 +02:00 |
|
|
Roeland Douma
|
9f30e83413
|
Merge pull request #4687 from owncloud/fix_share-permissions-namespace
The share-permissions namespace was moved
|
2016-04-18 21:29:26 +02:00 |
|
|
Roeland Douma
|
d4848880e1
|
Merge pull request #4553 from owncloud/add_spinner
Add spinner to show we are creating the share
|
2016-03-09 09:39:48 +01:00 |
|
|
Roeland Douma
|
b0db709960
|
Merge pull request #4501 from owncloud/fix_4481
Do not send reshare permissions when creating a federated share
|
2016-03-01 17:03:00 +01:00 |
|
|
Roeland Douma
|
216956da4a
|
Merge pull request #4493 from owncloud/fix_4185
Disable sharing dialog if account state is not connected
|
2016-03-01 16:59:40 +01:00 |
|
|
Roeland Douma
|
8877f04835
|
Merge pull request #4497 from owncloud/fix_4469
Lock the sharee input when sharing
|
2016-03-01 15:40:29 +01:00 |
|
|
Roeland Douma
|
f24fa46789
|
Merge pull request #4496 from owncloud/fix_4325
Add theming options control sharing operations
|
2016-03-01 15:33:04 +01:00 |
|
|
Roeland Douma
|
4cb9d6763b
|
Merge pull request #4213 from owncloud/fix-share-dialog-displaynames-2.1
show displaynames of users in share dialog instead of userid
|
2015-11-27 15:37:54 +01:00 |
|
|
Roeland Douma
|
f1435c86ed
|
Merge pull request #4199 from owncloud/permission_dropdown
[Sharing] Permissions now in dropdown menu
|
2015-11-25 14:04:39 +01:00 |
|
|
Roeland Douma
|
786b602c26
|
Merge pull request #4133 from owncloud/sharedialog_uit_improvements
[Sharedialog] Fix UI stuff
|
2015-11-16 13:36:00 +01:00 |
|
|
Roeland Douma
|
914a942e33
|
Merge pull request #4055 from owncloud/user_group_sharing
User group sharing
|
2015-11-06 09:35:42 +01:00 |
|
|
Roeland Douma
|
d38b190317
|
Merge pull request #4033 from owncloud/share_object
Add share manager and the share objects
|
2015-10-30 11:01:03 +01:00 |
|
|
Roeland Douma
|
ec351e00ad
|
Merge pull request #3773 from owncloud/split_sharedialog
Split sharedialog code
|
2015-10-21 16:55:59 +02:00 |
|
|
Roeland Douma
|
df2418d9c5
|
Merge pull request #3661 from rullzer/public_upload
Allow setting of public upload on link shares
|
2015-10-14 15:34:25 +02:00 |
|
|
Roeland Douma
|
a752eadd0f
|
Merge pull request #3923 from owncloud/check_shareapi_available
Provide information about share availablity for files
|
2015-10-14 12:38:03 +02:00 |
|
|
Roeland Douma
|
bc542a4b80
|
Merge pull request #3426 from rullzer/thumbnail
Sharedialog show thumbnail of file (if available)
|
2015-07-17 08:58:06 +02:00 |
|
|
Roeland Douma
|
3344249297
|
Merge pull request #3425 from rullzer/sharedialog_wait_for_con
Wait until we retrieved shares before showing checkbox
|
2015-07-15 14:38:38 +02:00 |
|