aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-06-0266-80/+336
|
* [tx-robot] updated from transifexNextcloud bot2017-06-0180-108/+212
|
* Merge pull request #5104 from nextcloud/ldap-attempt-reconnectblizzz2017-06-011-16/+68
|\ | | | | Contd: Add layer on top of LDAP methods to catch server disconnects and attempt re-connection
| * fix pagingArthur Schiwon2017-05-261-3/+4
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * make sure used ldap connection resource is always up to dateArthur Schiwon2017-05-251-6/+8
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * moved to something a little less invasive. back to passing CR around.bline2017-05-251-36/+40
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * special case for controlPagedResultResponse. It would be nice if there was a ↵bline2017-05-251-33/+78
| | | | | | | | | | | | generic way to pass by reference with call_user_func_array.. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #5160 from nextcloud/comradekingu-patch-1Morris Jobke2017-05-311-2/+2
|\ \ | | | | | | no "mail" or mid sentence "E-mail"
| * | no "mail" or mid sentence "E-mail"comradekingu2017-05-291-2/+2
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-05-3122-102/+108
| | |
* | | [tx-robot] updated from transifexNextcloud bot2017-05-3032-144/+680
|/ /
* | [tx-robot] updated from transifexNextcloud bot2017-05-2926-116/+320
| |
* | [tx-robot] updated from transifexNextcloud bot2017-05-288-8/+8
| |
* | [tx-robot] updated from transifexNextcloud bot2017-05-278-0/+10
| |
* | [tx-robot] updated from transifexNextcloud bot2017-05-2636-0/+68
| |
* | [tx-robot] updated from transifexNextcloud bot2017-05-2564-234/+950
| |
* | [tx-robot] updated from transifexNextcloud bot2017-05-2436-10/+128
| |
* | Merge pull request #5004 from ↵Roeland Jago Douma2017-05-232-2/+2
|\ \ | | | | | | | | | | | | nextcloud/bugfix/fix_replacing_4mbunicode_for_calendar_properties_table fix replacing of 4MB Unicode Chars in cal props table
| * | fix replacing of 4MB Unicode Chars in cal props tableGeorg Ehrke2017-05-212-2/+2
| | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | Merge pull request #5042 from nextcloud/external-get-for-group-sql-typeRoeland Jago Douma2017-05-231-1/+1
|\ \ \ | | | | | | | | use the correct param type when getting external storages for groups
| * | | use the correct param type when getting external storages for groupsRobin Appelman2017-05-221-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #4969 from ↵Roeland Jago Douma2017-05-231-0/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/fix-broken-activity-avatars-with-external-users Fix username and avatar for external users
| * | | | Fix username and avatar for external usersJoas Schilling2017-05-191-0/+26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2017-05-2388-80/+122
| |/ / / |/| | |
* | | | Merge pull request #5010 from ↵Joas Schilling2017-05-221-6/+6
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | nextcloud/fix-starting-lower-case-letter-in-tooltip-of-theming-app Fix starting lower case letter in tooltip of Theming app
| * | | Fix starting lower case letter in tooltip of Theming appDaniel Calviño Sánchez2017-05-201-6/+6
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | Merge pull request #5023 from nextcloud/version_bumpJoas Schilling2017-05-2222-52/+65
|\ \ \ \ | | | | | | | | | | We are working on 13 now!
| * | | | Split multi-author entriesJoas Schilling2017-05-229-9/+19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Bump app versions as wellJoas Schilling2017-05-2222-22/+22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Adjust version requirementJoas Schilling2017-05-2222-21/+24
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #5000 from nextcloud/phil-davis-filename-input-tooltipMorris Jobke2017-05-222-0/+3
|\ \ \ \ \ | |/ / / / |/| | | | Make rename file tooltip error text change
| * | | | Make new file file tooltip error text changePhil Davis2017-05-211-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Phil Davis <phil@jankaritech.com>
| * | | | Make rename file tooltip error text changePhil Davis2017-05-211-0/+2
| |/ / / | | | | | | | | | | | | Signed-off-by: Phil Davis <phil@jankaritech.com>
* | | / [tx-robot] updated from transifexNextcloud bot2017-05-2216-24/+32
| |_|/ |/| |
* | | [tx-robot] updated from transifexNextcloud bot2017-05-2110-0/+76
| | |
* | | fix for sharingDaniel Hansson2017-05-201-0/+1
|/ / | | | | | | Signed-off-by: Daniel Hansson <daniel@techandme.se>
* | [tx-robot] updated from transifexNextcloud bot2017-05-2040-2/+384
| |
* | Merge pull request #4910 from nextcloud/make-the-logo-smaller-creamLukas Reschke2017-05-193-7/+15
|\ \ | |/ |/| Fix logo being too big on log in page, fix #4585
| * Scale logo only for custom onesJulius Härtl2017-05-193-5/+14
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * Fix logo being too big on log in page, fix #4585Jan-Christoph Borchardt2017-05-161-2/+1
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | Merge pull request #4951 from nextcloud/transifex-oauth2Morris Jobke2017-05-181-0/+0
|\ \ | | | | | | Add oauth2 to transifex
| * | Add oauth2 to transifexMorris Jobke2017-05-181-0/+0
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | [tx-robot] updated from transifexNextcloud bot2017-05-1962-132/+26
|/ /
* | Merge pull request #4894 from nextcloud/generic-security-activitiesLukas Reschke2017-05-199-505/+2
|\ \ | | | | | | Change 2FA activities to more generic security activities
| * | Fix backup codes activity typeChristoph Wurst2017-05-181-1/+1
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | Publish 2fa backup codes activities to the right streamChristoph Wurst2017-05-181-1/+1
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | Move activities test codeChristoph Wurst2017-05-183-288/+0
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | Change 2FA activities to more generic security activitiesChristoph Wurst2017-05-184-215/+0
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #4704 from nextcloud/add-oauth-code-flow-supportLukas Reschke2017-05-1830-6/+1650
|\ \ \ | | | | | | | | Add oauth code flow support
| * | | Function accepts only integersLukas Reschke2017-05-181-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>