summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge pull request #5923 from owncloud/font-weightJan-Christoph Borchardt2013-11-181-0/+1
|\ \ \ \ \
| * | | | | change bold 'deleted files' button to normal for less focusJan-Christoph Borchardt2013-11-181-0/+1
| |/ / / /
* | | | | fix filtering number like filenames in filelistJörn Friedrich Dreyer2013-11-181-1/+1
* | | | | Merge pull request #5922 from owncloud/fix-time-inputsThomas Müller2013-11-181-6/+36
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | adjust input CSS to multiline, coding guidelinesJan-Christoph Borchardt2013-11-181-6/+29
| * | | | fix input type time fields, have them use the default stylesJan-Christoph Borchardt2013-11-181-3/+10
* | | | | Merge pull request #5915 from owncloud/fix_apps_versioncheckVincent Petry2013-11-181-1/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | one tab lessFrank Karlitschek2013-11-181-1/+1
| * | | | fix the version check for downloaded apps. Fixes https://github.com/owncloud/...Frank Karlitschek2013-11-181-2/+9
| |/ / /
* | | | Merge pull request #5908 from owncloud/fix_errorpage_callVincent Petry2013-11-181-1/+1
|\ \ \ \
| * | | | call error page with session as parameterBjoern Schiessle2013-11-171-1/+1
* | | | | Merge pull request #5914 from owncloud/fix_5832Morris Jobke2013-11-181-1/+16
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Check which permissions are possible to re-share a fileBjoern Schiessle2013-11-181-1/+16
|/ / / /
* | / / [tx-robot] updated from transifexJenkins for ownCloud2013-11-15363-6923/+8214
| |/ / |/| |
* | | Merge pull request #5894 from owncloud/readd_sharing_tokenVincent Petry2013-11-152-0/+2
|\ \ \
| * | | readd sharing token to public templateJörn Friedrich Dreyer2013-11-152-0/+2
| |/ /
* | | Merge pull request #5772 from owncloud/fix5741blizzz2013-11-153-22/+92
|\ \ \
| * | | LDAP Wizard: make 'Configuration OK' and 'Help' texts grey so they don't take...Arthur Schiwon2013-11-132-0/+7
| * | | LDAP Wizard: move status indicator in one line with back and continue buttonsArthur Schiwon2013-11-131-3/+2
| * | | LDAP Wizard: introduce configuration status indicator, fixes #5741Arthur Schiwon2013-11-133-22/+86
* | | | Merge pull request #5833 from owncloud/encryption_fixesBjörn Schießle2013-11-153-22/+83
|\ \ \ \
| * | | | remove debug outputBjoern Schiessle2013-11-141-6/+0
| * | | | test encryptAll() and decryptAll() to make sure that mtime and etag stay the ...Bjoern Schiessle2013-11-141-0/+64
| * | | | Merge branch 'master' into encryption_fixesBjoern Schiessle2013-11-1310-75/+138
| |\ \ \ \
| * | | | | fixPartialFilePath() is now stripPartialFileExtension()Bjoern Schiessle2013-11-121-1/+1
| * | | | | only update file cache if the file is already indexed to avoid that we create...Bjoern Schiessle2013-11-121-11/+14
| * | | | | make sure that we keep the correct timestamp and etag after encryoption/decry...Bjoern Schiessle2013-11-121-11/+11
* | | | | | Merge pull request #5880 from owncloud/replace_etmp_filesVincent Petry2013-11-154-16/+64
|\ \ \ \ \ \
| * | | | | | tests addedBjoern Schiessle2013-11-151-1/+14
| * | | | | | instead of writing etmp files we write the dummy file to data/user/cache to a...Bjoern Schiessle2013-11-143-15/+50
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #5889 from owncloud/extstorage-smb-brokenfseekFrank Karlitschek2013-11-151-1/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fix for smb4php fseekVincent Petry2013-11-151-1/+2
|/ / / / /
* | | | | Merge pull request #5789 from ogasser/db_fix_default_for_numericBart Visscher2013-11-153-1/+48
|\ \ \ \ \
| * | | | | treat numeric as an alias for decimalOliver Gasser2013-11-121-0/+3
| * | | | | changed type to decimalOliver Gasser2013-11-121-1/+1
| * | | | | Add DB tests for default numericOliver Gasser2013-11-122-0/+44
| * | | | | DB: Set correct default value for numeric typesOliver Gasser2013-11-101-1/+1
* | | | | | increase version number to trigger a DB migration to get more testers for the...Frank Karlitschek2013-11-151-1/+1
* | | | | | Merge pull request #5814 from owncloud/add-indexesFrank Karlitschek2013-11-151-0/+30
|\ \ \ \ \ \
| * | | | | | Add some more indexes to tables to improve db queriesBart Visscher2013-11-111-0/+30
| |/ / / / /
* | | | | | Merge pull request #5700 from owncloud/ldapWizSetDisplayNamesThomas Müller2013-11-151-0/+13
|\ \ \ \ \ \
| * | | | | | LDAP Wizard: do not forget to set display name attributes for user and group,...Arthur Schiwon2013-11-051-0/+13
* | | | | | | Merge pull request #5813 from owncloud/fix-4736-masterThomas Müller2013-11-152-3/+3
|\ \ \ \ \ \ \
| * | | | | | | fix DB schema test - no default valueMorris Jobke2013-11-121-2/+2
| * | | | | | | Don't set a default value when there isn't a default specifiedBart Visscher2013-11-111-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #5767 from owncloud/moviepreviewfallbackMorris Jobke2013-11-141-12/+48
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into moviepreviewfallbackThomas Müller2013-11-14535-4152/+8674
| |\ \ \ \ \ \ \
| * | | | | | | | Added missing escapingVincent Petry2013-11-111-1/+1
| * | | | | | | | Fixed undefined variable error when using avconvVincent Petry2013-11-101-0/+2
| * | | | | | | | Fixed the rebellous space, replaced with a tabVincent Petry2013-11-081-1/+1