summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8915 from owncloud/MorrisJobke-travisThomas Müller2014-08-072-0/+4
|\
| * Minor fixesMorris Jobke2014-08-051-0/+1
| * Make View->shouldEmitHooks more robustRobin Appelman2014-08-051-0/+3
* | [tx-robot] updated from transifexJenkins for ownCloud2014-08-0715-12/+5
* | typo fix from transifex suggestionVolkan Gezer2014-08-061-2/+2
* | Merge pull request #10144 from owncloud/issue/9972Thomas Müller2014-08-064-4/+4
|\ \
| * | Fix isLoggedIn() check for user '0'Joas Schilling2014-08-042-2/+2
| * | Fix getting group '0' from database backendJoas Schilling2014-08-042-2/+2
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-0612-0/+25
* | | Merge pull request #10191 from owncloud/sharing_rm_trailing_slashMorris Jobke2014-08-051-1/+2
|\ \ \
| * | | remove trailing slash from pathBjoern Schiessle2014-08-051-1/+2
| | |/ | |/|
* | | Merge pull request #9520 from owncloud/theme_urlsBjörn Schießle2014-08-052-13/+57
|\ \ \
| * | | remove escaping because it's unneededMorris Jobke2014-08-051-1/+1
| * | | fix uppercase issueMorris Jobke2014-08-051-4/+4
| * | | Add ability to theme iOS and Android client URLs just like desktop URLs.scolebrook2014-08-052-13/+57
| |/ /
* / / don't display share permission if resharing was disabled by the adminBjoern Schiessle2014-08-052-1/+10
|/ /
* | Merge pull request #10151 from owncloud/issue/9912Morris Jobke2014-08-051-5/+5
|\ \
| * | Increase word wrap limit for emails to 78 charactersJoas Schilling2014-08-041-5/+5
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-0519-38/+0
* | | Merge pull request #10083 from th3fallen/fix-9969-take-twoJoas Schilling2014-08-042-37/+9
|\ \ \
| * | | Removing unnecessary switch statements in fopen methods.Clark Tomlinson2014-07-312-37/+9
* | | | Merge pull request #10138 from owncloud/innodb-repair-non-ocThomas Müller2014-08-041-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Dont touch non-oc tables when doing the InnoDB repair stepRobin Appelman2014-08-041-1/+1
* | | | Merge pull request #10025 from owncloud/l10n-typoThomas Müller2014-08-041-8/+8
|\ \ \ \
| * | | | expire -> expirationVolkan Gezer2014-08-021-6/+6
| * | | | suggestions by deepdiverVolkan Gezer2014-08-011-4/+4
| * | | | typo fix from transifex suggestionVolkan Gezer2014-07-301-2/+2
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-022-2/+11
| |/ / / |/| | |
* | | | fix return documentationJörn Friedrich Dreyer2014-08-011-7/+5
* | | | prevent PHP errors and enhance loggingThomas Müller2014-08-011-1/+5
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-08-011-0/+2
| |/ / |/| |
* | | Merge pull request #10051 from owncloud/preview-empty-textThomas Müller2014-07-315-4/+71
|\ \ \
| * | | Use svg mimeicons for empty text filesRobin Appelman2014-07-305-4/+71
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-07-315-0/+39
* | | | Merge pull request #10044 from owncloud/transparency_fixJan-Christoph Borchardt2014-07-301-0/+8
|\ \ \ \
| * | | | extract transparency fix from #8050Georg Ehrke2014-07-301-0/+8
* | | | | Merge pull request #10029 from owncloud/fix-thirdpartyMorris Jobke2014-07-301-11/+16
|\ \ \ \ \
| * | | | | Replace exit with returnVictor Dubiniuk2014-07-301-1/+1
| * | | | | Fix silent crash if 3rdparty dir is not availableVictor Dubiniuk2014-07-301-11/+16
| | |_|/ / | |/| | |
* | | | | Merge pull request #10024 from owncloud/preview-restrict-heightMorris Jobke2014-07-301-2/+8
|\ \ \ \ \
| * | | | | Also keep maxY into account when scaling a preview while preserving aspect ratioRobin Appelman2014-07-301-2/+8
| |/ / / /
* | | | | Merge pull request #10000 from owncloud/fix-lowlat-cache-autoloadJörn Friedrich Dreyer2014-07-302-11/+22
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add registerAutoloaderCache().Andreas Fischer2014-07-291-15/+18
| * | | | Memcache\Factory: Remove static, use globalPrefix.Andreas Fischer2014-07-292-4/+14
| * | | | InstanceId is properly injected into factory. Remove comment.Andreas Fischer2014-07-291-2/+0
* | | | | Merge pull request #9970 from owncloud/sharing_set_expire_dateMorris Jobke2014-07-301-1/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | make sure that we set the expire date if a date is adefault date is setBjoern Schiessle2014-07-281-1/+2
* | | | | Merge pull request #9888 from owncloud/mysql-tinyint-masterThomas Müller2014-07-301-0/+13
|\ \ \ \ \
| * | | | | migration test for sqlite - adding type mapping for 'tinyint unsigned'Thomas Müller2014-07-291-0/+13
| | |/ / / | |/| | |
* | | | | Merge pull request #9914 from owncloud/fix-appframework-blank-templateThomas Müller2014-07-301-1/+3
|\ \ \ \ \