2b586eb91c
correct target blank from image to link
2013-02-11 12:40:17 +01:00
45a4016878
Merge pull request #1552 from raghunayyar/personalpage-style-fix
...
Personal Page Password Toggle Loads Fine.
2013-02-10 07:31:05 -08:00
e68cf72458
Merge pull request #1543 from owncloud/utf8-locale-master
...
some systems use en_US.UTF8 instead of en_US.UTF-8
2013-02-09 09:58:05 -08:00
bb656ca2fb
Merge pull request #1561 from Raydiation/master
...
Moved the iframe height and width fix from js to css
2013-02-09 08:56:12 -08:00
62122148bf
Revert "moved iframe height and width fix from js to css"
...
This reverts commit 842fc85b9a
2013-02-09 17:46:23 +01:00
842fc85b9a
moved iframe height and width fix from js to css
2013-02-09 17:41:17 +01:00
f8335c4815
moved iframe height and width fix from js to css
2013-02-09 11:34:25 +01:00
c14f0b5637
add in new window
2013-02-09 09:30:59 +01:00
9bd45b26a5
add the buttons for the clients to the personal page.
...
Useful and prettier
2013-02-09 09:13:11 +01:00
e8d17e4e8e
Personal Page Password Toggle Also Loads Well.
2013-02-09 11:40:07 +05:30
232a98524c
some systems use en_US.UTF8 instead of en_US.UTF-8
2013-02-08 17:49:54 +01:00
5788d36c8d
Merge branch 'master' into fixing-1354-master
...
Conflicts:
settings/admin.php
settings/templates/admin.php
2013-02-07 10:44:28 +01:00
84f3c8b6cc
show webdav test results in admin section as well
2013-02-07 00:49:39 +01:00
e969a78cf9
Merge pull request #1443 from owncloud/use-module-file-info-master
...
we get best results regarding mime type detection if we use fileinfo - l...
2013-02-06 11:53:13 -08:00
3879e5d9c5
Merge pull request #1428 from owncloud/content_positioning
...
Fix leftcontent positioning. Ref #1255
2013-02-06 08:13:45 -08:00
0a16d25724
make it possible to modify the links to the clients
2013-02-06 15:20:43 +01:00
9d73e7eb1e
let the user change his display name, if supported by the back-end
2013-02-06 11:38:03 +01:00
5221ee0c5a
offer change password only when the action is supported by the user backend
2013-02-05 19:26:00 +01:00
b06ac67e07
Add 'hascontrols' class for content with fixed topbar.
2013-02-04 18:30:49 +01:00
6058c2f734
we get best results regarding mime type detection if we use fileinfo - let's tell the admin about that
2013-02-04 15:04:26 +01:00
b471177439
Merge pull request #1379 from owncloud/improved_appsmanagement
...
Improved appsmanagement
2013-01-31 08:30:55 -08:00
92921ceefd
make strings translatable
2013-01-30 16:28:41 +01:00
ea5861ed8c
remove leftover code
2013-01-30 15:27:20 +01:00
66cab77b6d
merge master
...
Merge branch 'master' into improved_appsmanagement
Conflicts:
settings/apps.php
settings/templates/apps.php
2013-01-30 14:36:17 +01:00
389c4e8415
mark recommended apps. server part not yet fully implemented
2013-01-30 13:39:53 +01:00
250c565d2b
Merge pull request #1360 from owncloud/display_name
...
introduction of display names
2013-01-29 14:05:54 -08:00
4b7b092008
rename Name to Login Name
2013-01-28 17:05:20 +01:00
f3a99f4869
show display name in input field
2013-01-28 17:01:37 +01:00
e0f2ed2757
interface and API to change display names
2013-01-28 14:09:11 +01:00
022a7b13b8
prepare user table to show and edit display names
2013-01-28 13:12:44 +01:00
276d98b9dd
Merge pull request #1059 from owncloud/fixing-998-master
...
Fixing 998 master
2013-01-26 04:15:40 -08:00
64e853394c
compare the correct uids
2013-01-25 12:46:32 +01:00
48949ba04a
Move appid to external file
2013-01-23 11:21:34 +01:00
8907bdaf7f
Remove uneeded JS
2013-01-22 12:15:46 +01:00
d2383338de
External JSON for the Apps
2013-01-21 22:18:42 +01:00
3ed7d5d521
Move isadmin to external file
2013-01-21 21:25:38 +01:00
a27f92a17a
we are getting closer. updating is not working yet.
2013-01-21 20:40:23 +01:00
afb5de955e
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/ajax/upload.php
apps/files/js/files.js
2013-01-18 23:22:34 +01:00
a8f963d9cf
Spaces to tabs
2013-01-16 18:09:16 +01:00
388bb6a5e1
Merge branch 'master' into fixing-unused-and-undefined-in-master
2013-01-14 23:41:34 +01:00
ffbf273c9a
Removed uneeded HTML tag
2013-01-11 14:43:56 +01:00
466cdab680
Add security section to admin menu
...
Currently it only allows the admin to enable or disable the HTTPS
enforcement, but in the future it could be expanded to further options.
The HTTPS enforcement only allows the admin to enforce it, if he is
connected via HTTPS. (To prevent admins to enable it without a proper
SSL setup)
2013-01-11 14:18:51 +01:00
508b6a9fc7
displaying notification now centered
...
The notification div has been moved to the user templates.
Correct display of the notification will only work with the use of OC.Notification.show() as on fadeIn() the css needs to be changed as this style required display: inline.
2013-01-11 11:52:07 +01:00
e475c26f1a
fixing <input> tag
2013-01-07 21:23:14 +01:00
0b13b41189
Merge pull request #1053 from owncloud/ocs_api
...
External API for ownCloud based on OCS
2013-01-04 17:18:58 -08:00
ed06070741
omit type attribute in script tag to use fallback (text/javascript)
2013-01-02 12:13:07 +01:00
6eb194b702
Merge branch 'master' into ocs_api
...
Conflicts:
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/files_encryption.pot
l10n/templates/files_external.pot
l10n/templates/files_sharing.pot
l10n/templates/files_versions.pot
l10n/templates/lib.pot
l10n/templates/settings.pot
l10n/templates/user_ldap.pot
l10n/templates/user_webdavauth.pot
2012-12-31 15:47:15 +00:00
36da34e5f6
Merge pull request #902 from owncloud/storage-wording
...
Storage wording
2012-12-28 23:19:52 -08:00
7e78f8e15a
moving logic from template to the 'controller'
...
THX @VicDeo
2012-12-21 00:48:12 +01:00
436df6b67d
enable translations for quota sizes 'none' and 'default'
2012-12-20 15:35:36 +01:00
bca02f4b40
[l18n] fixing typos in source text
2012-12-19 23:43:07 +01:00
b162e72f94
Merge pull request #961 from owncloud/check_locale
...
add a check and a warning if setlocale is working
2012-12-19 08:53:43 -08:00
d7fbe47583
Merge pull request #868 from owncloud/new_doc_system
...
New doc system
2012-12-19 06:40:37 -08:00
196f1c3786
add a check and a warning if setlocale is working
2012-12-19 15:10:33 +01:00
3c98f36121
Merge branch 'master' into ocs_api
2012-12-16 22:29:00 +00:00
30b0e8b70c
cleaning up the settings. standardize the format, add missing I10N and other small things. Yes. This is not perfect. But way better than before ;-)
2012-12-15 20:02:16 +01:00
df7d6cb26c
More style fixes
2012-12-15 00:43:46 +01:00
4acb2f70e1
change technical expression 'Quota' to simpler 'Storage'
2012-12-14 23:02:22 +01:00
5fe6129698
Merge master into ocs_api, fix conflicts.
2012-12-14 15:15:05 +00:00
cde74fe248
make it more readable
2012-12-14 14:41:09 +01:00
2330d6bcc7
show the link to the issue tracker only for Admins as discussed with Björn and Jan.
2012-12-13 11:08:12 +01:00
89bbabd77b
a bit more polish. We are getting there.
2012-12-13 09:26:25 +01:00
f85106b6b5
first version of the new documentation system integration.
2012-12-12 22:41:12 +01:00
6a211f3fa1
Check if we have an array with data. Fix #487
2012-12-02 23:54:54 +03:00
c053863644
Merge pull request #330 from owncloud/check_connection
...
add a check and a warning if the ownCloud server is not able to establis...
2012-11-09 02:11:24 -08:00
55f75c6d8e
add a check and a warning if the ownClodu server is not able to establish http connections to the internet. The reason is that users complained that external filesystem support, the update checker, downloading of new apps or the nowledgebase don´t work and don´t know why.
2012-11-08 18:08:44 +01:00
fef2d07873
add credits to personal page too so that non admins can see what they run.
2012-11-08 14:12:49 +01:00
a4b2ea586d
Style: Remove all the dangling white spaces
2012-11-04 22:16:04 +01:00
27ab0357ae
Checkstyle: Fix last six NewlineBeforeOpenBrace
2012-11-04 18:36:16 +01:00
30d7993e01
Checkstyle fixes: NoSpaceAfterComma
2012-11-04 11:10:46 +01:00
afadf93d31
Checkstyle: many fixes
2012-11-02 19:53:02 +01:00
bcdf3a23db
Merge master into ocs_api
2012-10-28 11:16:04 +00:00
f475ed5cc1
Revert "Remove old password check from changepassword and use verifyUser instead"
...
This reverts commit e6b8153865
2012-10-15 23:49:49 +02:00
e6b8153865
Remove old password check from changepassword and use verifyUser instead
2012-10-15 17:44:44 +02:00
c701bed2e3
fix a lot of small layout bugs and make the apps page overall prettier plus add ratings finally
2012-10-08 15:49:48 +02:00
729b36e495
Fix grammer and dont split translatable string
2012-09-18 21:31:03 +00:00
dc0dc56d48
Merge branch 'master' of https://github.com/owncloud/core
2012-09-18 14:36:08 +01:00
b765e883f3
Fixed bug with duplicate entries for installed 3rd party apps in settings->apps
...
Added method getAppstoreApps to OC_App
Added minor documentation
2012-09-18 14:35:27 +01:00
88b786e8dd
Merge branch 'master' into ocs_api
2012-09-17 12:09:34 +00:00
158af74b3e
makes cron config layout similar to the sharing one
2012-09-16 12:40:08 -04:00
442f26ea80
structure the settings options a bit better.
2012-09-16 17:23:21 +02:00
227ada3257
Fix merge conflicts
2012-09-13 10:23:41 +00:00
c0a3bdb757
improve the documentation for the cron config a bit
2012-09-12 12:09:46 +02:00
3829460ab8
adding space between) and {
2012-09-07 15:22:01 +02:00
a2b6a92107
Disable asking to save password when adding users.
2012-09-05 17:22:03 +02:00
685f03edf6
fixing translation - thx eMerzh
2012-09-04 23:49:43 +02:00
409ede0975
Update settings/templates/users.php
...
respect coding style
2012-09-04 13:05:09 +03:00
f3e330ce64
Update settings/templates/help.php
...
respect coding style
2012-09-04 13:03:51 +03:00
0fa254508d
dont use shorthand php tags
2012-09-01 16:38:23 +02:00
10bd64debd
translation support enhanced
2012-09-01 13:23:37 +02:00
b5234a4f34
allow html inside app descriptions
2012-08-30 22:17:54 +02:00
aad7dc8390
Remove sharing notice in users settings - The default is now share with anyone, groups only sharing is now a setting in the admin page
2012-08-27 20:55:11 -04:00
9cd55508c3
Add Share API settings to admin page
2012-08-27 20:39:31 -04:00
617449b230
Change URL from gitorious to github
2012-08-26 21:38:53 -04:00
ced234a81a
rename subadmin to group admin
2012-08-17 16:00:24 +02:00
0c69e64b86
Backgroundjobs: Fix template
2012-08-12 00:44:25 +02:00
2bc8d3e5d6
Backgroundjobs: interface improvements
2012-08-12 00:37:14 +02:00
a5a5ab2318
Add type text to new user, fixes display issue
2012-08-11 16:29:41 -04:00
9ad31e5f81
Backgroundjobs: use correct var name in template
2012-08-10 01:44:38 +02:00
7c766cdfe0
Backgroundjobs: fix bugs in template
2012-08-10 01:42:30 +02:00
Jan-Christoph Borchardt
Björn Schießle
Thomas Müller
Jörn Friedrich Dreyer
Bernhard Posselt
Frank Karlitschek
raghunayyar
Lukas Reschke
Thomas Tanghus
Georg Ehrke
Björn Schießle
Arthur Schiwon
Bart Visscher
Michael Gapczynski
Tom Needham
Tom Needham
Victor Dubiniuk
Felix Moeller
Sam Tuke
Alessandro Cosentino
Robin Appelman
Jakob Sack