Commit Graph

35292 Commits

Author SHA1 Message Date
Robin Appelman 37eded7e7c
Always unlock node after trying to create a share
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:29 +02:00
Robin Appelman 0d842e0550
optimize Folder::getById to use less queries
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-12 16:12:28 +02:00
blizzz 17fa45a292 Merge pull request #1704 from nextcloud/avatar_dropdown
[us] Show avatar in share drop down
2016-10-12 15:38:38 +02:00
Morris Jobke 38eae3177d
add proper .gitignore rules
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-10-12 13:34:10 +02:00
Roeland Jago Douma 96c2f42ac5
Add .bower.json to version control
We need .bower.json to have bower functioning correctly

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-12 12:03:38 +02:00
Roeland Jago Douma 28708e1b19
[3rdparty] Update to master again 2016-10-12 11:55:56 +02:00
Roeland Jago Douma b2d68c0009 Merge pull request #1713 from nextcloud/rebase_1493
fix issue #1482 - mail invites through v1 webdav
2016-10-12 10:24:44 +02:00
Morris Jobke b300ae517c Merge pull request #1711 from nextcloud/us_move-more-commands-to-info.xml
[oc] move more commands to info.xml
2016-10-12 10:04:18 +02:00
Morris Jobke 657f1af263 Merge pull request #1712 from nextcloud/us_tear_down_fs_between_cron
[master] Tear down FS between cron jobs (#26223)
2016-10-12 10:00:45 +02:00
Claudemir Todo Bom 5b7f272fd4
fix issue #1482 - mail invites through v1 webdav
Signed-off-by: Claudemir Todo Bom <claudemir@todobom.com>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-12 09:13:55 +02:00
Roeland Jago Douma 1992d4be48 Merge pull request #1693 from nextcloud/fix-authors-with-mail-and-homepage
Fix authors with mail and homepage
2016-10-12 09:01:28 +02:00
Vincent Petry 5eb01b01a9
[master] Tear down FS between cron jobs (#26223)
Because some cron jobs do not always properly clean up their FS usage
and others might not clean up before setting up the FS, this could
cause potential side effects.

To make sure we exclude side effects, we tear down the FS between cron
jobs.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-12 08:37:17 +02:00
Roeland Jago Douma 0c574569a4
Readd Notify command
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-12 08:04:49 +02:00
Thomas Müller 8628d57b2c
Move console command registration to info.xml for encryption as well as files_external
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-12 08:04:15 +02:00
Nextcloud bot c2be9cb605
[tx-robot] updated from transifex 2016-10-12 00:08:16 +00:00
Joas Schilling 8a700d7b44 Merge pull request #1705 from nextcloud/us_register-commands-in-info.xml
[oc] Register commands in info.xml
2016-10-11 22:03:01 +02:00
Morris Jobke bf56b8c620 Merge pull request #1702 from nextcloud/fix_tooltip_nc
Use Nextcloud in share tooltip
2016-10-11 20:27:31 +02:00
Roeland Jago Douma 7eba1d806b
Add tests for commands in info.xml
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-11 19:48:31 +02:00
Thomas Müller c5ca71ee82
[9.2] Register commands in info.xml (#26248)
* Use DI to load console commands from the apps - class name to be defined in the info.xml

* Load commands from info.xml

* Fix unit test

* Allow Di magic for IMountManager

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-11 19:48:26 +02:00
Morris Jobke 675230f86d Merge pull request #1407 from nextcloud/multiline_comments
Bring back multiline comments
2016-10-11 16:17:51 +02:00
Thomas Müller e6b51cb54c
[9.2] Show avatar in share drop down (#25976)
* Show avatar in share drop down

* Fix share autocomplete vertical align with avatar

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-11 15:53:27 +02:00
Morris Jobke 9785343d6a Merge pull request #1682 from nextcloud/bump_doctrine
Bump doctrine
2016-10-11 15:40:29 +02:00
skjnldsv 1930aa3102
Fix bold no results search text
Fix wording
2016-10-11 15:06:25 +02:00
Roeland Jago Douma 09eac6b96b
Use Nextcloud in share tooltip
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-11 14:53:40 +02:00
Jan-Christoph Borchardt ee231759e5 update styles of log in
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-10-11 13:58:10 +02:00
Arthur Schiwon e378cadb56
tidy up adding user to list a little bit
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-10-11 12:41:19 +02:00
skjnldsv dcddd4b9d5 fix textarea submit 2016-10-11 12:33:20 +02:00
Thomas Müller b1641cc113
Fix QueryBuilderTests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-11 12:30:46 +02:00
Roeland Jago Douma fe43b30261
[3rdparty] Bump doctrine
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-11 12:30:41 +02:00
Robin Appelman 90db361827
Add test to ensure token times are updated
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-11 11:06:24 +02:00
Robin Appelman 25ed6714c7
dont update the auth token twice
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-10-11 11:05:25 +02:00
Joas Schilling d511acdf66
Better search functionality
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-11 10:35:02 +02:00
Joas Schilling b1314942d7
Fix authors that have a mail or homepage
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-11 10:23:45 +02:00
Nextcloud bot cc4b51490e
[tx-robot] updated from transifex 2016-10-11 00:06:54 +00:00
Morris Jobke 49ffad8df1 Merge pull request #1677 from nextcloud/cleanup-tests
Cleanup test case
2016-10-10 23:45:54 +02:00
Roeland Jago Douma a81d045ef0 Merge pull request #1683 from nextcloud/issue-1437-installing-app-with-code-checker
Add app name to the call
2016-10-10 22:15:28 +02:00
Roeland Jago Douma 3c173378e8
Fix typehint
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-10 22:13:51 +02:00
Thomas Müller 2806a4bca7
Cleanup test case
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-10-10 22:13:47 +02:00
Roeland Jago Douma 1f0bc6936e Merge pull request #1679 from nextcloud/downstream-26282
Improve user list rendering perf by not resorting after every add (#2…
2016-10-10 22:10:46 +02:00
Roeland Jago Douma ada4d6cafc Merge pull request #1680 from nextcloud/downstream-26308
Remove PNG fallbacks from files app
2016-10-10 22:09:48 +02:00
Lukas Reschke d99ab1b038 Merge pull request #1675 from nextcloud/remove-unneeded-variable
remove unneeded variable & proper element creation
2016-10-10 20:28:30 +02:00
Morris Jobke f3fd0f4a62 Merge pull request #1674 from nextcloud/downstream-26183
Added test for 26182
2016-10-10 17:05:07 +02:00
Joas Schilling 356ac5d42f
Add app name to the call
Regression from 69b063f4c6

Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-10 16:34:14 +02:00
Morris Jobke 2c6913ff9f Merge pull request #1668 from nextcloud/user_ldap_use_appconfig
Do not query data that is already in the appconfig
2016-10-10 15:37:44 +02:00
Morris Jobke 75f23d97f6 Merge pull request #1673 from nextcloud/php7.1-rc3
Bump 7.1 CI to RC3
2016-10-10 15:32:29 +02:00
Roeland Jago Douma ad1eb8bd76 Merge pull request #1114 from nextcloud/display_all_reshares
Display link reshares
2016-10-10 15:27:00 +02:00
Morris Jobke 0497affc46
fix drag and drop icon for files app
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-10-10 15:09:15 +02:00
Vincent Petry db472b20cc
Remove PNG fallbacks from files app (#26308) 2016-10-10 15:08:40 +02:00
Vincent Petry e3717fd466
Improve user list rendering perf by not resorting after every add (#26282)
The call to UserList.add() was wrong and was passing "user.lastLogin"
as the sort argument which would cause the list to be resorted over and
over again for every added item after loading the next page of users.
2016-10-10 14:51:13 +02:00
Morris Jobke 5158328190
remove unneeded variable & proper element creation
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-10-10 14:06:43 +02:00