summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2016-07-30104-130/+794
|
* Merge pull request #662 from thelinuxfr/patch-1Julius Härtl2016-07-291-1/+1
|\ | | | | Transifex Owncloud > Nextcloud
| * Transifex Owncloud > NextcloudFrédéric LIETART2016-07-291-1/+1
|/ | | Change transifex link Owncloud > Nextcloud
* Merge pull request #627 from nextcloud/white-app-menuBjörn Schießle2016-07-292-22/+37
|\ | | | | Change app menu to white background with dark icons
| * fix shading of apps icon in app menuJan-Christoph Borchardt2016-07-291-3/+12
| |
| * Move to svg filter on app menu to support IE9+Julius Haertl2016-07-282-11/+12
| |
| * adjust opacity of icons in apps and user menuJan-Christoph Borchardt2016-07-281-8/+8
| |
| * Change app menu to whiteJulius Haertl2016-07-281-9/+14
| |
* | Merge pull request #656 from nextcloud/ocs_controller_csrfRoeland Jago Douma2016-07-292-2/+65
|\ \ | | | | | | Dark hackery to not always disable CSRF for OCS controllers
| * | Dark hackery to not always disable CSRF for OCS controllersRoeland Jago Douma2016-07-292-2/+65
| | |
* | | Merge pull request #625 from nextcloud/video-container-sizeJan-Christoph Borchardt2016-07-291-2/+7
|\ \ \ | | | | | | | | up the minimum size of the public share video a bit, use 16/9 ratio
| * | | up the minimum size of the public share video a bit, use 16/9 ratio, fix #603Jan-Christoph Borchardt2016-07-291-2/+7
| | | |
* | | | Merge pull request #651 from stweil/masterMorris Jobke2016-07-2933-34/+34
|\ \ \ \ | | | | | | | | | | Fix misspelling of database "READ COMMITTED"
| * | | | Fix misspelling of database "READ COMMITTED"Stefan Weil2016-07-2933-34/+34
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Stefan Weil <sw@weilnetz.de>
* | | | | Merge pull request #648 from nextcloud/add-quotaplugin-v2-masterBjörn Schießle2016-07-293-2/+44
|\ \ \ \ \ | |/ / / / |/| | | | [upstream] Adding quota plugin to new dav endpoint
| * | | | Adding quota plugin to new dav endpoint (#25615)Thomas Müller2016-07-293-2/+44
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * Adding quota plugin to new dav endpoint * Added integrated test failing in old endpoint * Added 0B quota test
* | | | Merge pull request #630 from nextcloud/enoch85-patch-1Roeland Jago Douma2016-07-295-23/+22
|\ \ \ \ | |/ / / |/| | | ownCloud -> Nextcloud
| * | | Add some integration test fixesMorris Jobke2016-07-294-22/+21
| | | |
| * | | ownCloud --> Nextcloudenoch852016-07-282-12/+12
| | | |
| * | | ownCloud -> NextcloudDaniel Hansson2016-07-281-1/+1
| | | |
* | | | Merge pull request #556 from nextcloud/nextcloud-version-checkMorris Jobke2016-07-292-3/+27
|\ \ \ \ | | | | | | | | | | Allow apps to check for a given nextcloud version
| * | | | Translate the server version for nextcloudJoas Schilling2016-07-262-3/+27
| | | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2016-07-29120-618/+186
| | | | |
* | | | | Merge pull request #640 from nextcloud/enoch85-patch-2Morris Jobke2016-07-281-3/+3
|\ \ \ \ \ | | | | | | | | | | | | ownCloud -> Nextcloud
| * | | | | ownCloud -> NextcloudDaniel Hansson2016-07-281-3/+3
|/ / / / /
* | | | | Merge pull request #408 from nextcloud/psr4-themingBjörn Schießle2016-07-289-45/+81
|\ \ \ \ \ | | | | | | | | | | | | PSR-4 for the Theming app
| * | | | | Fix testsJoas Schilling2016-07-285-29/+70
| | | | | |
| * | | | | Update routes.phpJoas Schilling2016-07-281-4/+2
| | | | | |
| * | | | | Remove useless checkJoas Schilling2016-07-281-3/+1
| | | | | |
| * | | | | Use the methods on the Response objectJoas Schilling2016-07-281-11/+10
| | | | | |
| * | | | | Use public API preferableJoas Schilling2016-07-281-1/+1
| | | | | |
| * | | | | Move classes to PSR-4Joas Schilling2016-07-286-0/+0
|/ / / / /
* | | | | Merge pull request #636 from nextcloud/theming-fixMorris Jobke2016-07-282-4/+4
|\ \ \ \ \ | | | | | | | | | | | | fix background id selector for the first run wizard
| * | | | | fix background id selector for the first run wizardBjoern Schiessle2016-07-282-4/+4
| | | | | |
* | | | | | Merge pull request #590 from ↵Morris Jobke2016-07-281-2/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/fixing-undefined-OfflineUser-composeAndStoreDisplayName Fix undefined OfflineUser::composeAndStoreDisplayName()
| * | | | | | [stable9.1] Fix undefined OfflineUser::composeAndStoreDisplayName() - fixes ↵Thomas Müller2016-07-271-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | #23248
* | | | | | | Merge pull request #592 from nextcloud/ldap-avoidneedlesssetemailonloginLukas Reschke2016-07-281-1/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Prevent setting email and triggering events at login time (#25553)
| * | | | | | | Prevent setting email and triggering events at login time (#25553)Vincent Petry2016-07-271-1/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever an LDAP user also has an email address defined in LDAP, the LDAP code will try and update the email address of the locally known user. This happens at login time or every time the user's LDAP attributes are processed. There is code listening to the email setting hook which updates the system address book, which also will trigger FS setup due to avatars and other things. This fix only sets the email address when really necessary.
* | | | | | | Merge pull request #632 from nextcloud/vmMorris Jobke2016-07-281-0/+5
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | add info about the Nextcloud VM
| * | | | | | wordingDaniel Hansson2016-07-281-2/+2
| | | | | | |
| * | | | | | add info about the Nextcloud VMDaniel Hansson2016-07-281-0/+5
| | |_|/ / / | |/| | | | | | | | | | It's production ready now.
* | | | | | Merge pull request #583 from nextcloud/issue-577-add-l10nMorris Jobke2016-07-283-14/+26
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Add L10N support
| * | | | | Add L10N supportJoas Schilling2016-07-273-14/+26
| | | | | |
* | | | | | Merge pull request #624 from nextcloud/users-capitalizationWilliam Bargent2016-07-284-11/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix capitalization of text in users management
| * | | | | | fix capitalization of text in users managementJan-Christoph Borchardt2016-07-284-11/+11
| | | | | | |
* | | | | | | Merge pull request #620 from nextcloud/theming-firstrunwizardBjörn Schießle2016-07-282-53/+159
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | apply theme to the firstrunwizard
| * | | | | | fix unit testsBjoern Schiessle2016-07-281-53/+143
| | | | | | |
| * | | | | | re-use background color from theme in the firstrunwizardBjoern Schiessle2016-07-281-0/+9
| | | | | | |
| * | | | | | apply theme to the firstrunwizardBjoern Schiessle2016-07-281-0/+7
|/ / / / / /
* | | | | | Merge pull request #612 from nextcloud/improve-xml-loaded-version-handlingLukas Reschke2016-07-281-2/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | libxml - compare against loaded version