wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
16535 commits 157 branches 562 tags 714 MiB
Commit graph

2546 commits

Author SHA1 Message Date
Morris Jobke
256dca935b Revert "adding new javascript function OC.generateUrl(url, params)" 
This reverts commit 8e667d1934.
 2014-03-06 15:10:32 +01:00
Morris Jobke
5f0a22586f Merge pull request #7579 from owncloud/introduce-generateUrl-master 
Introduce OC.generateUrl() in master
 2014-03-06 15:07:28 +01:00
Vincent Petry
6e4ea09d52 Merge pull request #7494 from owncloud/fix-7307 
Replace OC.Router.generate() with OC.generateUrl()
 2014-03-06 14:49:12 +01:00
Jan-Christoph Borchardt
0b0687c9fc fix noise not repeating 2014-03-06 12:38:11 +01:00
Thomas Müller
b46517f012 adding js unit tests for OC.generateUrl() 2014-03-06 00:26:57 +01:00
Thomas Müller
8e667d1934 adding new javascript function OC.generateUrl(url, params) 2014-03-06 00:17:48 +01:00
Thomas Müller
32b29c9d73 Merge branch 'master' into fix-7307 
Conflicts:
	core/js/router.js
	settings/js/admin.js
 2014-03-06 00:15:08 +01:00
Jan-Christoph Borchardt
36fcb0fb4e Merge pull request #7569 from owncloud/scrutinizer-tabs 
fix some spaces to tabs issues reported by Scrutinizer
 2014-03-05 18:10:01 +01:00
Morris Jobke
8c1cd2b83e Merge pull request #7566 from owncloud/button-outlines 
Adds 0 Outlines to Buttons
 2014-03-05 16:50:22 +01:00
Jan-Christoph Borchardt
7ad7f94797 fix some spaces to tabs issues reported by Scrutinizer 2014-03-05 15:47:12 +01:00
raghunayyar
5a9689eb5c Adds 0 Outlines to Buttons 2014-03-05 19:36:36 +05:30
Jan-Christoph Borchardt
4d679de30b add hover/focus states for star icons to hint at action 2014-03-05 13:21:33 +01:00
Morris Jobke
a8ae2f10b9 Merge pull request #7554 from owncloud/issue/7304 
Fix position of eye icon on database password field
 2014-03-05 11:13:43 +01:00
Vincent Petry
6de370b64c Removed obsolete OC.Router stubs in specHelper 2014-03-05 10:27:15 +01:00
Joas Schilling
4ee4f0c365 Fix position of eye icon on database password field 
Fix #7304
 2014-03-05 10:22:35 +01:00
Thomas Müller
33b798c3d6 fixing js unit tests 2014-03-05 01:10:39 +01:00
Vincent Petry
25251d4bf7 Fix mail template to use p() for colors 
Now using p() instead of print_unescaped() for colors.
 2014-03-03 17:36:12 +01:00
Frank Karlitschek
7983c90fdc Merge pull request #7500 from owncloud/theme-mailtemplate 
Enable theming of the mail template header
 2014-03-03 17:22:33 +01:00
jbtbnl
e603164517 Do not override button background image 2014-03-03 14:07:44 +01:00
Jan-Christoph Borchardt
b8d0fc9494 make mail notification header color themable 2014-03-03 12:43:22 +01:00
Jan-Christoph Borchardt
eac9eebfdb compress mail notification logo 2014-03-03 12:42:58 +01:00
Jan-Christoph Borchardt
607f205bda mail template: remove off-white background color to better blend into mail client 2014-03-03 12:21:08 +01:00
Thomas Müller
e1030c6b5f adding JSDoc + remove unused function 2014-03-02 23:15:37 +01:00
Thomas Müller
1291303c5a Replace OC.Router.generate() with OC.generateUrl() 2014-03-02 22:30:24 +01:00
Raghu Nayyar
e304809612 Merge pull request #7382 from jbtbnl/master 
Remove necessity of icon class
 2014-02-27 21:11:26 +05:30
Morris Jobke
7af846e656 Merge pull request #7452 from owncloud/icon-delete-hover 
icons: automatically show delete hover instead of using explicit class
 2014-02-27 14:44:29 +01:00
Morris Jobke
6fe1cf7ae4 Merge pull request #7449 from owncloud/remove-input-border 
remove border from log in input fields, simpler and works better with themes
 2014-02-27 13:24:44 +01:00
Jan-Christoph Borchardt
58bc6aee51 icons: automatically show delete hover instead of using explicit class 2014-02-27 12:48:25 +01:00
Jan-Christoph Borchardt
af467d92f6 Installation: relabel 'Advanced' to more descriptive 'Storage & database' 2014-02-27 12:24:14 +01:00
Jan-Christoph Borchardt
f0cd08ab5d remove border from log in input fields, simpler and works better with themes 2014-02-27 12:13:09 +01:00
Joas Schilling
922c1909f8 Translate string when an error occured while sending a forgot password mail 
Fix #7423
 2014-02-26 17:29:47 +01:00
Thomas Müller
2f0db9af07 Merge pull request #7409 from owncloud/issue/5361 
Add owncloud version to JS scope
 2014-02-26 14:44:12 +01:00
Jan-Christoph Borchardt
d9a153dbe9 Merge pull request #7174 from owncloud/issue/7166 
Add option to change email settings in admin section
 2014-02-26 14:41:07 +01:00
Joas Schilling
9847912257 Remove unused variables, add doc blocks and break lines 
Fix #7166
 2014-02-26 13:10:46 +01:00
Joas Schilling
cb14b1c58d Add owncloud version to JS scope 
Fix #5361
 2014-02-26 11:50:52 +01:00
jbtbnl
d28fd8f64d Remove necessity of icon class 
Only the icon specific class is needed
 2014-02-24 22:37:19 +01:00
Morris Jobke
5fb1374b0f Merge pull request #7285 from owncloud/mimeicons-svg 
Show svg mime icons when no preview is available
 2014-02-24 14:12:10 +01:00
Morris Jobke
8d17f6d675 Merge pull request #7320 from owncloud/GuillaumeAmat-patch-1 
Update page title when navigating through directories (local)
 2014-02-24 13:34:07 +01:00
icewind1991
ddb8cf32e9 Merge pull request #7344 from owncloud/add-js-config-vars 
Allow apps to add/modify config js output via hook.
 2014-02-24 13:29:54 +01:00
Robin Appelman
7c4f81bd78 rename url parameter 2014-02-24 13:24:10 +01:00
Vincent Petry
80c61d480c Added oc_defaults stub in specHelper.js 
This is needed for JS Unit tests to run properly as they are expecting
the new "oc_default" map to exist.
 2014-02-24 09:45:02 +01:00
Morris Jobke
079d64ce75 Merge pull request #7310 from owncloud/no-css-js-delivery-via-php 
No css js delivery via php
 2014-02-21 20:37:10 +01:00
icewind1991
9b9b2255b6 Merge pull request #7355 from owncloud/new-menu-svg 
Use SVG icons in New file menu
 2014-02-21 16:18:43 +01:00
Robin Appelman
df35929ed2 Merge branch 'master' into add-js-config-vars 2014-02-21 16:07:21 +01:00
Robin Appelman
59ec61dc03 Merge branch 'master' into GuillaumeAmat-patch-1 2014-02-21 16:04:31 +01:00
Morris Jobke
a5c70f16d2 Merge pull request #7351 from owncloud/fix_thumbnails_for_conflicts_in_subdirs 
fix thumbnail generation for subdirectories in the conflicts dialog
 2014-02-21 15:33:13 +01:00
icewind1991
aa0bcf7ba4 Merge pull request #7336 from owncloud/IE-wipho-viewport 
fix viewport size on windows phone
 2014-02-21 15:13:20 +01:00
Jan-Christoph Borchardt
877cfb963a use SVG icons from icons.css for New file menu 2014-02-21 14:07:25 +01:00
Robin Appelman
4715fb12c8 Add url parameter to control whether previews should return 404 when the mimetype is unsupported 2014-02-21 14:06:15 +01:00
Jörn Friedrich Dreyer
d9e333c0da use directory from original instead of current dir 2014-02-21 14:01:38 +01:00