summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Move away from OC_L10NRoeland Jago Douma2016-10-2822-22/+26
* Merge pull request #1888 from nextcloud/downstream-26361Joas Schilling2016-10-2815-121/+292
|\
| * Proper DI of configRoeland Jago Douma2016-10-287-46/+76
| * Use callForSeenUsers for avatar migrationMorris Jobke2016-10-281-24/+22
| * introduce callForSeenUsers and countSeenUsers (#26361)Jörn Friedrich Dreyer2016-10-2810-65/+208
|/
* [tx-robot] updated from transifexNextcloud bot2016-10-28176-362/+738
* Merge pull request #1800 from nextcloud/nextcloud-rich-object-stringsMorris Jobke2016-10-2714-37/+709
|\
| * dump autoloaderMorris Jobke2016-10-242-0/+6
| * Move federated share notifications to ROSJoas Schilling2016-10-203-6/+148
| * Allow rich object subjects for NotificationsJoas Schilling2016-10-204-31/+109
| * Add Rich Object Definitions and a validatorJoas Schilling2016-10-206-0/+446
* | Merge pull request #1933 from spacegaier/patch-1Lukas Reschke2016-10-271-1/+1
|\ \
| * | Updated doc link version in default theme from 9 to 11Philip Allgaier2016-10-271-1/+1
|/ /
* | Merge pull request #1929 from nextcloud/share_email_to_OCSLukas Reschke2016-10-276-195/+0
|\ \
| * | Remove internal share mail functionRoeland Jago Douma2016-10-262-128/+0
| * | Remove notify recipient optionRoeland Jago Douma2016-10-264-67/+0
* | | Merge pull request #1930 from nextcloud/fix_avatars_exifLukas Reschke2016-10-272-0/+28
|\ \ \
| * | | Fix avatar on exif rotated imagesRoeland Jago Douma2016-10-262-0/+28
| |/ /
* / / [tx-robot] updated from transifexNextcloud bot2016-10-2736-44/+456
|/ /
* | Merge pull request #1920 from nextcloud/legacy-pages-should-also-receive-the-...Roeland Jago Douma2016-10-264-4/+18
|\ \
| * | Identify Chromium as ChromeJoas Schilling2016-10-263-3/+17
| * | Add nonce also to legacy CSPLukas Reschke2016-10-261-1/+1
* | | Merge pull request #1925 from nextcloud/issue-1874-allow-users-to-change-thei...Joas Schilling2016-10-261-0/+1
|\ \ \
| * | | Allow users to change their passwords againJoas Schilling2016-10-261-0/+1
* | | | Merge pull request #1738 from nextcloud/comments-provide-displaynames-with-me...Morris Jobke2016-10-2616-185/+574
|\ \ \ \
| * | | | fix JS test and introduce tests for rendering mentions to displaynamesArthur Schiwon2016-10-251-8/+62
| * | | | avoid that all avatars are copied to the author row when editing commentsArthur Schiwon2016-10-211-1/+1
| * | | | add missing methods to test fake managerArthur Schiwon2016-10-201-0/+4
| * | | | consolidate error handlingArthur Schiwon2016-10-191-27/+41
| * | | | fix avatar displaying after submit (either edit or new)Arthur Schiwon2016-10-191-3/+7
| * | | | display avatar (if enabled) alongside displaynamesArthur Schiwon2016-10-192-1/+12
| * | | | fix regexArthur Schiwon2016-10-191-1/+1
| * | | | improve regex, fixes replacements of usernames with same trunkArthur Schiwon2016-10-191-1/+12
| * | | | show displayname not uid in commit mentionsArthur Schiwon2016-10-192-17/+76
| * | | | resolve displayname via manager and registerable resolversArthur Schiwon2016-10-196-4/+198
| * | | | move mention extraction to (I)Comment and report mentions via DAVArthur Schiwon2016-10-197-149/+187
* | | | | Merge pull request #1923 from nextcloud/fix-template-urlMorris Jobke2016-10-261-1/+1
|\ \ \ \ \
| * | | | | … and the raw version of itblizzz2016-10-261-1/+1
| * | | | | Fix issue template urlblizzz2016-10-261-1/+1
|/ / / / /
* | | | | Merge pull request #1907 from nextcloud/downstream-26164Morris Jobke2016-10-263-5/+15
|\ \ \ \ \
| * | | | | Highlight files and update storage stats at end of upload (#26164)Vincent Petry2016-10-253-5/+15
* | | | | | Merge pull request #1921 from nextcloud/ignore-htaccessMorris Jobke2016-10-261-0/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | So no one commits the crappy 403 and 404 anymoreJoas Schilling2016-10-261-0/+1
| |/ / / /
* | | | | Merge pull request #1355 from nextcloud/apps_flexboxMorris Jobke2016-10-261-1/+11
|\ \ \ \ \
| * | | | | Limit to apps list, add proper flex attributesFelix Epp2016-10-251-3/+10
| * | | | | Use flexbox on app pageRoeland Jago Douma2016-09-101-0/+3
* | | | | | Merge pull request #1914 from nextcloud/downstream-26468Morris Jobke2016-10-261-6/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Remove all unneeded set_include_path()Thomas Müller2016-10-251-6/+1
| | |/ / / | |/| | |
* | | | | [tx-robot] updated from transifexNextcloud bot2016-10-26160-372/+250
* | | | | Merge pull request #1917 from nextcloud/ocjs_inlineMorris Jobke2016-10-2615-32/+426
|\ \ \ \ \