Marvin Thomas Rabe
|
e345fbd386
|
conflicts solved
|
2011-10-06 22:40:11 +02:00 |
|
Marvin Thomas Rabe
|
bb26fe9300
|
Merge commit 'refs/merge-requests/55' of git://gitorious.org/owncloud/owncloud into merge-requests/55
|
2011-10-06 22:37:06 +02:00 |
|
Marvin Thomas Rabe
|
ae56bb63c6
|
Merge commit 'refs/merge-requests/52' of git://gitorious.org/owncloud/owncloud into merge-requests/52
|
2011-10-06 22:36:34 +02:00 |
|
Marvin Thomas Rabe
|
878178145d
|
Merge commit 'refs/merge-requests/54' of git://gitorious.org/owncloud/owncloud into merge-requests/54
|
2011-10-06 22:35:36 +02:00 |
Bart Visscher
|
3cc7212c82
|
Add icon for calendar color selector
|
2011-10-06 21:22:55 +02:00 |
|
Bart Visscher
|
b0847a61f5
|
Start using OC_JSON in gallery app
|
2011-10-06 21:22:01 +02:00 |
|
Bart Visscher
|
4786ed321e
|
Replace _ in timezone setting with a space
|
2011-10-06 13:22:36 +02:00 |
|
Bart Visscher
|
c28f1e0276
|
Implement timezone fix from Stephen Rees-Carter
|
2011-10-06 13:22:36 +02:00 |
Georg Ehrke
|
bf017fb4bd
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2011-10-06 13:21:38 +02:00 |
|
Georg Ehrke
|
55ab68a332
|
support of RRULE in calendar app
|
2011-10-06 13:21:13 +02:00 |
Stephen Rees-Carter
|
c853fc75a1
|
BUGFIX: removed the hard-coded Continent selection for Calendar Timezones.
|
2011-10-06 10:31:05 +11:00 |
Bartek Przybylski
|
f92fa6989e
|
another query fix
|
2011-10-05 22:28:17 +02:00 |
Michiel@unhosted
|
af6eb52b5e
|
correct wrong variable name in remoteStorage app
|
2011-10-05 20:01:58 +02:00 |
|
Bartek Przybylski
|
d5931b8c48
|
gallery db query fix
|
2011-10-05 19:32:30 +02:00 |
Jan-Christoph Borchardt
|
28dcbe3cb0
|
disabled gallery app by default until it's in a branch
|
2011-10-05 14:54:34 +02:00 |
|
Jan-Christoph Borchardt
|
8e532b5ceb
|
removed extra calendar settings. Also, table layout?
|
2011-10-05 14:32:25 +02:00 |
Borjan Tchakaloff
|
5570222b40
|
Added the missing quotes on the filename.
|
2011-10-05 15:20:32 +04:00 |
|
Borjan Tchakaloff
|
0cde2a3146
|
Fixed the file sharing listing bug (filename is empty when it has no extension in a publicly shared folder).
|
2011-10-05 14:27:50 +04:00 |
|
Marvin Thomas Rabe
|
7579fc7bc9
|
updated margins
|
2011-10-04 21:39:13 +02:00 |
|
Bart Visscher
|
2c95c799e6
|
Add new contact name to end of cantact list
|
2011-10-04 21:16:57 +02:00 |
|
Bart Visscher
|
fada3517b0
|
All the basic field for add contact added
|
2011-10-04 21:16:57 +02:00 |
|
Marvin Thomas Rabe
|
340f6bbaba
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2011-10-04 19:37:54 +02:00 |
|
Marvin Thomas Rabe
|
d1518f2901
|
updated calendar settings
|
2011-10-04 19:37:26 +02:00 |
|
Marvin Thomas Rabe
|
de21378291
|
fixed scrollbar issues
|
2011-10-04 18:54:07 +02:00 |
|
Georg Ehrke
|
70091ec649
|
Merge branch 'master' of gitorious.org:owncloud/owncloud
|
2011-10-04 10:17:55 +02:00 |
|
Georg Ehrke
|
33b660857a
|
fix ical import
|
2011-10-04 10:17:11 +02:00 |
|
Jan-Christoph Borchardt
|
79da90bb08
|
renamed unhosted to remoteStorage (needs to be updated with coming protocol version)
|
2011-10-04 10:07:46 +02:00 |
|
Georg Ehrke
|
77e12a15b1
|
fix checkLoggedIn function in import of ical files
|
2011-10-03 22:52:13 +02:00 |
|
Georg Ehrke
|
c40a1fcede
|
added import function as filehandler
|
2011-10-03 22:50:10 +02:00 |
|
Bart Visscher
|
dec8106665
|
Add user friendly calendar color chooser
|
2011-10-03 20:42:47 +02:00 |
|
Bart Visscher
|
6159b79715
|
Take setting default value out of loop
|
2011-10-03 20:42:47 +02:00 |
|
Marvin Thomas Rabe
|
ffc5c4dabe
|
Merge commit 'refs/merge-requests/51' of git://gitorious.org/owncloud/owncloud into merge-requests/51
|
2011-10-03 15:18:48 +02:00 |
Weng Xuetian
|
acbd31255e
|
fix add bookmark bug.
|
2011-10-03 20:44:03 +08:00 |
|
Marvin Thomas Rabe
|
a2bcbec791
|
Merge branch 'master' of git://gitorious.org/owncloud/owncloud
|
2011-10-03 02:01:24 +02:00 |
Robin Appelman
|
7bcc0efd6a
|
show galleries in search results
|
2011-10-02 19:33:55 +02:00 |
Frank Karlitschek
|
39c4d9b2ca
|
enable by default
|
2011-10-02 18:53:47 +02:00 |
|
Bartek Przybylski
|
c3d7ffc877
|
adding tmp icon for app, extending memory size for php in .htaccess
|
2011-10-02 17:52:11 +02:00 |
|
Bartek Przybylski
|
ee62eb7bb0
|
adding missing files, don know why they disappeared
|
2011-10-02 17:48:02 +02:00 |
|
Bartek Przybylski
|
6643f68663
|
merge 'gallery_app_devel' to 'master'
|
2011-10-02 17:17:46 +02:00 |
|
Marvin Thomas Rabe
|
bdcf31cc73
|
Added translatable text.
|
2011-10-02 16:06:30 +02:00 |
|
Marvin Thomas Rabe
|
213275a1f8
|
Add translation and fixed some css problems
|
2011-10-02 15:55:23 +02:00 |
|
Marvin Thomas Rabe
|
daee88fd26
|
Changed multiple select for days of weekend to 'chosen'. Cleaned up some code. Removed success message when changing timezone.
|
2011-10-02 15:51:24 +02:00 |
|
Robin Appelman
|
fef31bc6c7
|
Merge commit 'refs/merge-requests/39' of git://gitorious.org/owncloud/owncloud
|
2011-10-02 14:00:55 +02:00 |
|
Bartek Przybylski
|
54e5a10846
|
avoid creating empty albums, removing od depreciated code openings
|
2011-10-02 13:52:04 +02:00 |
|
Bartek Przybylski
|
07b3b103ce
|
changing <? to <?php
|
2011-10-02 12:24:02 +02:00 |
|
Georg Ehrke
|
0ebe9ad70c
|
added function to export single events
|
2011-10-01 23:19:06 +02:00 |
|
Georg Ehrke
|
f9824f6108
|
choosable default duration of event
|
2011-10-01 22:53:18 +02:00 |
|
Bartek Przybylski
|
339d417420
|
removing add new album button, removing logs, and unused code
|
2011-10-01 22:36:01 +02:00 |
|
Georg Ehrke
|
1ea183a0f7
|
fix duration bug
|
2011-10-01 21:09:08 +02:00 |
|
Georg Ehrke
|
8219516ec0
|
removed bug, that the drag and drop function added 24h to the duration of the event, after moving an event from allday to a time
|
2011-10-01 20:44:08 +02:00 |