| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #226 from nextcloud/master-upstream-sync | Lukas Reschke | 2016-06-26 | 142 | -345/+484 |
| |\ | | | | | [Master] upstream sync | ||||
| | * | Merge remote-tracking branch 'upstream/master' into master-upstream-sync | Lukas Reschke | 2016-06-26 | 142 | -345/+484 |
| | |\ | |||||
| | | * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-26 | 4 | -0/+48 |
| | | | | |||||
| | | * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-25 | 2 | -0/+10 |
| | | | | |||||
| | | * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-24 | 74 | -0/+156 |
| | | | | |||||
| | | * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-23 | 132 | -270/+166 |
| | | | | |||||
| | | * | Merge pull request #25134 from owncloud/app-passwords | Vincent Petry | 2016-06-22 | 4 | -36/+36 |
| | | |\ | | | | | | | | | app passwords/device tokens wording | ||||
| | | | * | use theme name instead of hard-coded 'ownCloud' | Christoph Wurst | 2016-06-21 | 1 | -1/+1 |
| | | | | | |||||
| | | | * | fix tranlations | Christoph Wurst | 2016-06-21 | 1 | -3/+3 |
| | | | | | |||||
| | | | * | app passwords/device tokens wording | Christoph Wurst | 2016-06-21 | 4 | -36/+36 |
| | | | | | |||||
| | | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-22 | 4 | -6/+20 |
| | | |/ | |||||
| | | * | redirect to new login route (#25099) | Christoph Wurst | 2016-06-21 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | | | | * redirect to new login route * encode anchor in url and restore it client-side | ||||
| | | * | Merge pull request #25196 from owncloud/update-session-token-password | Christoph Wurst | 2016-06-21 | 1 | -0/+1 |
| | | |\ | | | | | | | | | update session token password on user password change | ||||
| | | | * | pass new password instead of username | Christoph Wurst | 2016-06-21 | 1 | -1/+1 |
| | | | | | |||||
| | | | * | update session token password on user password change | Christoph Wurst | 2016-06-21 | 1 | -0/+1 |
| | | | | | |||||
| | | * | | Merge pull request #25042 from owncloud/session-settings-ellipsis | Vincent Petry | 2016-06-21 | 3 | -33/+36 |
| | | |\ \ | | | |/ | | |/| | add overflow ellipsis to session and device tokens list | ||||
| | | | * | Fix tooltip position in token list | Vincent Petry | 2016-06-17 | 1 | -6/+4 |
| | | | | | |||||
| | | | * | rearrange personal settings sections | Christoph Wurst | 2016-06-10 | 1 | -28/+28 |
| | | | | | |||||
| | | | * | add tooltip to token names | Christoph Wurst | 2016-06-10 | 1 | -1/+2 |
| | | | | | |||||
| | | | * | add overflow ellipsis to session and device tokens list | Christoph Wurst | 2016-06-10 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | select css changes in setting/admin | Vincent Chan | 2016-06-23 | 1 | -0/+9 |
| |/ / / | |||||
| * | | | Merge remote-tracking branch 'upstream/master' into master-sync-upstream | Lukas Reschke | 2016-06-21 | 22 | -2/+110 |
| |\| | | |||||
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-21 | 2 | -0/+2 |
| | | | | |||||
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-20 | 2 | -0/+36 |
| | | | | |||||
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-17 | 2 | -0/+26 |
| | | | | |||||
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-16 | 2 | -0/+2 |
| | | | | |||||
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-15 | 2 | -0/+12 |
| | | | | |||||
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-14 | 12 | -2/+32 |
| | | | | |||||
| * | | | Merge pull request #122 from nextcloud/readd-labels-for-usability | Morris Jobke | 2016-06-20 | 1 | -0/+2 |
| |\ \ \ | | | | | | | | | Re-add labels for password inputs for usability | ||||
| | * | | | Re-add labels for password inputs for usability | Morris Jobke | 2016-06-16 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | * ref https://github.com/nextcloud/server/pull/112#discussion_r67245286 | ||||
| * | | | | fix more strings | Morris Jobke | 2016-06-20 | 5 | -11/+11 |
| | | | | | |||||
| * | | | | fix translations | Morris Jobke | 2016-06-20 | 60 | -60/+60 |
| | | | | | |||||
| * | | | | rename owncloud to nextcloud in Official apps button popup | Timo Witte | 2016-06-20 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Use blue as approved color in app management | Morris Jobke | 2016-06-16 | 1 | -1/+1 |
| |/ / / | | | | | | | | | | * only changing the color - based on #53 | ||||
| * | | | Merge pull request #112 from nextcloud/drop-useless-ie8-stuff | blizzz | 2016-06-15 | 2 | -14/+0 |
| |\ \ \ | | | | | | | | | Drop useless IE8 rules | ||||
| | * | | | Drop useless IE8 rules | Morris Jobke | 2016-06-15 | 2 | -14/+0 |
| | | | | | |||||
| * | | | | fix strengthify in personal settings | Morris Jobke | 2016-06-15 | 3 | -4/+4 |
| |/ / / | |||||
| * | | | Merge branch 'master' of https://github.com/owncloud/core into downstream-160614 | Arthur Schiwon | 2016-06-14 | 36 | -0/+42 |
| |\| | | |||||
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-13 | 36 | -0/+42 |
| | | | | |||||
| * | | | Merge branch 'master' of https://github.com/owncloud/core into downstream-160611 | Arthur Schiwon | 2016-06-11 | 3 | -0/+18 |
| |\| | | |||||
| | * | | Add developer documentation, website and bug to the applist (#25041) | Joas Schilling | 2016-06-10 | 1 | -0/+14 |
| | |/ | |||||
| | * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-10 | 2 | -0/+4 |
| | | | |||||
| * | | Add user ID to log entries in admin page | Lukas Reschke | 2016-06-10 | 2 | -0/+6 |
| | | | |||||
| * | | Downstream 2016-06-09 | Arthur Schiwon | 2016-06-09 | 6 | -1/+143 |
| |\| | | | | | | | Merge branch 'master' of https://github.com/owncloud/core into downstream-160609 | ||||
| | * | Merge pull request #25014 from owncloud/admin-datadircheck-fix | Vincent Petry | 2016-06-09 | 1 | -0/+4 |
| | |\ | | | | | | | Use temporary htaccesstest.txt for data dir security check | ||||
| | | * | Use temporary htaccesstest.txt for data dir security check | Vincent Petry | 2016-06-07 | 1 | -0/+4 |
| | | | | |||||
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-09 | 4 | -0/+138 |
| | | | | |||||
| | * | | decrease initial users to load to 50 | Jörn Friedrich Dreyer | 2016-06-07 | 1 | -1/+1 |
| | |/ | | | | | | | Prevents timeouts on the initial loading of users. proper fix will be in https://github.com/owncloud/core/pull/10994 Workaround for https://github.com/owncloud/core/issues/24734 | ||||
| * | | Revert "Downstream 2016-06-08" | blizzz | 2016-06-09 | 1 | -1/+1 |
| | | | |||||
| * | | decrease initial users to load to 50 | Jörn Friedrich Dreyer | 2016-06-09 | 1 | -1/+1 |
| | | | | | | | | | Prevents timeouts on the initial loading of users. proper fix will be in https://github.com/owncloud/core/pull/10994 Workaround for https://github.com/owncloud/core/issues/24734 | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |