summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-01-2862-64/+126
* Merge pull request #2822 from nextcloud/add-navigation-via-info.xmlMorris Jobke2017-01-273-12/+15
|\
| * Force to specify the nameJoas Schilling2017-01-271-0/+1
| * remove unused parameters and add viewBoxMorris Jobke2017-01-021-1/+1
| * Add navigation via info.xml (#26785)Thomas Müller2016-12-223-12/+14
* | [tx-robot] updated from transifexNextcloud bot2017-01-2718-4/+56
* | Merge pull request #3275 from nextcloud/fix/2787/busy_also_for_creator_bugMorris Jobke2017-01-262-6/+10
|\ \
| * | fix shared-as-busy events for ownerGeorg Ehrke2017-01-262-6/+10
* | | Merge pull request #3272 from nextcloud/fix_user_controllerLukas Reschke2017-01-262-36/+83
|\ \ \
| * | | make sure that 'getCurrentUser' gets an array in order to manipulate the data...Bjoern Schiessle2017-01-262-36/+83
| |/ /
* | | Merge pull request #3160 from nextcloud/streams52Roeland Jago Douma2017-01-2610-57/+135
|\ \ \
| * | | update icewind/streams to 0.5.2Robin Appelman2017-01-2610-57/+135
| |/ /
* | | Merge pull request #3265 from nextcloud/brute-force-protection-public-link-authLukas Reschke2017-01-261-0/+1
|\ \ \ | |/ / |/| |
| * | add brute force protection for public link authenticationBjoern Schiessle2017-01-251-0/+1
* | | Merge pull request #3264 from nextcloud/ldap-deny-long-dnsMorris Jobke2017-01-263-1/+16
|\ \ \
| * | | Gracefully deny users or groups with too long DNsArthur Schiwon2017-01-253-1/+16
* | | | Merge pull request #3162 from nextcloud/ldap-ocsMorris Jobke2017-01-255-19/+369
|\ \ \ \
| * | | | fix deletion for configIDs < s10Arthur Schiwon2017-01-201-14/+12
| * | | | LDAP PUT command now supports setting multiple keys at onceArthur Schiwon2017-01-201-14/+16
| * | | | LDAP OCS Api for show configArthur Schiwon2017-01-192-0/+95
| * | | | test against OCS v2 insteadArthur Schiwon2017-01-191-12/+4
| * | | | add LDAP OCS Api for modifying a configurationArthur Schiwon2017-01-192-5/+65
| * | | | fix and extend behat testsArthur Schiwon2017-01-191-2/+2
| * | | | LDAP OCS Api for delete configArthur Schiwon2017-01-182-0/+52
| * | | | LDAP OCS Api for create configArthur Schiwon2017-01-185-19/+170
* | | | | [tx-robot] updated from transifexNextcloud bot2017-01-2610-24/+44
* | | | | Merge pull request #3244 from nextcloud/settings-iconMorris Jobke2017-01-254-2/+11
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix testsJoas Schilling2017-01-251-1/+1
| * | | | add icon for encryption settings on personal pageMorris Jobke2017-01-241-0/+5
| * | | | Add icon to admin page sidebar for LDAPMorris Jobke2017-01-242-1/+5
* | | | | Merge pull request #3232 from nextcloud/add-profile-data-to-provisioning-apiBjörn Schießle2017-01-253-6/+177
|\ \ \ \ \
| * | | | | unify endpoints form core and the the provisioning apiBjoern Schiessle2017-01-253-2/+112
| * | | | | add data from the users profile to the provisioning apiBjoern Schiessle2017-01-242-4/+65
* | | | | | Merge pull request #3231 from nextcloud/allow-editing-public-linksBjörn Schießle2017-01-251-0/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | allow editing single files shared as public linkBjoern Schiessle2017-01-241-0/+1
| |/ / / /
* | / / / [tx-robot] updated from transifexNextcloud bot2017-01-2520-40/+100
| |/ / / |/| | |
* | | | Merge pull request #3151 from nextcloud/navigation-iconsMorris Jobke2017-01-249-16/+111
|\ \ \ \
| * | | | fix test mocksMorris Jobke2017-01-201-0/+5
| * | | | Fix app section testsJoas Schilling2017-01-192-4/+32
| * | | | Add the icons for shipped appsJoas Schilling2017-01-196-12/+74
* | | | | [tx-robot] updated from transifexNextcloud bot2017-01-244-34/+34
* | | | | Merge pull request #3209 from nextcloud/fix-theming-typoMorris Jobke2017-01-231-1/+1
|\ \ \ \ \
| * | | | | Fix typo in theming descriptionJoas Schilling2017-01-231-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #3157 from nextcloud/fcloseafterkillMorris Jobke2017-01-232-0/+2
|\ \ \ \ \
| * | | | | Prevent PHP request to get killed when using fclose callback (#26775)Vincent Petry2017-01-232-0/+2
* | | | | | Merge pull request #3220 from nextcloud/direct-link-open-sidebarMorris Jobke2017-01-231-0/+5
|\ \ \ \ \ \
| * | | | | | open the sidebar when opening a permalinkRobin Appelman2017-01-231-0/+5
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #2924 from nextcloud/flexbox-headerMorris Jobke2017-01-232-32/+30
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | fix public sharing buttonsChristoph Wurst2017-01-231-2/+5
| * | | | | fix log and app nameChristoph Wurst2017-01-231-5/+4