aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* move log in button CSS to appropriate placeJan-Christoph Borchardt2013-07-231-4/+18
* adjust text colors for remember and footerJan-Christoph Borchardt2013-07-231-3/+8
* larger clickable area for remember log inJan-Christoph Borchardt2013-07-231-0/+3
* sticky footerJan-Christoph Borchardt2013-07-232-10/+26
* primary button adjustmentsJan-Christoph Borchardt2013-07-231-2/+6
* input field adjustments for new full-color background on log inJan-Christoph Borchardt2013-07-232-9/+33
* fix general reset CSS issue which caused gradient background to cut offJan-Christoph Borchardt2013-07-231-1/+1
* rip out unneeded #login div, replace with existing body-loginJan-Christoph Borchardt2013-07-232-29/+47
* initial WIP for cleaner log in pageJan-Christoph Borchardt2013-07-231-11/+14
* Merge pull request #4150 from owncloud/better-error-handlingJörn Friedrich Dreyer2013-07-236-41/+42
|\
| * Fixed review issuesBart Visscher2013-07-223-7/+11
| * Only display call trace in debug modeBart Visscher2013-07-211-10/+17
| * In debug mode uncaught exceptions should display a nice pageBart Visscher2013-07-211-3/+7
| * DRY use OC_Template::printErrorPageBart Visscher2013-07-212-22/+10
| * Change exit calls to throwing an exceptionBart Visscher2013-07-213-6/+4
* | Merge pull request #4159 from owncloud/Fixing-share-sj-errorJörn Friedrich Dreyer2013-07-231-1/+7
|\ \
| * | Create an array entry before filling itVictor Dubiniuk2013-07-231-0/+1
| * | Show generic error when there is no errorVictor Dubiniuk2013-07-221-1/+6
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-23551-4314/+5039
* | | Merge pull request #4126 from owncloud/parallel-autotest.sh-masterThomas Müller2013-07-222-37/+50
|\ \ \
| * \ \ Merge branch 'master' into parallel-autotest.sh-masterThomas Müller2013-07-221267-5121/+67470
| |\ \ \
| * | | | don't rely on admin user but create a test user for Test_Encryption_KeymanagerThomas Müller2013-07-191-17/+15
| * | | | pgsql support addedThomas Müller2013-07-191-1/+4
| * | | | parallel execution support for mysql addedThomas Müller2013-07-191-12/+19
| * | | | Merge branch 'master' into parallel-autotest.sh-masterThomas Müller2013-07-18601-5902/+2664
| |\ \ \ \
| * | | | | Use EXECUTOR_NUMBER in database name and user name.Thomas Müller2013-07-161-18/+23
* | | | | | Merge pull request #4156 from owncloud/fix_oc_image_referenceAndreas Fischer2013-07-221-1/+1
|\ \ \ \ \ \
| * | | | | | need to use \OC_Image to escape OCP namespaceJörn Friedrich Dreyer2013-07-221-1/+1
|/ / / / / /
* | | | | | Merge pull request #4154 from owncloud/return-ocl10nKondou2013-07-221-1/+1
|\ \ \ \ \ \
| * | | | | | return result from getL10NRobin Appelman2013-07-221-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #4071 from owncloud/fix_return_value_search_principalsVicDeo2013-07-221-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'master' into fix_return_value_search_principalsGeorg Ehrke2013-07-22668-9752/+6546
| |\ \ \ \ \
| * | | | | | return empty array instead of 0Georg Ehrke2013-07-151-1/+1
* | | | | | | Merge pull request #3142 from owncloud/ext-fs-irods-masterThomas Müller2013-07-2285-1/+8137
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into ext-fs-irods-masterThomas Müller2013-07-221304-9833/+68886
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | fixing / adding commentsThomas Müller2013-07-161-1/+3
| * | | | | | | Merge branch 'master' into ext-fs-irods-masterThomas Müller2013-07-16568-2225/+2364
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into ext-fs-irods-masterThomas Müller2013-07-122-75/+109
| |\ \ \ \ \ \ \ \
| * | | | | | | | | update copy rightThomas Müller2013-07-121-1/+1
| * | | | | | | | | update .gitignoreThomas Müller2013-07-121-2/+2
| * | | | | | | | | incorporate development branch of ssh://irodsguest@code.renci.org/gitroot/ir...Thomas Müller2013-07-1280-1/+7938
| * | | | | | | | | Merge branch 'master' into ext-fs-irods-masterThomas Müller2013-07-121141-22754/+32210
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into ext-fs-irods-masterThomas Mueller2013-06-28800-6278/+7862
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into ext-fs-irods-masterThomas Mueller2013-06-191629-55609/+56894
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | update to latest masterThomas Mueller2013-06-061-6/+0
| * | | | | | | | | | | | - implement touch() to at least create a file which doesn't existThomas Mueller2013-06-061-12/+87
| * | | | | | | | | | | | Merge branch 'master' into ext-fs-irods-masterThomas Mueller2013-05-151136-33590/+40146
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | adding auth mode to ui and the urlThomas Mueller2013-04-262-0/+7
| * | | | | | | | | | | | | adding $backupGlobals = FALSE because iRODS is heavily using $GLOBALSThomas Mueller2013-04-261-0/+2
| * | | | | | | | | | | | | Merge branch 'master' into ext-fs-irods-masterThomas Mueller2013-04-26900-33287/+31972
| |\ \ \ \ \ \ \ \ \ \ \ \ \