summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1308 from TheSFReader/masterJörn Friedrich Dreyer2013-01-301-5/+2
|\
| * Merge remote-tracking branch 'refs/remotes/upstream/master'TheSFReader2013-01-266-40/+142
| |\
| * \ Merge remote-tracking branch 'refs/remotes/upstream/master'TheSFReader2013-01-2536-39/+176
| |\ \
| * | | Simplify the code and remove a first unnecessary (and non conform) '&' chara...TheSFReader2013-01-251-5/+2
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-303-0/+3
* | | | Merge pull request #1360 from owncloud/display_nameLukas Reschke2013-01-2910-2/+277
|\ \ \ \
| * | | | only change display name if the display name from the current user was change...Björn Schießle2013-01-291-1/+3
| * | | | version dump to trigger db updateBjörn Schießle2013-01-291-1/+1
| * | | | remove dubug valueBjörn Schießle2013-01-291-1/+1
| * | | | TypoArthur Schiwon2013-01-291-58/+58
| * | | | Adjust user interface to additions around displayName HandlingArthur Schiwon2013-01-291-0/+15
| * | | | search display name instead of uid; fix key/value order for array accessBjörn Schießle2013-01-281-1/+1
| * | | | implement DisplayNamesInGroup for database back-endBjörn Schießle2013-01-285-7/+37
| * | | | implement display names for the database back-endBjörn Schießle2013-01-281-0/+34
| * | | | update the display name for the database back-endBjörn Schießle2013-01-281-0/+18
| * | | | interface and API to change display namesBjörn Schießle2013-01-282-2/+19
| * | | | prepare user table to show and edit display namesBjörn Schießle2013-01-281-1/+1
| * | | | change order, key -> uid and value -> display name, this way it is also possi...Björn Schießle2013-01-281-2/+2
| * | | | use display name to show share_width and owner informationBjörn Schießle2013-01-251-0/+9
| * | | | allow to get the display name from an abitrary userBjörn Schießle2013-01-252-4/+6
| * | | | get all display names from users in a given groupBjörn Schießle2013-01-255-6/+53
| * | | | get all display namesBjörn Schießle2013-01-253-0/+43
| * | | | add display name to title instead if login-IDBjörn Schießle2013-01-241-1/+1
| * | | | new branch which introduces display namesBjörn Schießle2013-01-243-2/+60
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-291-0/+1
* | | | | Fix phpdocRobin Appelman2013-01-281-2/+2
* | | | | Merge pull request #1313 from owncloud/updater-CSPLukas Reschke2013-01-281-2/+4
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into updater-CSPThomas Mueller2013-01-288-10/+36
| |\ \ \ \ \
| * | | | | | Move update inline JSLukas Reschke2013-01-251-0/+1
| * | | | | | Move checkMaintenance and checkUpgradeLukas Reschke2013-01-251-2/+3
* | | | | | | Merge pull request #1318 from j-ed/masterThomas Müller2013-01-281-0/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Update lib/mail.phpj-ed2013-01-261-0/+2
* | | | | | | Merge pull request #1321 from owncloud/csp-fixesThomas Müller2013-01-281-5/+0
|\ \ \ \ \ \ \
| * | | | | | | Fix undefined variableLukas Reschke2013-01-261-5/+0
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-272-1/+6
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge pull request #1320 from owncloud/implements-1316-masterLukas Reschke2013-01-261-1/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | lookup for OCA classes in all apps foldersThomas Mueller2013-01-261-1/+8
* | | | | | | Merge pull request #1059 from owncloud/fixing-998-masterThomas Müller2013-01-261-0/+19
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-192-0/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-1854-934/+961
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-116-277/+611
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-0616-553/+766
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into fixing-998-masterThomas Mueller2013-01-067-159/+194
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | moving storage calculation code to OC_Helper::getStorageInfo()Thomas Mueller2013-01-021-0/+19
* | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-262-2/+3
* | | | | | | | | | | | Remove the CSP header for FirefoxLukas Reschke2013-01-251-1/+0
| |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge branch 'master' into no-inline-jsLukas Reschke2013-01-255-8/+20
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-251-0/+1
| * | | | | | | | | | Merge pull request #1286 from owncloud/ocs_apiThomas Müller2013-01-241-0/+3
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| | * | | | | | | | | Code style updateTom Needham2013-01-231-1/+1
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-21 11:50:28 +0000