summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Make files non executableLukas Reschke2014-10-2422-0/+0
* [tx-robot] updated from transifexJenkins for ownCloud2014-10-2481-124/+130
* Merge pull request #7749 from owncloud/load_avatar_header_via_phpMorris Jobke2014-10-245-14/+26
|\
| * add avatardiv-shown class to bring back mobile styleMorris Jobke2014-10-231-1/+1
| * Load avatar in header via PHPkondou2014-10-235-14/+26
* | Merge pull request #11751 from owncloud/fix-unreachable-statementLukas Reschke2014-10-241-1/+0
|\ \ | |/ |/|
| * Remove unreachable statementLukas Reschke2014-10-231-1/+0
|/
* Merge pull request #11549 from owncloud/add-more-localizations-masterThomas Müller2014-10-238-92/+105
|\
| * Update 3rdparty submoduleThomas Müller2014-10-231-0/+0
| * fixing expected values for formatDate() unit testsThomas Müller2014-10-211-3/+3
| * adding unit tests for en_GB and en-GB - just to verifyThomas Müller2014-10-201-0/+8
| * implement localizations based on punicThomas Müller2014-10-207-89/+94
* | Merge pull request #11259 from owncloud/fix-windows-max-depth-testThomas Müller2014-10-231-6/+19
|\ \
| * | fixing windows max depth testClark Tomlinson2014-09-301-6/+19
* | | Merge pull request #10985 from owncloud/db-cleanupThomas Müller2014-10-2312-284/+187
|\ \ \
| * | | Fix tags unit testRobin Appelman2014-10-221-1/+1
| * | | Use statements wrapper in \OCP\IDBRobin Appelman2014-10-221-1/+3
| * | | Bit more cleanupRobin Appelman2014-10-223-27/+21
| * | | Move creating the database connection to the server containerRobin Appelman2014-10-224-85/+90
| * | | Remove implicit prepared statement cache and get the connection from the serv...Robin Appelman2014-10-226-62/+13
| * | | Extend \OCP\IDBConnection to cover more use casesRobin Appelman2014-10-221-3/+61
| * | | Remove \OC\DB\ConnectionWrapper, have \OC\DB\Connection implement \OCP\IDBCon...Robin Appelman2014-10-223-110/+3
* | | | Merge pull request #11721 from owncloud/fix-s3-regressionMorris Jobke2014-10-231-5/+11
|\ \ \ \
| * | | | Fix S3 connectionVincent Petry2014-10-221-5/+11
* | | | | Merge pull request #11726 from owncloud/s3-fixunittestsMorris Jobke2014-10-231-0/+1
|\ \ \ \ \
| * | | | | Fix S3 folder creation for new AWS APIVincent Petry2014-10-221-0/+1
* | | | | | Merge pull request #11720 from sebomoto/groupadmin-headerJan-Christoph Borchardt2014-10-232-4/+4
|\ \ \ \ \ \
| * | | | | | "Group admin" default label (issue #7706)Sebastian Bolt2014-10-222-4/+4
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #10689 from owncloud/load_classfile_onceMorris Jobke2014-10-231-1/+1
|\ \ \ \ \ \
| * | | | | | make sure class file is loaded onceArthur Schiwon2014-08-281-1/+1
* | | | | | | Merge pull request #11710 from owncloud/closeSessionForAvatarsThomas Müller2014-10-231-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Close session for avatar getLukas Reschke2014-10-221-0/+1
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-2383-253/+332
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge pull request #11704 from owncloud/fix-type-for-queryLukas Reschke2014-10-221-5/+8
|\ \ \ \ \ \ \
| * | | | | | | Use mixed as typeLukas Reschke2014-10-221-5/+8
| |/ / / / / /
* | | | | | | Merge pull request #11702 from owncloud/fix-11637blizzz2014-10-221-4/+5
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | better variable nameArthur Schiwon2014-10-221-3/+4
| * | | | | | set up FS by username, not login name\!Arthur Schiwon2014-10-221-1/+1
* | | | | | | Merge pull request #11620 from owncloud/settings-sidebarLukas Reschke2014-10-223-7/+56
|\ \ \ \ \ \ \
| * | | | | | | Add some basic sanitizationLukas Reschke2014-10-171-2/+2
| * | | | | | | implement sidebar fro personal settings - bad kung-fuThomas Müller2014-10-173-11/+47
| * | | | | | | first steps of sidebar for personal and admin settingsJan-Christoph Borchardt2014-10-171-0/+13
* | | | | | | | Merge pull request #9586 from owncloud/enhanced-sql-script-generation-oracle-...Jörn Friedrich Dreyer2014-10-224-13/+49
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Special treatment for OracleThomas Müller2014-10-164-13/+49
* | | | | | | | Merge pull request #11687 from owncloud/appframework-session-annotationLukas Reschke2014-10-223-1/+171
|\ \ \ \ \ \ \ \
| * | | | | | | | introduce SessionMiddleWare to control session handling via an annotationThomas Müller2014-10-223-1/+171
* | | | | | | | | Merge pull request #11694 from owncloud/extstorage-lazyinitLukas Reschke2014-10-226-107/+163
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Lazy initialize external storagesVincent Petry2014-10-226-107/+163
|/ / / / / / / /
* | | | | | | | Merge pull request #11684 from owncloud/guess_mimetype_on_touchJörn Friedrich Dreyer2014-10-222-2/+5
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | guess mimetype on touchJörn Friedrich Dreyer2014-10-212-2/+5