summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-12-118-8/+92
|
* [tx-robot] updated from transifexNextcloud bot2017-12-1016-58/+448
|
* [tx-robot] updated from transifexNextcloud bot2017-12-094-2/+116
|
* Merge pull request #7426 from nextcloud/Abijeet-masterMorris Jobke2017-12-082-2/+6
|\ | | | | Allows adding of hex color to the theme-color
| * Allows adding of hex color to the theme-colorAbijeet2017-12-082-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #7158. Adds a # on the color if missing. Increased maxlength, added hash:true for jscolor, and adding a # if not present on the change event. Since the input element now allows a hex code, changed values to hexcode. In addition, added a function to get RGB array from hex or rgb values. Calling it in both methods and using it to perform comparison. Also changed the way we were determining whether the jscolor component had loaded. Changed the control to use data-jscolor rather than defining opts in the class. Signed-off-by: Abijeet <abijeetpatro@gmail.com>
* | Merge pull request #7433 from ↵Morris Jobke2017-12-081-1/+1
|\ \ | | | | | | | | | | | | nextcloud/fix-constructor-spy-in-unit-test-with-sinon-4.1.3 Fix constructor spy in unit test with Sinon 4.1.3
| * | Fix constructor spy in unit test with Sinon 4.1.3Daniel Calviño Sánchez2017-12-081-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a constructor is spied using Sinon it is wrapped by a proxy function, which calls the original constructor when invoked. When "new Foo()" is executed a "Foo" object is created, "Foo" is invoked with the object as "this", and the object is returned as the result of the whole "new" expression. Before Sinon 4.1.3 the proxy called the original constructor directly using the "thisValue" of the spied call; "thisValue" was the object created by the "new" operator that called the proxy. The proxy assigned "thisValue" to "returnValue", so it was also the value returned by the proxy and, in turn, the value returned by the whole "new" expression. Since Sinon 4.1.3 (see pull request 1626) the proxy calls the original constructor using "new" instead of directly. The "thisValue" created by the outermost "new" (the one that called the proxy) is no longer used by the original constructor; the internal "new" creates a new object, which is the one passed to the original constructor and returned by the internal "new" expression. This object is also the value returned by the proxy ("returnValue") and, in turn, the value returned by the whole outermost "new" expression. Thus, now "returnValue" should be used instead of "thisValue" to get the object created by the spied constructor. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | Merge pull request #7252 from nextcloud/send-comment-on-enterMorris Jobke2017-12-082-12/+92
|\ \ | | | | | | Submit comments with Enter and use Shift+Enter for new lines
| * | Fix Enter sending comment instead of adding autocomplete item to messageDaniel Calviño Sánchez2017-12-072-2/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the autocomplete popover is shown the At.js plugin listens on the message input field for key down events, and when Enter is pressed it adds the selected item to the message. However, as "_onTypeComment" also handles key down events for the message input field, when Enter was pressed the comment was submitted and At.js had no chance to add the item before that happened. Now when Enter is pressed and the autocomplete popover is shown the comment is not submitted, and thus At.js adds the selected item to the message as expected. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Add unit tests for posting comments with enter keyDaniel Calviño Sánchez2017-11-301-0/+28
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Set text only in the message div of the new comment formDaniel Calviño Sánchez2017-11-301-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | When finding ".message" elements on "view.$el" the message area for the new comment form and all the comments were matched. Now the selector was restricted to match only the message area for the new comment form. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Submit comments with Enter and use Shift+Enter for new linesDaniel Calviño Sánchez2017-11-231-2/+3
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | Merge pull request #7321 from nextcloud/ldap-update-loginfilterLukas Reschke2017-12-081-0/+17
|\ \ \ | |_|/ |/| | Update login filter when user filter was newly generated
| * | Update login filter when user filter was newly generatedArthur Schiwon2017-11-281-0/+17
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | [tx-robot] updated from transifexNextcloud bot2017-12-088-12/+84
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-12-078-0/+66
| | |
* | | Merge pull request #6670 from nextcloud/handle-encryption-state-in-web-interfaceTobias Kaminsky2017-12-062-9/+70
|\ \ \ | | | | | | | | Handle encryption state in web interface
| * | | show e2e folder icon on encrypted foldersBjoern Schiessle2017-11-202-1/+30
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | Add data attribute to file list rows telling if the file is encryptedDaniel Calviño Sánchez2017-11-202-7/+37
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | adjust permissions in web view for encrypted foldersBjoern Schiessle2017-11-201-1/+3
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | Merge pull request #7385 from nextcloud/shared-delay-rootMorris Jobke2017-12-061-17/+27
|\ \ \ \ | | | | | | | | | | delay calculating the shared cache root until it's used
| * | | | delay calculating the shared cache root until it's usedRobin Appelman2017-12-041-17/+27
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #7395 from nextcloud/remove-unusedLukas Reschke2017-12-061-3/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove unused variables
| * | | | | Remove unused variablesMorris Jobke2017-12-051-3/+0
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #7348 from nextcloud/filterout_shares_of_nonexisting_usersRoeland Jago Douma2017-12-062-0/+7
|\ \ \ \ \ | | | | | | | | | | | | Check if the owner of a share exists
| * | | | | Fix testsRoeland Jago Douma2017-12-042-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | A failed storage is a not available storageRoeland Jago Douma2017-12-041-0/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have to double check. Since getting the info of the root returns a generic entry. But actually the stroage is not available. Else we get very weird sync and web behavior. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #7387 from nextcloud/swift-retryRoeland Jago Douma2017-12-061-1/+2
|\ \ \ \ \ | | | | | | | | | | | | add retry wrapper when reading files from swift
| * | | | | add retry wrapper when reading files from swiftRobin Appelman2017-12-041-1/+2
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-12-068-6/+22
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2017-12-054-2/+6
|/ / / /
* | | | [tx-robot] updated from transifexNextcloud bot2017-12-044-0/+6
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-12-032-0/+6
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-12-0210-10/+52
| | | |
* | | | check userExists later, saves lookups for appData_INSTANCEID useridsArthur Schiwon2017-12-011-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | [tx-robot] updated from transifexNextcloud bot2017-12-01142-0/+500
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-11-3020-18/+32
| | | |
* | | | Actually set the status so we don't cause another exceptionRoeland Jago Douma2017-11-294-0/+78
| | | | | | | | | | | | | | | | | | | | | | | | * And add tests so I don't mess up again Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #7338 from nextcloud/fix_exception_on_unreachable_serverRoeland Jago Douma2017-11-292-0/+6
|\ \ \ \ | | | | | | | | | | Do not log Exception if a connection error occured
| * | | | Do not log Exception if a connection error occuredRoeland Jago Douma2017-11-292-0/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #7316 from ↵Roeland Jago Douma2017-11-291-3/+3
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | nextcloud/fix-silent-conflicts-due-to-merging-7256-after-7251 Fix silent conflicts due to merging #7256 after #7251
| * | | | Fix silent conflicts due to merging #7256 after #7251Daniel Calviño Sánchez2017-11-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although #7256 was merged cleanly some of the changes really conflicted with those introduced by the last commit of #7251, and this broke the appearance of the author row of comments. This commit fixes those silent conflicts and restores the appearance of the author row. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-11-2912-0/+24
| |_|/ / |/| | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-11-28200-422/+422
|/ / /
* | | Merge pull request #6901 from nextcloud/bugfix/4014/catch_parsing_errorMorris Jobke2017-11-276-5/+44
|\ \ \ | | | | | | | | catch errors when parsing calendar data for calendar query requests
| * | | catch errors when parsing calendar data for calendar query requestsGeorg Ehrke2017-11-276-5/+44
| | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | Merge pull request #7308 from nextcloud/do-not-log-InvalidSyncTokenMorris Jobke2017-11-271-0/+3
|\ \ \ \ | | | | | | | | | | Log InvalidSyncToken on DAV in debug level
| * | | | Log InvalidSyncToken on DAV in debug levelMorris Jobke2017-11-271-0/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #7307 from nextcloud/do-not-log-not-implemented-davLukas Reschke2017-11-271-0/+4
|\ \ \ \ \ | |_|/ / / |/| | | | Log NotImplementedException on DAV in debug level
| * | | | Log NotImplementedException on DAV in debug levelMorris Jobke2017-11-271-0/+4
| |/ / / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-06 20:34:50 +0000