summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-08-1560-114/+132
* Merge pull request #6103 from nextcloud/swift-filter-dot-12Robin Appelman2017-08-141-1/+1
|\
| * Filter magic dot object when swift directoryRobin Appelman2017-08-141-1/+1
|/
* [tx-robot] updated from transifexNextcloud bot2017-08-1416-4/+98
* [tx-robot] updated from transifexNextcloud bot2017-08-1316-24/+82
* [tx-robot] updated from transifexNextcloud bot2017-08-1222-14/+150
* [tx-robot] updated from transifexNextcloud bot2017-08-116-18/+580
* Merge pull request #6067 from nextcloud/stable12-5981-fix-preview-of-themingMorris Jobke2017-08-108-33/+314
|\
| * Fix preview of themingDaniel Calviño Sánchez2017-08-101-5/+9
| * Refactor reloadStylesheets to receive absolute URLsDaniel Calviño Sánchez2017-08-101-3/+3
| * Provide "server.css" URL in ThemingController responseDaniel Calviño Sánchez2017-08-102-4/+48
| * Split updateStylesheet tests for success and errorDaniel Calviño Sánchez2017-08-101-17/+51
| * Unify DataResponse format with its uses in the rest of the fileDaniel Calviño Sánchez2017-08-101-6/+9
| * Add acceptance tests for setting the color in the Theming appDaniel Calviño Sánchez2017-08-104-0/+187
| * Add getter for the timeout multiplierDaniel Calviño Sánchez2017-08-101-0/+9
* | Merge pull request #6061 from nextcloud/stable12_6052Morris Jobke2017-08-101-0/+6
|\ \ | |/ |/|
| * Fix copy from jailed storageRoeland Jago Douma2017-08-101-0/+6
|/
* [tx-robot] updated from transifexNextcloud bot2017-08-106-0/+22
* Fix redis-cluster support on droneMorris Jobke2017-08-091-4/+3
* Update syntax to drone 0.8Morris Jobke2017-08-091-2/+4
* [tx-robot] updated from transifexNextcloud bot2017-08-09574-862/+462
* Merge pull request #5978 from nextcloud/12-5908Morris Jobke2017-08-081-0/+4
|\
| * Add css class for toogle preview iconMorris Jobke2017-08-041-0/+4
* | Merge pull request #5979 from nextcloud/12-5738Morris Jobke2017-08-081-3/+3
|\ \
| * | Improve spelling in LDAPAllan Nordhøy2017-08-041-3/+3
| |/
* | Merge pull request #6008 from nextcloud/stable12-5969-fix-vertical-alignment-...Morris Jobke2017-08-081-19/+8
|\ \
| * | Fix code styleDaniel Calviño Sánchez2017-08-071-1/+1
| * | Remove superfluous selector partDaniel Calviño Sánchez2017-08-071-1/+1
| * | Align vertically loading icon and status messageDaniel Calviño Sánchez2017-08-071-6/+6
| * | Do not use the same rules for loading icon than for upload iconDaniel Calviño Sánchez2017-08-071-1/+1
| * | Remove ignored rulesDaniel Calviño Sánchez2017-08-071-11/+0
* | | Merge pull request #5946 from nextcloud/12-5897Morris Jobke2017-08-085-11/+146
|\ \ \
| * | | Disable default activity email for incoming sharesMorris Jobke2017-08-023-3/+3
| * | | Send an email once a file/folder is shared with a userMorris Jobke2017-08-013-9/+144
* | | | Merge pull request #5966 from nextcloud/backport-oracleMorris Jobke2017-08-0819-97/+209
|\ \ \ \
| * | | | Add a method to compare empty strings with an expressionJoas Schilling2017-08-034-1/+64
| * | | | Fix repair step for oracle...Joas Schilling2017-08-031-1/+1
| * | | | Fix last failures with oracleJoas Schilling2017-08-033-5/+12
| * | | | Fix querybuilder and functionbuilder testsJoas Schilling2017-08-032-25/+33
| * | | | Fix ILIKE regex for oracleJoas Schilling2017-08-031-1/+1
| * | | | Fix auth providerJoas Schilling2017-08-031-1/+1
| * | | | Use selectAlias()Joas Schilling2017-08-031-2/+4
| * | | | Can not insert auto increment on oracleJoas Schilling2017-08-035-46/+53
| * | | | Fix missing escape on column and table nameJoas Schilling2017-08-031-1/+1
| * | | | Fix clob comparisonJoas Schilling2017-08-031-1/+1
| * | | | Allow to specify the table space on occJoas Schilling2017-08-031-0/+4
| * | | | Quote aliases as wellJoas Schilling2017-08-032-10/+24
| * | | | Oracle does not support PDO::FETCH_KEY_PAIRJoas Schilling2017-08-031-6/+13
* | | | | Merge pull request #5937 from nextcloud/backend-can-be-wrong---sometimesMorris Jobke2017-08-083-7/+20
|\ \ \ \ \
| * | | | | now, with less CSSMaxence Lange2017-08-011-8/+1